Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

445 files changed, 156899 insertions, 0 deletions

diff --git a/xorg-server/xkbdata.src/ABOUT-NLS b/xorg-server/xkbdata.src/ABOUT-NLS
new file mode 100644
index 000000000..2f50c6693
--- /dev/null
+++ b/xorg-server/xkbdata.src/ABOUT-NLS
@@ -0,0 +1,768 @@
+Notes on the Free Translation Project
+*************************************
+
+Free software is going international!  The Free Translation Project is
+a way to get maintainers of free software, translators, and users all
+together, so that will gradually become able to speak many languages.
+A few packages already provide translations for their messages.
+
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do _not_
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.
+
+   Installers will find here some useful hints.  These notes also
+explain how users should proceed for getting the programs to use the
+available translations.  They tell how people wanting to contribute and
+work at translations should contact the appropriate team.
+
+   When reporting bugs in the `intl/' directory or bugs which may be
+related to internationalization, you should tell about the version of
+`gettext' which is used.  The information can be found in the
+`intl/VERSION' file, in internationalized packages.
+
+Quick configuration advice
+==========================
+
+If you want to exploit the full power of internationalization, you
+should configure it using
+
+     ./configure --with-included-gettext
+
+to force usage of internationalizing routines provided within this
+package, despite the existence of internationalizing capabilities in the
+operating system where this package is being installed.  So far, only
+the `gettext' implementation in the GNU C library version 2 provides as
+many features (such as locale alias, message inheritance, automatic
+charset conversion or plural form handling) as the implementation here.
+It is also not possible to offer this additional functionality on top
+of a `catgets' implementation.  Future versions of GNU `gettext' will
+very likely convey even more functionality.  So it might be a good idea
+to change to GNU `gettext' as soon as possible.
+
+   So you need _not_ provide this option if you are using GNU libc 2 or
+you have installed a recent copy of the GNU gettext package with the
+included `libintl'.
+
+INSTALL Matters
+===============
+
+Some packages are "localizable" when properly installed; the programs
+they contain can be made to speak your own native language.  Most such
+packages use GNU `gettext'.  Other packages have their own ways to
+internationalization, predating GNU `gettext'.
+
+   By default, this package will be installed to allow translation of
+messages.  It will automatically detect whether the system already
+provides the GNU `gettext' functions.  If not, the GNU `gettext' own
+library will be used.  This library is wholly contained within this
+package, usually in the `intl/' subdirectory, so prior installation of
+the GNU `gettext' package is _not_ required.  Installers may use
+special options at configuration time for changing the default
+behaviour.  The commands:
+
+     ./configure --with-included-gettext
+     ./configure --disable-nls
+
+will respectively bypass any pre-existing `gettext' to use the
+internationalizing routines provided within this package, or else,
+_totally_ disable translation of messages.
+
+   When you already have GNU `gettext' installed on your system and run
+configure without an option for your new package, `configure' will
+probably detect the previously built and installed `libintl.a' file and
+will decide to use this.  This might be not what is desirable.  You
+should use the more recent version of the GNU `gettext' library.  I.e.
+if the file `intl/VERSION' shows that the library which comes with this
+package is more recent, you should use
+
+     ./configure --with-included-gettext
+
+to prevent auto-detection.
+
+   The configuration process will not test for the `catgets' function
+and therefore it will not be used.  The reason is that even an
+emulation of `gettext' on top of `catgets' could not provide all the
+extensions of the GNU `gettext' library.
+
+   Internationalized packages have usually many `po/LL.po' files, where
+LL gives an ISO 639 two-letter code identifying the language.  Unless
+translations have been forbidden at `configure' time by using the
+`--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable `LINGUAS'
+may be set, prior to configuration, to limit the installed set.
+`LINGUAS' should then contain a space separated list of two-letter
+codes, stating which languages are allowed.
+
+Using This Package
+==================
+
+As a user, if your language has been installed for this package, you
+only have to set the `LANG' environment variable to the appropriate
+`LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
+and `CC' is an ISO 3166 two-letter country code.  For example, let's
+suppose that you speak German and live in Germany.  At the shell
+prompt, merely execute `setenv LANG de_DE' (in `csh'),
+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
+This can be done from your `.login' or `.profile' file, once and for
+all.
+
+   You might think that the country code specification is redundant.
+But in fact, some languages have dialects in different countries.  For
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
+country code serves to distinguish the dialects.
+
+   The locale naming convention of `LL_CC', with `LL' denoting the
+language and `CC' denoting the country, is the one use on systems based
+on GNU libc.  On other systems, some variations of this scheme are
+used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
+locales supported by your system for your country by running the command
+`locale -a | grep '^LL''.
+
+   Not all programs have translations for all languages.  By default, an
+English message is shown in place of a nonexistent translation.  If you
+understand other languages, you can set up a priority list of languages.
+This is done through a different environment variable, called
+`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
+for the purpose of message handling, but you still need to have `LANG'
+set to the primary language; this is required by other parts of the
+system libraries.  For example, some Swedish users who would rather
+read translations in German than English for when Swedish is not
+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
+
+   Special advice for Norwegian users: The language code for Norwegian
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
+transition period, while some message catalogs for this language are
+installed under `nb' and some older ones under `no', it's recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
+older translations are used.
+
+   In the `LANGUAGE' environment variable, but not in the `LANG'
+environment variable, `LL_CC' combinations can be abbreviated as `LL'
+to denote the language's main dialect.  For example, `de' is equivalent
+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
+(Portuguese as spoken in Portugal) in this context.
+
+Translating Teams
+=================
+
+For the Free Translation Project to be a success, we need interested
+people who like their own language and write it well, and who are also
+able to synergize with other translators speaking the same language.
+Each translation team has its own mailing list.  The up-to-date list of
+teams can be found at the Free Translation Project's homepage,
+`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
+area.
+
+   If you'd like to volunteer to _work_ at translating messages, you
+should become a member of the translating team for your own language.
+The subscribing address is _not_ the same as the list itself, it has
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request@li.org', having this message body:
+
+     subscribe
+
+   Keep in mind that team members are expected to participate
+_actively_ in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `translation@iro.umontreal.ca' to reach the
+coordinator for all translator teams.
+
+   The English team is special.  It works at improving and uniformizing
+the terminology in use.  Proven linguistic skill are praised more than
+programming skill, here.
+
+Available Packages
+==================
+
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of January
+2004.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination, with a
+translation percentage of at least 50%.
+
+     Ready PO files       af am ar az be bg bs ca cs da de el en en_GB eo es
+                        +----------------------------------------------------+
+     a2ps               |             []             [] [] []                |
+     aegis              |                               ()                   |
+     ant-phone          |                               ()                   |
+     anubis             |                                                    |
+     ap-utils           |                                                    |
+     aspell             |             []                                     |
+     bash               |                      []       []             [] [] |
+     batchelor          |                                                    |
+     bfd                |                            []                   [] |
+     binutils           |                            []                   [] |
+     bison              |                            [] []                [] |
+     bluez-pin          | []                      []                   []    |
+     clisp              |                                                    |
+     clisp              |                               []    []          [] |
+     console-tools      |                         []    []                   |
+     coreutils          |                      []    [] []                [] |
+     cpio               |                            [] []                [] |
+     darkstat           |                []          ()                   [] |
+     diffutils          |                      [] [] [] [] []          [] [] |
+     e2fsprogs          |                         []    []                [] |
+     enscript           |                      []    [] []        []         |
+     error              |                      []    [] []        []      [] |
+     fetchmail          |                      [] () [] [] []             [] |
+     fileutils          |                            [] []                [] |
+     findutils          |             []       []    [] [] []          [] [] |
+     flex               |                      []    [] []                [] |
+     fslint             |                                                    |
+     gas                |                                                 [] |
+     gawk               |                      []    [] []                [] |
+     gbiff              |                               []                   |
+     gcal               |                      []                            |
+     gcc                |                            []                   [] |
+     gettext            |             []       []    [] []                [] |
+     gettext-examples   | []                   []       []                [] |
+     gettext-runtime    |             []       []    [] []                [] |
+     gettext-tools      |                      []       []                [] |
+     gimp-print         |                         [] [] []        []      [] |
+     gliv               |                                                    |
+     glunarclock        |                            [] []                   |
+     gnubiff            |                               []                   |
+     gnucash            |                         []    ()        []      [] |
+     gnucash-glossary   |                            [] ()                [] |
+     gnupg              |                      [] ()    [] []          [] [] |
+     gpe-aerial         |                         []                         |
+     gpe-beam           |                         []    []                   |
+     gpe-calendar       |                         []    []                   |
+     gpe-clock          |                         []    []                   |
+     gpe-conf           |                         []    []                   |
+     gpe-contacts       |                         []    []                   |
+     gpe-edit           |                         []                         |
+     gpe-go             |                         []                         |
+     gpe-login          |                         []    []                   |
+     gpe-ownerinfo      |                         []    []                   |
+     gpe-sketchbook     |                         []    []                   |
+     gpe-su             |                         []    []                   |
+     gpe-taskmanager    |                         []    []                   |
+     gpe-timesheet      |                         []                         |
+     gpe-today          |                         []    []                   |
+     gpe-todo           |                         []    []                   |
+     gphoto2            |                         [] [] []                [] |
+     gprof              |                            [] []                [] |
+     gpsdrive           |                               ()    ()          () |
+     gramadoir          |                               []                   |
+     grep               |             [] []    []       [] []             [] |
+     gretl              |                                                 [] |
+     gtick              | []                            ()                   |
+     hello              |                      []    [] [] []          [] [] |
+     id-utils           |                            [] []                   |
+     indent             |                      []       []             [] [] |
+     iso_3166           |          []    [] [] [] [] [] [] []          [] [] |
+     iso_3166_1         |                      [] [] [] [] []             [] |
+     iso_3166_2         |                                                    |
+     iso_3166_3         |                               []                   |
+     iso_4217           |                      []    [] []                [] |
+     iso_639            |                                                    |
+     jpilot             |                         [] []                   [] |
+     jtag               |                                                    |
+     jwhois             |                                                 [] |
+     kbd                |                         [] [] [] []             [] |
+     latrine            |                               ()                   |
+     ld                 |                            []                   [] |
+     libc               |                      [] [] [] [] []             [] |
+     libgpewidget       |                         []    []                   |
+     libiconv           |                      []    [] []             [] [] |
+     lifelines          |                            [] ()                   |
+     lilypond           |                               []                   |
+     lingoteach         |                                                    |
+     lingoteach_lessons |                               ()                () |
+     lynx               |                      [] [] [] []                   |
+     m4                 |                         [] [] [] []                |
+     mailutils          |                      []                         [] |
+     make               |                            [] []                [] |
+     man-db             |                      [] () [] []                () |
+     minicom            |                         []    []                [] |
+     mysecretdiary      |                            [] []                [] |
+     nano               |                      [] () [] []                [] |
+     nano_1_0           |                      [] () [] []                [] |
+     opcodes            |                                                 [] |
+     parted             |                      [] [] [] []                [] |
+     ptx                |                      []    [] []             [] [] |
+     python             |                                                    |
+     radius             |                                                 [] |
+     recode             |             []       []    [] [] []          [] [] |
+     rpm                |                         [] []                      |
+     screem             |                                                    |
+     scrollkeeper       |             []       [] [] [] []                [] |
+     sed                | []                   []    [] []             [] [] |
+     sh-utils           |                            [] []                [] |
+     shared-mime-info   |                                                    |
+     sharutils          |                      [] [] [] [] []             [] |
+     silky              |                               ()                   |
+     skencil            |                            [] ()                [] |
+     sketch             |                            [] ()                [] |
+     soundtracker       |                            [] []                [] |
+     sp                 |                               []                   |
+     tar                |                         [] [] []                [] |
+     texinfo            |                            [] []             []    |
+     textutils          |                      []    [] []                [] |
+     tin                |                               ()        ()         |
+     tp-robot           |                                                    |
+     tuxpaint           |                      [] [] [] [] []     []      [] |
+     unicode-han-tra... |                                                    |
+     unicode-transla... |                                                    |
+     util-linux         |                      [] [] [] []                [] |
+     vorbis-tools       |             []          [] []                   [] |
+     wastesedge         |                               ()                   |
+     wdiff              |                      []    [] []                [] |
+     wget               |                []    []    [] [] []             [] |
+     xchat              |                      []       [] []             [] |
+     xfree86_xkb_xml    |                         [] []                      |
+     xpad               |                                                 [] |
+                        +----------------------------------------------------+
+                          af am ar az be bg bs ca cs da de el en en_GB eo es
+                           4  0  0  1  9  4  1 40 41 60 78 17  1   5   13 68
+     
+                          et eu fa fi fr ga gl he hr hu id is it ja ko lg
+                        +-------------------------------------------------+
+     a2ps               | []       [] []                      ()    ()    |
+     aegis              |                                                 |
+     ant-phone          |             []                                  |
+     anubis             |             []                                  |
+     ap-utils           |             []                                  |
+     aspell             |             [] []                               |
+     bash               |             []             []                   |
+     batchelor          |             [] []                               |
+     bfd                |             []                                  |
+     binutils           |             []                         []       |
+     bison              | []          []                []    []          |
+     bluez-pin          |          [] [] []          [] []                |
+     clisp              |                                                 |
+     clisp              |             []                                  |
+     console-tools      |                                                 |
+     coreutils          | []       [] [] []                   [] []       |
+     cpio               |             []    []       []             []    |
+     darkstat           |             () []          [] []                |
+     diffutils          |          [] []    [] []    [] []       []       |
+     e2fsprogs          |                                                 |
+     enscript           |             []          []                      |
+     error              |          [] [] []          []                   |
+     fetchmail          |                                        []       |
+     fileutils          | []          [] []          []       [] []       |
+     findutils          | []       [] [] [] []    [] [] []    [] [] []    |
+     flex               |             [] []                         []    |
+     fslint             |             []                                  |
+     gas                |             []                                  |
+     gawk               |             []       []                []       |
+     gbiff              |             []                                  |
+     gcal               |             []                                  |
+     gcc                |             []                                  |
+     gettext            |             []                         [] []    |
+     gettext-examples   |             []                         []       |
+     gettext-runtime    |          [] []                []       [] []    |
+     gettext-tools      |             []                         [] []    |
+     gimp-print         |             []                         []       |
+     gliv               |             ()                                  |
+     glunarclock        |          []    [] []       []                   |
+     gnubiff            |             []                                  |
+     gnucash            |             ()                      []          |
+     gnucash-glossary   |                                     []          |
+     gnupg              | []       [] []    []          []    [] []       |
+     gpe-aerial         |             []                                  |
+     gpe-beam           |             []                                  |
+     gpe-calendar       |             []             [] []                |
+     gpe-clock          |             []                                  |
+     gpe-conf           |             []                                  |
+     gpe-contacts       |             []             []                   |
+     gpe-edit           |             []                []                |
+     gpe-go             |             []                                  |
+     gpe-login          |             []             []                   |
+     gpe-ownerinfo      |             []             [] []                |
+     gpe-sketchbook     |             []                                  |
+     gpe-su             |             []                                  |
+     gpe-taskmanager    |             []                                  |
+     gpe-timesheet      |             [] []             []                |
+     gpe-today          |             [] []                               |
+     gpe-todo           |             []                []                |
+     gphoto2            |             []             []          []       |
+     gprof              |             []                []                |
+     gpsdrive           |             ()                      () ()       |
+     gramadoir          |             [] []                               |
+     grep               | []       [] [] [] [] [] [] [] []    [] []       |
+     gretl              |             []                      []          |
+     gtick              |          [] [] []                               |
+     hello              | []    [] [] [] [] [] [] [] [] []    [] [] []    |
+     id-utils           |             []             [] []    []          |
+     indent             | []       [] [] [] []       [] []    [] []       |
+     iso_3166           |    []       [] []       [] [] []    []          |
+     iso_3166_1         |    []       [] []          [] []                |
+     iso_3166_2         |                                                 |
+     iso_3166_3         |                                                 |
+     iso_4217           | []          []    []       []       [] []       |
+     iso_639            |                                                 |
+     jpilot             |             []                         ()       |
+     jtag               |             []                                  |
+     jwhois             |             []             [] []    []          |
+     kbd                |             []                                  |
+     latrine            |             []                                  |
+     ld                 |             []                                  |
+     libc               |          [] []    []       []          [] []    |
+     libgpewidget       |             [] []          [] []                |
+     libiconv           | []       [] [] [] []    [] [] []    []          |
+     lifelines          |             ()                                  |
+     lilypond           |             []                                  |
+     lingoteach         |             []                []                |
+     lingoteach_lessons |                                                 |
+     lynx               | []                         []       [] []       |
+     m4                 |             []    []          []       []       |
+     mailutils          |                                                 |
+     make               |             []    [] [] []             [] []    |
+     man-db             |                                     () ()       |
+     minicom            |          [] []             []          []       |
+     mysecretdiary      |             []                []                |
+     nano               |             []    []          []    []          |
+     nano_1_0           |             []    []          []    []          |
+     opcodes            |             []                                  |
+     parted             |             []    []                   []       |
+     ptx                | []       [] [] [] []       [] []                |
+     python             |                                                 |
+     radius             |             []                                  |
+     recode             |             []    [] []    [] []    []          |
+     rpm                |             []                            []    |
+     screem             |                                                 |
+     scrollkeeper       |                            []                   |
+     sed                | []       [] [] [] []       [] []    [] []       |
+     sh-utils           | []       [] [] []          []       [] []       |
+     shared-mime-info   |          [] []             []                   |
+     sharutils          | []          []    []       []          []       |
+     silky              |          () []             ()       ()          |
+     skencil            |             []                                  |
+     sketch             |             []                                  |
+     soundtracker       |             []                      []          |
+     sp                 |             []                         ()       |
+     tar                | []       [] []    []    [] [] []    [] []       |
+     texinfo            |             []       [] []             []       |
+     textutils          |             [] [] []       []          [] []    |
+     tin                | []          ()                                  |
+     tp-robot           |             []                                  |
+     tuxpaint           |          [] []       []    [] [] [] [] [] []    |
+     unicode-han-tra... |                                                 |
+     unicode-transla... |             [] []                               |
+     util-linux         | []       [] []             []       () []       |
+     vorbis-tools       |             []                                  |
+     wastesedge         |             ()                                  |
+     wdiff              | []          [] [] []       [] []                |
+     wget               | []       [] []    []    [] []          []       |
+     xchat              | []       [] []                                  |
+     xfree86_xkb_xml    |             []             []                   |
+     xpad               |             [] []                               |
+                        +-------------------------------------------------+
+                          et eu fa fi fr ga gl he hr hu id is it ja ko lg
+                          22  2  1 26 106 28 24  8 10 41 33  1 26 33 12  0
+     
+                          lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
+                        +-----------------------------------------------------+
+     a2ps               |             []       []    ()     ()     []   [] [] |
+     aegis              |                      ()                       () () |
+     ant-phone          |                      []                       []    |
+     anubis             |             []    [] []           []          [] [] |
+     ap-utils           |                      []           ()          []    |
+     aspell             |                      []                             |
+     bash               |                                          []   [] [] |
+     batchelor          |                                               []    |
+     bfd                |                                               []    |
+     binutils           |                                                  [] |
+     bison              |             []       []                  []   [] [] |
+     bluez-pin          |                      []           []          []    |
+     clisp              |                                                     |
+     clisp              |                      []                             |
+     console-tools      |                                                  [] |
+     coreutils          |                                   []             [] |
+     cpio               |                      []           []     []   [] [] |
+     darkstat           |             []       []                  []   []    |
+     diffutils          |             []       []           []     []   [] [] |
+     e2fsprogs          |                                   []                |
+     enscript           |                      []                  []   [] [] |
+     error              |                      []                  []   []    |
+     fetchmail          |                      []           []     ()      [] |
+     fileutils          |                                   []          [] [] |
+     findutils          |                      []           []     []   [] [] |
+     flex               |                                   []     []   [] [] |
+     fslint             |                      []                       []    |
+     gas                |                                                     |
+     gawk               |                                   []     []   []    |
+     gbiff              |                      []                       []    |
+     gcal               |                                                     |
+     gcc                |                                                     |
+     gettext            |                                   []          [] [] |
+     gettext-examples   |                      []           []          []    |
+     gettext-runtime    |                      []           []          [] [] |
+     gettext-tools      |                                   []          []    |
+     gimp-print         |                      []                             |
+     gliv               |                      []                  []   []    |
+     glunarclock        |             []       []                       [] [] |
+     gnubiff            |                      []                             |
+     gnucash            |                      []              []  ()      [] |
+     gnucash-glossary   |                      []              []             |
+     gnupg              |                                               []    |
+     gpe-aerial         |                      []              []       [] [] |
+     gpe-beam           |                      []              []       [] [] |
+     gpe-calendar       |                      []              []       [] [] |
+     gpe-clock          |                      []              []       [] [] |
+     gpe-conf           |                      []              []       [] [] |
+     gpe-contacts       |                      []              []       [] [] |
+     gpe-edit           |                      []              []       [] [] |
+     gpe-go             |                      []                       [] [] |
+     gpe-login          |                      []              []       [] [] |
+     gpe-ownerinfo      |                      []              []       [] [] |
+     gpe-sketchbook     |                      []              []       [] [] |
+     gpe-su             |                      []              []       [] [] |
+     gpe-taskmanager    |                      []              []       [] [] |
+     gpe-timesheet      |                      []              []       [] [] |
+     gpe-today          |                      []              []       [] [] |
+     gpe-todo           |                      []              []       [] [] |
+     gphoto2            |                                               []    |
+     gprof              |                                          []   []    |
+     gpsdrive           |                      ()    ()                 []    |
+     gramadoir          |                      ()                       []    |
+     grep               |                                   [] []  []   [] [] |
+     gretl              |                                                     |
+     gtick              |                      []                       [] [] |
+     hello              |    []       []    [] [] [] []     []     []   [] [] |
+     id-utils           |                      []                  []   [] [] |
+     indent             |                      []                  []   [] [] |
+     iso_3166           |          []                [] []                    |
+     iso_3166_1         |                      []    []                       |
+     iso_3166_2         |                                                     |
+     iso_3166_3         |                      []                             |
+     iso_4217           |          []          [] [] []     [] []  []      [] |
+     iso_639            |          []                                         |
+     jpilot             |                      ()    ()                       |
+     jtag               |                                                     |
+     jwhois             |                      []           []     []   [] () |
+     kbd                |                      []           []          []    |
+     latrine            |                                               []    |
+     ld                 |                                                     |
+     libc               |                   []       []     []     []         |
+     libgpewidget       |                      []              []       []    |
+     libiconv           |                      []           []     []   [] [] |
+     lifelines          |                                                     |
+     lilypond           |                                                     |
+     lingoteach         |                                                     |
+     lingoteach_lessons |                                                     |
+     lynx               |                      []                  []      [] |
+     m4                 |                      []           []     []   [] [] |
+     mailutils          |                                   []          [] [] |
+     make               |                      []           []     []      [] |
+     man-db             |                                               []    |
+     minicom            |                                   []     []   [] [] |
+     mysecretdiary      |                      []                  []   []    |
+     nano               |             []       []           []          [] [] |
+     nano_1_0           |             []    []    []        []          [] [] |
+     opcodes            |                      []                       []    |
+     parted             |                         []        [] []  []         |
+     ptx                |                   [] []    []     [] []  []   [] [] |
+     python             |                                                     |
+     radius             |                                   []             [] |
+     recode             |                                   []     []   [] [] |
+     rpm                |                                   [] []          [] |
+     screem             |                                                     |
+     scrollkeeper       |                   [] []           []          [] [] |
+     sed                |                                   []     []   []    |
+     sh-utils           |                   []                             [] |
+     shared-mime-info   |                      [] []                          |
+     sharutils          |                      []                          [] |
+     silky              |                                                  () |
+     skencil            |                                      []  []         |
+     sketch             |                                      []  []         |
+     soundtracker       |                                                     |
+     sp                 |                                                     |
+     tar                |             []    []       []     []     []   []    |
+     texinfo            |                   []              []          [] [] |
+     textutils          |                   []                             [] |
+     tin                |                                                     |
+     tp-robot           |                      []                             |
+     tuxpaint           | []          []       [] []        [] []  []   []    |
+     unicode-han-tra... |                                                     |
+     unicode-transla... |                                                     |
+     util-linux         |                      []                  []      [] |
+     vorbis-tools       |                      []                       [] [] |
+     wastesedge         |                                                     |
+     wdiff              |             []                    []     []   [] [] |
+     wget               |                                   []          [] [] |
+     xchat              |    []                []                          [] |
+     xfree86_xkb_xml    |                      []                          [] |
+     xpad               |                      []                       []    |
+                        +-----------------------------------------------------+
+                          lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
+                           1  2  0  3 12  0 10 69  6  7  1  40 26  36   76 63
+     
+                          sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
+                        +-----------------------------------------------------+
+     a2ps               |    []    []       [] []                             | 16
+     aegis              |                                                     |  0
+     ant-phone          |                                                     |  3
+     anubis             |                   [] []                             |  9
+     ap-utils           |                      ()                             |  3
+     aspell             |                                                     |  4
+     bash               |                                                     |  9
+     batchelor          |                                                     |  3
+     bfd                |          []       []                                |  6
+     binutils           |          []       []                  []            |  8
+     bison              |          []       []                                | 14
+     bluez-pin          | []       []                    []                   | 14
+     clisp              |                                                     |  0
+     clisp              |                                                     |  5
+     console-tools      |                                                     |  3
+     coreutils          |    []    []       []                        []      | 16
+     cpio               |          []                           []            | 14
+     darkstat           | []    [] []                           ()    ()      | 12
+     diffutils          |          []       []                        []      | 23
+     e2fsprogs          |          []       []                                |  6
+     enscript           |          []       []                                | 12
+     error              | []                []                        []      | 15
+     fetchmail          | []                []                                | 11
+     fileutils          |    []    []       []                  []    []      | 17
+     findutils          | [] [] [] []       []                  []            | 29
+     flex               |          []       []                                | 13
+     fslint             |                                                     |  3
+     gas                |                   []                                |  3
+     gawk               |          []       []                                | 12
+     gbiff              |                                                     |  4
+     gcal               |          []       []                                |  4
+     gcc                |                   []                                |  4
+     gettext            | [] []    []       []                        []      | 16
+     gettext-examples   | []    [] []       []                  []            | 14
+     gettext-runtime    | [] [] [] []       [] []               []    []      | 22
+     gettext-tools      | [] [] [] []       []                  []            | 14
+     gimp-print         | []       []                                         | 10
+     gliv               |                                                     |  3
+     glunarclock        |       [] []                    []                   | 13
+     gnubiff            |                                                     |  3
+     gnucash            | []                                          []      |  9
+     gnucash-glossary   | []       []                                 []      |  8
+     gnupg              | []       []       []                        []      | 17
+     gpe-aerial         |          []                                         |  7
+     gpe-beam           |          []                                         |  8
+     gpe-calendar       | []       []                    []           []      | 13
+     gpe-clock          | []    [] []                                         | 10
+     gpe-conf           | []       []                                         |  9
+     gpe-contacts       | []       []                                 []      | 11
+     gpe-edit           | []    [] []                    []           []      | 12
+     gpe-go             |                                                     |  5
+     gpe-login          | []    [] []                    []           []      | 13
+     gpe-ownerinfo      | []    [] []                                 []      | 13
+     gpe-sketchbook     | []       []                                         |  9
+     gpe-su             | []    [] []                                         | 10
+     gpe-taskmanager    | []    [] []                                         | 10
+     gpe-timesheet      | []    [] []                                 []      | 12
+     gpe-today          | []    [] []                    []           []      | 13
+     gpe-todo           | []       []                    []           []      | 12
+     gphoto2            | []       []                           []            | 11
+     gprof              |          []       []                                |  9
+     gpsdrive           | []       []                                         |  3
+     gramadoir          | []                                                  |  5
+     grep               |    [] []          [] []                             | 26
+     gretl              |                                                     |  3
+     gtick              |                                                     |  7
+     hello              | []    [] []       [] []                             | 34
+     id-utils           |          []       []                                | 12
+     indent             | []    [] []       []                                | 21
+     iso_3166           | [] [] [] []       []    []     []                   | 27
+     iso_3166_1         | [] []             []                                | 16
+     iso_3166_2         |                                                     |  0
+     iso_3166_3         |                                                     |  2
+     iso_4217           | [] []    []       [] []               []            | 24
+     iso_639            |                                                     |  1
+     jpilot             |          []       []        []        []    []      |  9
+     jtag               | []                                                  |  2
+     jwhois             |          ()       []                        []      | 11
+     kbd                |          []       []                                | 11
+     latrine            |                                                     |  2
+     ld                 |          []       []                                |  5
+     libc               | []       []       []                  []            | 20
+     libgpewidget       | []    [] []                    []                   | 13
+     libiconv           | [] [] [] []       [] []        []     []            | 27
+     lifelines          |          []                                         |  2
+     lilypond           |          []                                         |  3
+     lingoteach         |                                                     |  2
+     lingoteach_lessons |                                       ()            |  0
+     lynx               |          []       [] []                             | 14
+     m4                 |          []                           []            | 15
+     mailutils          |                                                     |  5
+     make               |          []       []                  []            | 16
+     man-db             |          []                                         |  5
+     minicom            |                                                     | 11
+     mysecretdiary      |          []       []                                | 10
+     nano               |       [] []       [] []                             | 17
+     nano_1_0           |          []       [] []                             | 17
+     opcodes            |          []       []                                |  6
+     parted             |          []       []                  []            | 15
+     ptx                |          []       []                                | 22
+     python             |                                                     |  0
+     radius             |                                                     |  4
+     recode             |    []    []       []                                | 20
+     rpm                |          []       []                                |  9
+     screem             |          []                           []            |  2
+     scrollkeeper       | []    [] []                                         | 15
+     sed                | [] [] [] []       [] []                             | 24
+     sh-utils           |    []             []                                | 14
+     shared-mime-info   |       [] []                                         |  7
+     sharutils          |       [] []       []                        []      | 17
+     silky              | ()                                                  |  3
+     skencil            |          []                                         |  6
+     sketch             |          []                                         |  6
+     soundtracker       | []       []                                         |  7
+     sp                 |                   []                                |  3
+     tar                | [] []    []       []                  []            | 24
+     texinfo            |          []       []                  []            | 14
+     textutils          |    []    []       []                        []      | 16
+     tin                |                                                     |  1
+     tp-robot           |                                                     |  2
+     tuxpaint           | []       []       []           []     []            | 29
+     unicode-han-tra... |                                                     |  0
+     unicode-transla... |                                                     |  2
+     util-linux         |          []       []                                | 15
+     vorbis-tools       |                                                     |  8
+     wastesedge         |                                                     |  0
+     wdiff              | []       []       []                                | 18
+     wget               | [] [] [] []       [] []               []    []      | 24
+     xchat              | [] [] [] []                           []            | 15
+     xfree86_xkb_xml    | []    []          [] []               []            | 11
+     xpad               |                                                     |  5
+                        +-----------------------------------------------------+
+       63 teams           sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
+      131 domains         47 19 28 83  0  0 59 13  1   1 11  0  22    22    0  1373
+
+   Some counters in the preceding matrix are higher than the number of
+visible blocks let us expect.  This is because a few extra PO files are
+used for implementing regional variants of languages, or language
+dialects.
+
+   For a PO file in the matrix above to be effective, the package to
+which it applies should also have been internationalized and
+distributed as such by its maintainer.  There might be an observable
+lag between the mere existence a PO file and its wide availability in a
+distribution.
+
+   If January 2004 seems to be old, you may fetch a more recent copy of
+this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
+matrix with full percentage details can be found at
+`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
+
+Using `gettext' in new packages
+===============================
+
+If you are writing a freely available program and want to
+internationalize it you are welcome to use GNU `gettext' in your
+package.  Of course you have to respect the GNU Library General Public
+License which covers the use of the GNU `gettext' library.  This means
+in particular that even non-free programs can use `libintl' as a shared
+library, whereas only free software can use `libintl' as a static
+library or use modified versions of `libintl'.
+
+   Once the sources are changed appropriately and the setup can handle
+the use of `gettext' the only thing missing are the translations.  The
+Free Translation Project is also available for packages which are not
+developed inside the GNU project.  Therefore the information given above
+applies also for every other Free Software Project.  Contact
+`translation@iro.umontreal.ca' to make the `.pot' files available to
+the translation teams.
+
diff --git a/xorg-server/xkbdata.src/AUTHORS b/xorg-server/xkbdata.src/AUTHORS
new file mode 100644
index 000000000..451e9c08d
--- /dev/null
+++ b/xorg-server/xkbdata.src/AUTHORS
@@ -0,0 +1,8 @@
+Сергей Удальцов (Sergey Udaltsov) <svu@users.sourceforge.net>
+
+Andriy Rysin <arysin@myrealbox.com>
+Denis Barbier <barbier@linuxfr.org>
+Frank Murphy <murphyf+xfree86@f-m.fm>
+Ivan Pascal <pascal@info.tsu.ru>
+Nicolas Mailhot <nicolas.mailhot@laposte.net>
+Данило Шеган <dsegan@gmx.net>
diff --git a/xorg-server/xkbdata.src/COPYING b/xorg-server/xkbdata.src/COPYING
new file mode 100644
index 000000000..c7232aa96
--- /dev/null
+++ b/xorg-server/xkbdata.src/COPYING
@@ -0,0 +1,17 @@
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of the copyright holder(s) not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  The copyright holder(s) makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+THE COPYRIGHT HOLDER(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
diff --git a/xorg-server/xkbdata.src/CREDITS b/xorg-server/xkbdata.src/CREDITS
new file mode 100644
index 000000000..7a05b27ec
--- /dev/null
+++ b/xorg-server/xkbdata.src/CREDITS
@@ -0,0 +1,3 @@
+Ivan A Derzhanski <iad@math.bas.bg>
+Runa Aruna <runa_aruna@yahoo.com>
+Fr?d?ric BOITEUX <fboiteux@calistel.com>
diff --git a/xorg-server/xkbdata.src/ChangeLog b/xorg-server/xkbdata.src/ChangeLog
new file mode 100644
index 000000000..876a080af
--- /dev/null
+++ b/xorg-server/xkbdata.src/ChangeLog
@@ -0,0 +1,3252 @@
+2008-09-30  Sergey Udaltsov
+
+	* NEWS, configure.in: preparing 1.4
+
+2008-09-26  Sergey Udaltsov
+
+	* symbols/is: fixed AC11 mapping,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17786
+
+2008-09-24  Sergey Udaltsov
+
+	* rules/base.xml.in: all descriptions are prefixed with underscore,
+	to make them translatable,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17587
+
+2008-09-19  Sergey Udaltsov
+
+	* keycodes/evdev, symbols/inet: fixed evdev for abnt2 and jp106
+	http://bugs.freedesktop.org/show_bug.cgi?id=17656
+
+2008-09-18  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in: more mismatches fixed,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17622
+
+2008-09-17  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in: fixed mismatch,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17622
+
+2008-09-15  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock,
+	symbols/cz: added cz(ucw) and couple of options,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17587
+	* rules/base.xml.in, symbols/gr: updated greek variants,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17459
+
+2008-09-12  Sergey Udaltsov
+
+	* geometry/pc: added another pc geometry, with L-shaped Enter,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17513
+
+2008-09-10  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added model
+	sven303, http://bugs.freedesktop.org/show_bug.cgi?id=17518
+
+2008-09-02  Sergey Udaltsov
+
+	* symbols/inet: fixed fscaa1667g,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17389
+	* symbols/fr: fixed invalid keysym,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17388
+	* rules/base.xml.in: some fixes for minor issues
+	* rules/base.xml.in, symbols/gb: added gb(dvorakukp),
+	http://bugs.freedesktop.org/show_bug.cgi?id=17370
+
+2008-08-16  Sergey Udaltsov
+
+	* rules/evdev.m_k.part, rules/evdev.m_s.part, keycodes/evdev,
+	po/POTFILES.in, po/xkeyboard-config.pot, rules/Makefile.am: implement
+	special ruleset for evdev driver
+	* added missing chars to Gurmukhi,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17163
+
+2008-08-06  Sergey Udaltsov
+
+	* compat/Makefile.am, geometry/Makefile.am, keycodes/Makefile.am,
+	keymap/Makefile.am, rules/compat/Makefile.am, semantics/Makefile.am,
+	symbols/Makefile.am, types/Makefile.am, xkbrules.am: improving the
+	build, http://bugs.freedesktop.org/show_bug.cgi?id=17008
+
+2008-08-03  Sergey Udaltsov
+
+	* rules/compat/variantRename.lst: fixing compat rules for Romania,
+	http://bugs.freedesktop.org/show_bug.cgi?id=16872
+	* symbols/mt: fixed Maltese layout,
+	http://bugs.freedesktop.org/show_bug.cgi?id=16966
+	* symbols/fr: fixed fr(dvorak), making it legal
+	http://bugs.freedesktop.org/show_bug.cgi?id=15407
+
+2008-07-28  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added
+	ibm_spacesaver model,
+	http://bugs.freedesktop.org/show_bug.cgi?id=16767
+
+2008-07-22  Sergey Udaltsov
+
+	* rules/base.xml.in: fixed typo,
+	http://bugs.freedesktop.org/show_bug.cgi?id=16806
+
+2008-07-20  Sergey Udaltsov
+
+	* symbols/inet: fixed typo,
+	http://bugs.freedesktop.org/show_bug.cgi?id=16752
+
+2008-07-08  Sergey Udaltsov
+
+	* symbols/us: fixing us(mac),
+	https://bugs.freedesktop.org/show_bug.cgi?id=16641
+
+2008-07-01  Sergey Udaltsov
+
+	* symbols/is, rules/base.xml.in: added is(dvorak),
+	https://bugs.freedesktop.org/show_bug.cgi?id=16557
+
+2008-06-27  Sergey Udaltsov
+
+	* symbols/level5: using normal level5 keysyms
+	* rules/compat/ln_s.sh, rules/compat/lnv_s.sh, rules/compat/ml1_s.sh,
+	rules/compat/ml1v1_s.sh, rules/compat/ml1v_s.sh, rules/compat/ml_s.sh,
+	rules/compat/mlv_s.sh: fixed build process, thanks to Oswald
+	Buddenhagen
+
+2008-06-22  Sergey Udaltsov
+
+	* symbols/tj: sorted and fixed tj layout,
+	http://bugs.freedesktop.org/show_bug.cgi?id=16448
+
+2008-06-12  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/keypad: added
+	keypad:phone_hex, http://bugs.freedesktop.org/show_bug.cgi?id=16298
+
+2008-06-09  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/us: added us(chr),
+	http://bugs.freedesktop.org/show_bug.cgi?id=16283
+
+2008-06-06  Sergey Udaltsov
+
+	* geometry/pc: removed unneeded space,
+	http://bugs.freedesktop.org/show_bug.cgi?id=16258
+
+2008-06-04  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/ru: added ru(sah),
+	http://bugs.freedesktop.org/show_bug.cgi?id=15872
+
+2008-06-01  Sergey Udaltsov
+
+	* rules/base.xml.in, rules/base.lists.part, symbols/inet: added
+	microsoft7000, http://bugs.freedesktop.org/show_bug.cgi?id=16087
+	* keycodes/xfree86, rules/base.m_g.part, rules/base.m_k.part,
+	rules/base.m_s.part, rules/base.xml.in: added model thinkpadz60,
+	http://bugs.freedesktop.org/show_bug.cgi?id=15999
+
+2008-05-31  Sergey Udaltsov
+
+	* symbols/gb, symbols/hu: fixed utf8
+
+2008-05-31  Sergey Udaltsov
+
+	* symbols/ru: fixed some includes, from common to winkeys (broken in
+	previous release)
+
+2008-05-30  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/ca: added ca(kut),
+	http://bugs.freedesktop.org/show_bug.cgi?id=16048
+
+2008-05-27  Sergey Udaltsov
+
+	* symbols/inet: WWW is mapped to I02, because of some changes in
+	kernel or X server (on nx9020),
+	http://bugs.freedesktop.org/show_bug.cgi?id=7310
+	* symbols/us: fixed one-handed dvorak variants (dropped second group),
+	http://bugs.freedesktop.org/show_bug.cgi?id=5659
+	* symbols/fi: returned nbsp to 3rd level of space,
+	http://bugs.freedesktop.org/show_bug.cgi?id=12764
+	* configure.in, NEWS: preparing 1.3
+
+2008-05-12  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/ro: changed default Romanian variant to
+	the right one, http://bugs.freedesktop.org/show_bug.cgi?id=13277
+
+2008-05-09  Sergey Udaltsov
+
+	* rules/compat/variantRename.lst, symbols/ru: default variant is
+	winkeys (till Daniel fixes xkbcomp)
+	* symbols/ua: small fix, from Andriy
+
+2008-05-01  Sergey Udaltsov
+
+	* po/POTFILES.in, rules/Makefile.am, rules/sgi*, rules/sun*: dropping
+	legacy unsupported rules. Confirmed with Alan Coopersmith (Sun
+	Microsystems)
+
+2008-04-30  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/us: added us(dvp),
+	http://bugs.freedesktop.org/show_bug.cgi?id=15727
+
+2008-04-29  Sergey Udaltsov
+
+	* symbols/ca: fixed ca(shs),
+	http://bugs.freedesktop.org/show_bug.cgi?id=15756
+
+2008-04-23  Sergey Udaltsov
+
+	* symbols/es: revert broken idea about dead tilde,
+	http://bugs.freedesktop.org/show_bug.cgi?id=9763
+	* symbols/latam: revert broken idea about dead tilde,
+	http://bugs.freedesktop.org/show_bug.cgi?id=12568
+
+2008-04-22  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/fr, symbols/nbsp,
+	types/pc: options for nonbreakspace handling,
+	http://bugs.freedesktop.org/show_bug.cgi?id=9529
+	* symbols/fi: dropping bad nbsp mapping,
+	http://bugs.freedesktop.org/show_bug.cgi?id=12764
+
+2008-04-21  Sergey Udaltsov
+
+	* rules/base.xml.in: fixed some ISO codes
+
+2008-04-19  Sergey Udaltsov
+
+	* symbols/ru, rules/base.xml.in, rules/compat/variantRename.lst:
+	changed ru(winkeys) to default
+	* rules/base.xml.in: put a lot of country/language info in
+
+2008-04-12  Sergey Udaltsov
+
+	* symbols/it: fixed it(geo),
+	https://bugs.freedesktop.org/show_bug.cgi?id=15058
+
+2008-04-07  Sergey Udaltsov
+
+	* symbols/group, rules/base.xml.in, rules/base.o_s.part: added
+	group(shift_caps_switch)
+	http://bugs.freedesktop.org/show_bug.cgi?id=15383
+
+2008-04-01  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/gb: added gb(colemak),
+	http://bugs.freedesktop.org/show_bug.cgi?id=15303
+
+2008-03-30  Sergey Udaltsov
+
+	* symbols/gn, symbols/ng: fixed unicode sequences,
+	http://bugs.freedesktop.org/show_bug.cgi?id=15273
+	* rules/base.xml.in, symbols/ua: added ua(homophonic),
+	http://bugs.freedesktop.org/show_bug.cgi?id=15240
+
+2008-03-28  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/compose: added
+	compose:102, http://bugs.freedesktop.org/show_bug.cgi?id=15246
+
+2008-03-22  Sergey Udaltsov
+
+	* symbols/fr: fixed fr(oss_nodeadkeys),
+	http://bugs.freedesktop.org/show_bug.cgi?id=15140
+
+2008-03-06  Sergey Udaltsov
+
+	* rules/base.lists.part, symbols/ca, symbols/fr: added ca(olpc),
+	removed fr(olpc), http://bugs.freedesktop.org/show_bug.cgi?id=14749
+
+2008-03-03  Sergey Udaltsov
+
+	* rules/base.lists.part, symbols/fr: added fr(olpc),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14749
+	* symbols/lv: fixed lv accented characters,
+	http://bugs.freedesktop.org/show_bug.cgi?id=14765
+	* rules/base.lists.part, symbols/it: added it(olpc),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14793
+
+2008-03-01  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.m_s.part, rules/base.xml.in,
+	symbols/inet: reorganizing keyboard in symbols/inet. Some models are
+	now implemented as "virtual" (by rules only).
+	http://bugs.freedesktop.org/show_bug.cgi?id=14665
+
+2008-02-28  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/in: added in(jhelum), other indian fixes,
+	http://bugs.freedesktop.org/show_bug.cgi?id=14595
+	* symbols/jp: small fix,
+	http://bugs.freedesktop.org/show_bug.cgi?id=8648
+
+2008-02-16  Sergey Udaltsov
+
+	* symbols/cz, symbols/sk: dropping KPDL mapping,
+	http://bugs.freedesktop.org/show_bug.cgi?id=14479
+
+2008-02-12  Sergey Udaltsov
+
+	* keycodes/sun, symbols/sun_vndr/us, rules/base.ml_s.part,
+	rules/base.xml.in: sun type6 kbd,
+	http://bugs.freedesktop.org/show_bug.cgi?id=13664
+
+2008-02-05  Sergey Udaltsov
+
+	* symbols/af: fixed AE09 in af(olpc-ps),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14379
+
+2008-02-04  Sergey Udaltsov
+
+	* symbols/kh, rules/base.lists.part: added kh(olpc),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14376
+
+2008-02-02  Sergey Udaltsov
+
+	* symbols/lt, rules/base.xml.in: added lt(lekp) etc,
+	http://bugs.freedesktop.org/show_bug.cgi?id=14096
+
+2008-01-31  Sergey Udaltsov
+
+	* symbols/af, rules/base.xml.in, rules/base.lists.part: changing
+	af(olpc-da) to af(olpc-fa),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14319
+	* symbols/in: fixed space in in(olpc),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14224
+
+2008-01-30  Sergey Udaltsov
+
+	* symbols/ca, rules/base.xml.in: adding ca(shs), closing
+	http://bugs.freedesktop.org/show_bug.cgi?id=14308
+	* symbols/mn: added mn(olpc),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14307
+	* symbols/tr: fixed Turkish layouts,
+	http://bugs.freedesktop.org/show_bug.cgi?id=14286
+	* symbols/es, rules/base.xml.in: added es(ast),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14277
+	* symbols/am, rules/base.lists.part: added am(olpc),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14226
+	* symbols/af: fixed some keysyms,
+	http://bugs.freedesktop.org/show_bug.cgi?id=14309
+
+2008-01-29  Sergey Udaltsov
+
+	* NEWS, configure.in: preparing release 1.2
+
+2008-01-24  Sergey Udaltsov
+
+	* symbols/af, symbols/ara, symbols/et, symbols/group, symbols/in,
+	symbols/kz, symbols/np, symbols/pk, symbols/ru, symbols/th,
+	symbols/us: separating group(olpc), closing
+	http://bugs.freedesktop.org/show_bug.cgi?id=14225
+
+2008-01-21  Sergey Udaltsov
+
+	* symbols/gr: Polytonic Greek: Use new keysyms for dead psili and
+	dasia, http://bugs.freedesktop.org/show_bug.cgi?id=13275
+
+2008-01-11  Sergey Udaltsov
+
+	* rules/base.lists.part, symbols/in: added in(olpc), by Bernardo
+	Innocenti
+
+2008-01-07  Sergey Udaltsov
+
+	* geometry/thinkpad, keycodes/xfree86, rules/base.lists.part,
+	rules/base.m_g.part, rules/base.m_k.part, rules/base.xml.in,
+	symbols/inet: added thinkpad60 model (with geometry),
+	https://bugs.freedesktop.org/show_bug.cgi?id=13954
+
+2008-01-05  Sergey Udaltsov
+
+	* symbols/us: add (left,right)singlequotemark to us(-altgr)-intl
+	keymap, https://bugs.freedesktop.org/show_bug.cgi?id=13935
+
+2008-01-04  Sergey Udaltsov
+
+	* symbols/inet, rules/base.lists.part, rules/base.xml.in: adding BTC
+	6301URF, https://bugs.freedesktop.org/show_bug.cgi?id=13913
+	* symbols/macintosh_vndr/fr: added nodeadkeys,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13934
+
+2008-01-03  Sergey Udaltsov
+
+	* symbols/pl, rules/base.xml.in: added pl(ru_phonetic_dvorak),
+	https://bugs.freedesktop.org/show_bug.cgi?id=13900
+
+2008-01-02  Sergey Udaltsov
+
+	* symbols/ro, rules/base.xml.in: small fixes for Romanian visible
+	strings from
+	https://bugs.freedesktop.org/show_bug.cgi?id=13277
+	* rules/base.xml.in, rules/compat/variantRename.lst, symbols/fr,
+	symbols/ge: moving ge(azerty_tscapo) to fr(geo), since that layout is
+	only used in France, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=13644
+	* symbols/ara: remove presentation forms from Arabic layout,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13894
+
+2007-12-31  Sergey Udaltsov
+
+	* symbols/ro, rules/base.xml.in, rules/compat/variantRename.lst:
+	temporarily (partially) reverting
+	https://bugs.freedesktop.org/show_bug.cgi?id=13277
+
+2007-12-27  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: adding xkb
+	option caps:swapescape,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13824
+
+2007-12-26  Sergey Udaltsov
+
+	* symbols/ee, rules/base.xml.in: adding ee(us), polishing eurosign
+	usage in ee, https://bugs.freedesktop.org/show_bug.cgi?id=13799
+
+2007-12-25  Sergey Udaltsov
+
+	* symbols/eurosign, rules/base.xml.in, rules/base.o_s.part: add
+	eurosign(4)
+
+2007-12-23  Sergey Udaltsov
+
+	* symbols/inet, rules/base.xml.in: add logiultrax model,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13028
+	* symbols/me, rules/base.xml.in: use Latin as default Montenegro
+	variant, https://bugs.freedesktop.org/show_bug.cgi?id=13777
+	* symbols/inet, keycodes/evdev: Kill off the I211 key in evdev
+
+2007-12-17  Sergey Udaltsov
+
+	* keycodes/sun, rules/base.m_k.part, rules/base.ml_s.part,
+	symbols/sun_vndr/cs, symbols/sun_vndr/cz, symbols/sun_vndr/de,
+	symbols/sun_vndr/dk, symbols/sun_vndr/fr, symbols/sun_vndr/gb,
+	symbols/sun_vndr/gr, symbols/sun_vndr/it, symbols/sun_vndr/jp,
+	symbols/sun_vndr/ko, symbols/sun_vndr/nl, symbols/sun_vndr/no,
+	symbols/sun_vndr/pl, symbols/sun_vndr/ru, symbols/sun_vndr/sw,
+	symbols/sun_vndr/tr, symbols/sun_vndr/tuv, symbols/sun_vndr/tw,
+	symbols/sun_vndr/us: added sun type 6 support,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13664
+
+2007-12-10  Sergey Udaltsov
+
+	* symbols/inet: fixed thinkpad,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13461
+
+2007-12-08  Sergey Udaltsov
+
+	* symbols/inet, rules/base.xml.in, rules/base.lists.part: added
+	fscaa1667g model, thanks to Matthew W. S. Bell
+	* symbols/gr: updated greek symbols,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13570
+
+2007-11-30  Sergey Udaltsov
+
+	* symbols/us: small olpc fix
+	* symbols/inet: introducing nav_common and media_nav_common,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13461
+
+2007-11-21  Sergey Udaltsov
+
+	* symbols/np, rules/base.lists.part: added np(olpc)
+	* symbols/et, rules/base.lists.part: added et(olpc)
+	* symbols/in: small fix in in(ben_probhat),
+	https://bugs.freedesktop.org/show_bug.cgi?id=12038
+
+2007-11-20  Sergey Udaltsov
+
+	* symbols/af, symbols/kz, symbols/ng, rules/base.xml.in: OLPC fixes
+	from Bernardo
+	* symbols/pk, rules/base.xml.in: fixing pk(ara) - it is not default
+
+2007-11-18  Sergey Udaltsov
+
+	* symbols/ro, rules/base.xml.in, rules/compat/variantRename.lst:
+	ro(comma), ro(academic) --> ro(cedilla), ro(std_cedilla),
+	https://bugs.freedesktop.org/show_bug.cgi?id=13277
+
+2007-11-17  Sergey Udaltsov
+
+	* symbols/ua, rules/base.xml.in: added ua(unicode)
+
+2007-11-15  Sergey Udaltsov
+
+	* symbols/olpc, keycodes/es: small OLPC fixes
+
+2007-11-14  Sergey Udaltsov
+
+	* symbols/inet, keycodes/evdev: revert #12203
+	https://bugs.freedesktop.org/show_bug.cgi?id=12227
+
+2007-11-01  Sergey Udaltsov
+
+	* symbols/fi, rules/base.xml.in: swapping fi(basic) and fi(kotoistus),
+	https://bugs.freedesktop.org/show_bug.cgi?id=12764
+
+2007-10-28  Sergey Udaltsov
+
+	* symbols/ara, symbols/us, symbols/es, symbols/us, symbols/ng: OLPC
+	fixlets
+
+2007-10-23  Sergey Udaltsov
+
+	* symbols/ru, rules/base.xml.in: added ru(kom),
+	https://bugs.freedesktop.org/show_bug.cgi?id=12893
+
+2007-10-21  Sergey Udaltsov
+
+	* symbols/us, rules/base.xml.in: added us(dvorak-intl),
+	https://bugs.freedesktop.org/show_bug.cgi?id=12867
+	* symbols/macintosh_vndr/dk: dk(macbookpro),
+	https://bugs.freedesktop.org/show_bug.cgi?id=12716
+
+2007-10-19  Sergey Udaltsov
+
+	* symbols/tr, rules/base.xml.in: added tr(intl),
+	https://bugs.freedesktop.org/show_bug.cgi?id=12856
+
+2007-10-18  Sergey Udaltsov
+
+	* geometry/pc, rules/base.xml.in, rules/compat/base.lists.part,
+	symbols/br, symbols/pt: added some br and pt layouts,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12816
+	* rules/base.xml.in symbols/dk: added dk(dvorak),
+	https://bugs.freedesktop.org/show_bug.cgi?id=12837
+
+2007-10-13  Sergey Udaltsov
+
+	* symbols/inet, rules/base.lists.part, rules/base.xml.in: added diNovo
+	Edge, https://bugs.freedesktop.org/show_bug.cgi?id=12789
+
+2007-10-10  Sergey Udaltsov
+
+	* rules/base.xml.in, rules/base.m_g.part: added microsoftelite model,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12753
+	* symbols/fi: fixed fi(kotoistus),
+	https://bugs.freedesktop.org/show_bug.cgi?id=12764
+
+2007-10-09  Sergey Udaltsov
+
+	* geometry/microsoft: added "elite" geometry,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12753
+	* symbols/us: fix for olpc
+
+2007-10-07  Sergey Udaltsov
+
+	* symbols/kz, rules/base.lists.part: added kz(olpc)
+	* symbols/pk: fixed pk(olpc)
+	* rules/base.xml.in: lost vendors,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12719
+	* symbols/inet, rules/base.lists.part, rules/base.xml.in: added
+	chicony0108 model,
+	https://bugs.freedesktop.org/show_bug.cgi?id=6914
+	* symbols/de, types/extra: SS hangling,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7642
+
+2007-10-04  Sergey Udaltsov
+
+	* symbols/us: s/U.S. English/USA/
+	* rules/base.o_s.part, rules/base.xml.in,
+	rules/compat/layoutRename.lst, symbols/Makefile.am, symbols/cs,
+	symbols/me, symbols/rs, symbols/ba, symbols/hr, symbols/si: splitting
+	Serbia and Montenegro 
+	https://bugs.freedesktop.org/show_bug.cgi?id=12390
+
+2007-10-02  Sergey Udaltsov
+
+	* symbols/inet: fixing dell inspiron,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12653
+	* configure.in, rules/Makefile.am, po/ChangeLog: dropping translations
+	from base.xml, let apps/libs use .gmo files instead
+
+2007-09-27  Sergey Udaltsov
+
+	* symbols/shift, symbols/Makefile.am, rules/base.o_s.part: added
+	shift:breaks_caps, https://bugs.freedesktop.org/show_bug.cgi?id=9546
+
+2007-09-26  Sergey Udaltsov
+
+	* symbols/latam: no dead_tilde,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12568
+	* rules/base.xml.in, symbols/in: added mal_lalitha, small fixes,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12426
+	* rules/base.lists.part, rules/base.m_k.part, rules/base.ml_c.part,
+	rules/base.ml_s.part, rules/base.xml.in, rules/merge.sh,
+	symbols/Makefile.am, symbols/ara, symbols/br, symbols/es,
+	symbols/group, symbols/inet, symbols/level3, symbols/ng, symbols/olpc,
+	symbols/pk, symbols/ru, symbols/th, symbols/tr, symbols/us: massive
+	patch from OLPC project
+
+2007-09-25  Sergey Udaltsov
+
+	* NEWS, configure.in: preparing release 1.1
+
+2007-09-24  Sergey Udaltsov
+
+	* symbols/inet: added extra key for nx9020
+	https://bugs.freedesktop.org/show_bug.cgi?id=7310
+
+2007-09-14  Sergey Udaltsov
+
+	* symbols/inet: small fixes in cymotionlinux,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7983
+	* keycodes/evdev: fixed fake keycodes,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12202
+
+2007-09-05  Sergey Udaltsov
+
+	* symbols/inet, geometry/dell, rules/base.m_g.part,
+	rules/base.lists.part: adding dell precision m65,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7992
+	* rules/base.m_g.part: fixed rules for the kinesis keyboard,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7991
+
+2007-09-04  Sergey Udaltsov
+
+	* symbols/it, rules/base.xml.in: added strange one, it(geo),
+	contributed by Vladimir Sichinava
+
+2007-09-02  Sergey Udaltsov
+
+	* keycodes/evdev, symbols/inet: more evdev keycodes,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12227
+	https://bugs.freedesktop.org/show_bug.cgi?id=12228
+
+2007-08-29  Sergey Udaltsov
+
+	* keycodes/evdev: updated evdev keycodes,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12202
+	* keycodes/xfree86, symbols/inet, symbols/pc: display switch &
+	backlight control, https://bugs.freedesktop.org/show_bug.cgi?id=12203
+	* keycodes/macintosh, rules/base.m_k.part, rules/base.xml.in: adding
+	macintosh_hhk model,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12091
+
+2007-08-28  Sergey Udaltsov
+
+	* symbols/group, symbols/jp, symbols/la, symbols/level3, symbols/pc,
+	symbols/digital_vndr/pc, types/pc: renaming types, giving more
+	sensible names
+
+2007-08-27  Sergey Udaltsov
+
+	* keycodes/evdev: missing keycodes for evdev:
+	https://bugs.freedesktop.org/show_bug.cgi?id=12167
+
+2007-08-26  Sergey Udaltsov
+
+	* rules/compat/variantRename.lst: fixing dvorak layouts compat rule,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12115
+
+2007-08-24  Sergey Udaltsov
+
+	* symbols/us: fixes typos in us(classmate-intl)
+
+2007-08-22  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/cn: adding Tibetan
+	layouts, https://bugs.freedesktop.org/show_bug.cgi?id=12088
+
+2007-08-20  Sergey Udaltsov
+
+	* symbols/gr: replacing combining keys with dead keys, temporary hack
+	by James Cloos
+
+2007-08-19  Sergey Udaltsov
+
+	* symbols/et: added missing dead "c" key
+
+2007-08-18  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.ml_s.part, rules/base.mlv_s.part,
+	rules/base.xml.in, symbols/inet, symbols/us: added classmate model
+	with specific variants,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11955
+
+2007-08-14  Sergey Udaltsov
+
+	* symbols/inet, rules/base.xml.in: added asus_laptop,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11936
+
+2007-08-12  Sergey Udaltsov
+
+	* symbols/ru: fixed ebreve in ru(ch),
+	http://bugs.freedesktop.org/show_bug.cgi?id=11246
+	* rules/base.xml.in: missing Romanian variants added,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11945
+
+2007-08-10  Sergey Udaltsov
+
+	* symbols/br, rules/base.m_g.part, rules/base.ml1_s.part,
+	rules/base.ml_g.part, rules/base.ml_s.part: Adding br(thinkpad),
+	polishing rules a bit,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11908
+
+2007-08-07  Sergey Udaltsov
+
+	* symbols/ara: Patch to Arabic keyboard layout,
+	http://bugs.freedesktop.org/show_bug.cgi?id=11867
+
+2007-08-03  Sergey Udaltsov
+
+	* symbols/us, rules/base.xml.in: added us(altgr-intl), closing
+	http://bugs.freedesktop.org/show_bug.cgi?id=11753
+
+2007-07-30  Sergey Udaltsov
+
+	* symbols/inet, rules/base.lists.part, rules/base.m_s.part,
+	rules/base.xml.in: introduced media_common, some Dell/Logitech symbols
+	are dead, compatibility rules created, Acer kbds consolidated,
+	http://bugs.freedesktop.org/show_bug.cgi?id=11746
+
+2007-07-25  Sergey Udaltsov
+
+	* symbols/inet, rules/base.lists.part, rules/base.m_s.part,
+	rules/base.xml.in: consolidating benq keyboards,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11713
+
+2007-07-24  Sergey Udaltsov
+
+	* symbols/gn, symbols/Makefile.am, rules/base.xml.in: added Guinea,
+	http://bugs.freedesktop.org/show_bug.cgi?id=11702
+
+2007-07-23  Sergey Udaltsov
+
+	* symbols/cd: update Congolese,
+	https://bugs.freedesktop.org/show_bug.cgi?id=5500
+
+2007-07-22  Sergey Udaltsov
+
+	* symbols/inet, rules/base.lists.part, rules/base.xml.in: adding
+	logiex110 model, https://bugs.freedesktop.org/show_bug.cgi?id=11686
+
+2007-07-20  Sergey Udaltsov
+
+	* symbols/gr: adding pound sign,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11608
+
+2007-07-16  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/be, symbols/keypad:
+	modularized wang kbd,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8852
+
+2007-07-15  Sergey Udaltsov
+
+	* symbols/kpdl, symbols/*, rules/base.xml.in, rules/base.o_s.part:
+	introducing separate KPDL handling,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11611
+
+2007-07-12  Sergey Udaltsov
+
+	* NEWS: preparing release 1.0
+
+2007-07-10  Sergey Udaltsov
+
+	*  geometry/hhk, rules/base.m_g.part, rules/base.xml.in,
+	geometry/Makefile.am: adding hhk geometry,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11519
+
+2007-07-09  Sergey Udaltsov
+
+	*  symbols/de: fixed AE12, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=11514
+
+2007-06-29  Sergey Udaltsov
+
+	*  symbols/lk: another fix from
+	https://bugs.freedesktop.org/show_bug.cgi?id=11284
+	*  symbols/us, rules/base.xml.in: added us(colemak),
+	https://bugs.freedesktop.org/show_bug.cgi?id=11416
+
+2007-06-25  Sergey Udaltsov
+
+	*  symbols/Makefile.am, symbols/braille, rules/base.xml.in: added
+	Braille layout, https://bugs.freedesktop.org/show_bug.cgi?id=11356
+
+2007-06-18  Sergey Udaltsov
+
+	*  symbols/Makefile.am, symbols/et, rules/base.xml.in: added
+	et(basic), part of the OLPC works
+
+2007-06-16  Sergey Udaltsov
+
+	*  symbols/lk: fixed Sinhala, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=11284
+
+2007-06-15  Sergey Udaltsov
+
+	*  symbols/ru, rules/base.xml.in: added ru(cv_latin), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=11246
+
+2007-06-13  Sergey Udaltsov
+
+	*  symbols/ru, rules/base.xml.in: added ru(cv), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=11246
+	*  symbols/ge, rules/base.xml.in: added ge(os), again closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8092
+	*  symbols/ru, rules/base.xml.in: added ru(udm), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=11257
+
+2007-06-07  Sergey Udaltsov
+
+	*  symbols/in, rules/base.xml.in: added Hindi phonetic,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11195
+
+2007-06-06  Sergey Udaltsov
+
+	*  rules/xfree98: fixed nec_vndr, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=11176
+
+2007-05-26  Sergey Udaltsov
+
+	*  rules/base.o_s.part, rules/base.xml.in, symbols/jp: Add
+	"NICOLA-F style Backspace" to "Japanese keyboard options", closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=11064
+
+2007-05-14  Sergey Udaltsov
+
+	*  rules/base.xml.in, rules/xkb.dtd: introducing vendor into
+	configItem
+
+2007-05-13  Sergey Udaltsov
+
+	* symbols/il: replaced backslash with bar, reclosing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6375
+
+2007-05-02  Sergey Udaltsov
+
+	* symbols/gr: using Unicode since it is more appropriate for polytonic
+	Greek, https://bugs.freedesktop.org/show_bug.cgi?id=10824
+
+2007-04-30  Sergey Udaltsov
+
+	* rules/base.xml.in: make descriptions less technical
+
+2007-04-29  Sergey Udaltsov
+
+	* symbols/us: adding explicit BKSL, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10811
+
+2007-04-27  Sergey Udaltsov
+
+	* geometry/microsoft: replacing non-defined AE00 with TLDE,
+	http://bugzilla.gnome.org/show_bug.cgi?id=429907
+
+2007-04-24  Sergey Udaltsov
+
+	* symbols/ma: fixing alt in Tifinagh, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10736
+
+2007-04-23  Sergey Udaltsov
+
+	* geometry/pc: fix for abnt2, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10725
+	* symbols/inet, rules/base.lists.part: adding missing logicdo, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10671
+
+2007-04-11  Sergey Udaltsov
+
+	* symbols/ge, rules/base.xml.in: added/fixed a lot of Georgian
+	layouts, closing https://bugs.freedesktop.org/show_bug.cgi?id=3332
+
+2007-04-05  Sergey Udaltsov
+
+	* symbols/se, rules/base.xml.in: added se(svdvorak),
+	https://bugs.freedesktop.org/show_bug.cgi?id=10424
+
+2007-04-03  Sergey Udaltsov
+
+	* symbols/cd: fixed Congolese layout one more time,
+	https://bugs.freedesktop.org/show_bug.cgi?id=5500
+
+2007-04-01  Sergey Udaltsov
+
+	* symbols/cd: fixed Congolese layout,
+	https://bugs.freedesktop.org/show_bug.cgi?id=5500
+
+2007-03-29  Sergey Udaltsov
+
+	* configure.in: improved xkb_base calculation, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10435
+
+2007-03-13  Sergey Udaltsov
+
+	* configure.in: added Korean translation,
+	https://bugs.freedesktop.org/show_bug.cgi?id=10269
+	* rules/base.xml.in: s/descr/_descr/g, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10270
+
+2007-03-06  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/us: added us(euro), after a very hot
+	discussion in the maillist
+
+2007-02-26  Sergey Udaltsov
+
+	* symbols/inet: fixed broken symbol, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10103
+	* compat/misc: fixing copy/paste bug, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10104
+
+2007-02-25  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/uz: fixed Uz layout, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10091
+	* symbols/us: added French oe character to us(intl), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10087
+
+2007-02-12  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/ma: added Tifinagh
+	layouts, closing http://bugs.freedesktop.org/show_bug.cgi?id=9950
+
+2007-02-03  Sergey Udaltsov
+
+	* rules/base.ml_g.part, rules/HDR, rules/Makefile.am,
+	rules/base.m_g.part: added (model, layout->geometry) section for
+	thinkpad, https://bugs.freedesktop.org/show_bug.cgi?id=9864
+	* symbols/macintosh_vndr/fr: updated French layout, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9865
+
+2007-01-27  Sergey Udaltsov
+
+	* symbols/inet, rules/base.lists.part: adding thinkpad media keys,
+	closing https://bugs.freedesktop.org/show_bug.cgi?id=9779
+
+2007-01-26  Sergey Udaltsov
+
+	* symbols/es: s/asciitilde/dead_tilde in spanish, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9763
+
+2007-01-25  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/am: adding am(phonetic-alt), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9018
+
+2007-01-11  Sergey Udaltsov
+
+	* symbols/nl, rules/base.xml.in: added nl(std), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9603
+	* symbols/epo, rules/base.xml.in: added epo(legacy), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9556
+
+2007-01-04  Sergey Udaltsov
+
+	* symbols/ir: settling another licensing issue,
+	https://bugs.freedesktop.org/show_bug.cgi?id=9541
+
+2007-01-04  Sergey Udaltsov
+
+	* rules/base.xml.in, rules/base.o_s.part, symbols/ca, symbols/fr,
+	symbols/nbsp: adding more nbsp options, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9529
+
+2007-01-02  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/pc: getting rid of stupid "default"
+	altwin options, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9470
+
+2006-12-19  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, rules/sun.xml.in,
+	symbols/level3: adding lv3:ralt_alt, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9070
+
+2006-12-11  Sergey Udaltsov
+
+	* configure.in: getting rid of bashisms, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9244
+	* symbols/fi: s/NoSymbol/VoidSymbol/, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9239
+
+2006-12-07  Sergey Udaltsov
+
+	* Makefile.am, rules/Makefile.am, xkbrules.am: getting rid of
+	gmakisms, closing https://bugs.freedesktop.org/show_bug.cgi?id=9245
+	* Makefile.am: dropping install-compiled target, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9246
+
+2006-11-20  Sergey Udaltsov
+
+	* symbols/br, keycodes/xfree86: making abnt2 more compatible with
+	other keyboards, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4910
+	* rules/base.m_k.part: dropping the special (and stupid) abnt2 rule,
+	closing https://bugs.freedesktop.org/show_bug.cgi?id=9097
+
+2006-11-19  Sergey Udaltsov
+
+	* symbols/il, rules/base.xml.in: added il(biblical), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9002
+
+2006-11-17  Sergey Udaltsov
+
+	* symbols/us: the backslash/bar definition in the us dvorak variant,
+	closing https://bugs.freedesktop.org/show_bug.cgi?id=9061
+	* symbols/ir: removed problematic copyright notice, with permission of
+	Behnam Esfahbod, https://bugs.freedesktop.org/show_bug.cgi?id=4102
+
+2006-11-14  Sergey Udaltsov
+
+	* symbols/altwin: undo invalid Alt mapping done in
+	https://bugs.freedesktop.org/show_bug.cgi?id=8996
+
+2006-11-12  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/altwin: adding
+	ctrl_win, closing https://bugs.freedesktop.org/show_bug.cgi?id=8996
+
+2006-11-06  Sergey Udaltsov
+
+	* rules/sun.xml.in, rules/Makefile.am, po/POTFILE.in: Added directory
+	for sun rules, closing
+	http://bugzilla.gnome.org/show_bug.cgi?id=137294
+
+2006-11-02  Sergey Udaltsov
+
+	* symbols/fr: some fixes for alternative layouts, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8853
+	* symbols/fr, rules/base.xml.in: new fr(dvorak*) variants, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8728
+
+2006-10-28  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added
+	logitech_g15 model, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8803
+	* symbols/jp: added LCTL definition,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8805
+
+2006-10-26  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added more
+	Dell keyboards, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8761
+
+2006-10-18  Sergey Udaltsov
+
+	* rules/base.lists.part, symbols/macintosh_vndr/Makefile.am,
+	symbols/macintosh_vndr/dk, symbols/macintosh_vndr/es,
+	symbols/macintosh_vndr/it, symbols/macintosh_vndr/latam,
+	symbols/macintosh_vndr/no, symbols/macintosh_vndr/pt,
+	symbols/macintosh_vndr/se: missed part from
+	https://bugs.freedesktop.org/show_bug.cgi?id=1576
+	* rules/base.xml.in, symbols/jp: adding new Japanese layout, changing
+	latin to 106, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8648
+
+2006-10-17  Sergey Udaltsov
+
+	* symbols/macintosh_vndr/dk, symbols/macintosh_vndr/us: adding euro
+	sign to mac us and dk, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8682#add_comment
+
+2006-10-16  Sergey Udaltsov
+
+	* rules/base.m_k.part, rules/base.xml.in, keycodes/Makefile.am,
+	keycodes/powerpcps2: removing obsolete powerpcps2 model. Closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8659
+	* rules/base.o_s.part, rules/base.xml.in, symbols/group: adding
+	grp:lctrl_lshift_toggle, contributed by Alexey Morozov
+	<morozov@gorodok.net>
+	* symbols/macintosh_vndr/us: Fix <BKSP> in symbols/macintosh_vndr/us,
+	closing https://bugs.freedesktop.org/show_bug.cgi?id=8668
+	* symbols/level3: assigning mods to keycodes (reverding earlier wrong
+	fix), closing https://bugs.freedesktop.org/show_bug.cgi?id=8670
+
+2006-10-13  Sergey Udaltsov
+
+	* xkbrules.am: ability to create .dir files when srcdir != objdir,
+	closing https://bugs.freedesktop.org/show_bug.cgi?id=8629
+
+2006-10-12  Sergey Udaltsov
+
+	* symbols/inet, rules/base.lists.part, rules/base.xml.in: added BenQ
+	X-730, thanks to Jean-Marc Spaggiari
+
+2006-10-11  Sergey Udaltsov
+
+	* symbols/af, symbols/ba, symbols/hr, symbols/kr, symbols/nbsp,
+	symbols/ng, symbols/si, symbols/za: addind missing cvs keyword
+	XKeyboardConfig
+	* rules/base.ml_s.part, rules/base.xml.in, symbols/jp: normalizing
+	Japanese rules/variants, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8503
+
+2006-10-10  Sergey Udaltsov
+
+	* symbols/in: fixed Devangari (default) layout, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4949
+	* configure.in: removing hardcoded prefix, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8448
+	* symbols/it, added EuroSign to italian mac layout, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=1576
+
+2006-10-09  Sergey Udaltsov
+
+	* symbols/inet,rules/base.xml.in: adding benqa800 model, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8574
+
+2006-10-09  Sergey Udaltsov
+
+	* NEWS, configure.in: preparing 0.9
+
+2006-10-09  Sergey Udaltsov
+
+	* tests/*: tests now run alphabetically, a bit of xslt tweaking
+	* symbols/altwin: Alt keys should be mapped on two shift levels,
+	undoing previous fix, as requested in
+	https://bugs.freedesktop.org/show_bug.cgi?id=8571
+	* symbols/level3: mapping Mod5 to keycode rather than to keysym,
+	hopefully fixing https://bugs.freedesktop.org/show_bug.cgi?id=8572
+	* symbols/us,symbols/latin: fixing quotes, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8122
+
+2006-10-07  Sergey Udaltsov
+
+	* types/complete, types/default: putting "numpad" after "extra"
+	hopefully fixes https://bugs.freedesktop.org/show_bug.cgi?id=8402
+
+2006-10-04  Sergey Udaltsov
+
+	* symbols/fi: s/micron/dead_micron, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8494
+
+2006-10-03  Sergey Udaltsov
+
+	* symbols/macintosh_vndr/gb, symbols/gb: adding missing Euro
+	character, closing https://bugs.freedesktop.org/show_bug.cgi?id=5227
+	* symbols/bt, symbols/fr, symbols/np: fixing typos, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8495
+	* symbols/ch, symbols/de, symbols/dk, symbols/es, symbols/no,
+	symbols/pt, symbols/se, symbols/us: optimized mac variants, overwrite
+	old de and ch mac variants, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8491
+
+2006-10-01  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/ng: added Nigerian
+	layouts, closing https://bugs.freedesktop.org/show_bug.cgi?id=8467
+	* symbols/dk, symbols/es, symbols/fi, symbols/fr, symbols/gb,
+	symbols/is, symbols/it, symbols/nl, symbols/no, symbols/pt,
+	symbols/se, symbols/us, rules/base.xml.in: adding mac variants,
+	closing https://bugs.freedesktop.org/show_bug.cgi?id=8465
+
+2006-09-30  Sergey Udaltsov
+	
+	* rules/base.o_s.part, rules/base.xml.in, symbols/Makefile.am,
+	symbols/nbsp: adding nbsp:* options, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8451
+
+2006-09-29  Sergey Udaltsov
+	
+	* rules/base.xml.in: added keypad:* options, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8240
+
+2006-09-28  Sergey Udaltsov
+	
+	* geometry/thinkpad: fix for geometry, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8419
+
+2006-09-24  Sergey Udaltsov
+	
+	* symbols/am, rules/base.xml.in: added am(eastern), am(western),
+	am(eastern-alt), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8404
+	* rules/base.ml_s.part: macbooks should use the vendor symbols, if
+	possible, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8385
+	* rules/base.o_s.part, rules/base.xml.in, symbols/fr, symbols/keypad:
+	added more French variants, new options, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8240
+
+2006-09-18  Sergey Udaltsov
+	
+	* keycodes/macintosh, rules/HDR, rules/Makefile.am,
+	rules/base.m_k.part, rules/base.o_k.part, rules/base.xml.in: split
+	"good" and "bad" apple keycodes, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8242
+
+	* rules/base.lists.part, rules/base.m_s.part, symbols/inet,
+	symbols/level3: lv3:enter_switch added, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8324
+
+	* symbols/ara: added ara(buckwalter), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8198
+
+	* symbols/in: fixed layout, Unicode-related bug, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8203
+
+	* geometry/pc, rules/base.ml1_s.part, rules/base.ml_s.part,
+	rules/compat/ml1_s.sh, rules/compat/ml1v1_s.sh,
+	rules/compat/ml1v_s.sh, rules/compat/ml_s.sh, rules/compat/mlv_s.sh,
+	symbols/pc: getting rid of pc101/102/104 legacy. Breaking XkbSymbols
+	again, https://bugs.freedesktop.org/show_bug.cgi?id=8321
+
+2006-09-17  Sergey Udaltsov
+	
+	symbols/keypad, symbols/pc, symbols/us, symbols/macintosh_vndr/*,
+	rules/base.m_t.part, rules/base.ml1_s.part, rules/base.ml_s.part,
+	rules/base.o_t.part, rules/base.xml.in, rules/merge.sh: reorganized
+	Mac stuff, thanks to Denis,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8280
+
+	* symbols/pc: modularized numpad stuff,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8312
+	
+2006-09-10  Sergey Udaltsov
+
+	rules/base.list.part, symbols/inet: added 2 models, thanks to
+	Valery V. Inozemtsev
+
+2006-09-06  Sergey Udaltsov
+
+	* rules/altwin: mapping LALT to Mod4 modifier,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8068
+
+2006-09-05  Sergey Udaltsov
+
+	* rules/base.lists.part: adding missing kbds, reordering a bit
+	https://bugs.freedesktop.org/show_bug.cgi?id=7816
+
+	* geometry/ibm_vnd, configure.in, rules/base.m_g.part: getting rid of
+	ibm_vndr geometry, fixing rules,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7990
+
+	* symbols/gb: s/ralt_switch/ralt_switch_multikey
+	https://bugs.freedesktop.org/show_bug.cgi?id=7674
+
+	* rules/base.mlv_s.part: fixing mac rule for nodeadkeys,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8123
+
+	* rules/base.ml_s.part: s/old_macintosh/macintosh_old/g,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8128
+
+2006-09-04  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.m_g.part, rules/base.m_k.part,
+	rules/base.m_s.part, rules/base.ml1_s.part, rules/base.ml_s.part,
+	rules/base.mlv_s.part: fixing lists,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7817
+
+	* symbols/cd, symbols/gr, symbols/il, symbols/jp, symbols/la,
+	symbols/lk, symbols/ru, symbols/ca: fixing types, on per-group basis,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8121
+
+	* symbols/level3: adding level3:ralt_switch_multikey,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7674
+
+2006-09-03  Sergey Udaltsov
+
+	* symbols/vn: getting rid of digits (1 and 2 shift levels),
+	https://bugs.freedesktop.org/show_bug.cgi?id=7807
+
+	* rules/base.xml.in: s/guillemot/guillemet/, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8116
+
+2006-09-02  Sergey Udaltsov
+
+	* symbols/lt, rules/base.xml.in: added lt(ibm)
+	https://bugs.freedesktop.org/show_bug.cgi?id=3841
+
+	* symbols/hr: reverted Croatian
+	https://bugs.freedesktop.org/show_bug.cgi?id=8019
+
+2006-09-01  Sergey Udaltsov
+
+	* symbols/ru, rules/base.xml.in: added Ossetian, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8092
+
+	* symbols/ir, symbols/iq, rules/base.xml.in: added Kurdish Arabic-Latin
+
+2006-08-31  Sergey Udaltsov
+
+	* geometry/macintosh, keycodes/macintosh, keycodes/xfree86,
+	rules/base.lists.part, rules/base.m_g.part, rules/base.m_k.part,
+	rules/base.m_s.part, rules/base.ml_s.part, rules/base.xml.in,
+	symbols/inet: Added Macbook stuff, partially closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8068
+
+	* symbols/group, rules/base.o_s.part: added group:alt_caps_toggle
+	https://bugs.freedesktop.org/show_bug.cgi?id=8047
+
+2006-08-02  Sergey Udaltsov
+
+	* symbols/inet, keycodes/evdev: updated evdev
+	https://bugs.freedesktop.org/show_bug.cgi?id=7631
+
+2006-07-30  Sergey Udaltsov
+
+	* symbols/pl: added pl(csb)
+	https://bugs.freedesktop.org/show_bug.cgi?id=7693
+
+2006-07-29  Sergey Udaltsov
+
+	* symbols/bt: fixed Bhutan
+	https://bugs.freedesktop.org/show_bug.cgi?id=7556
+
+	* symbols/us: added dvorak-classic, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=7503
+
+	* symbols/inet: added acer_c300, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6361
+
+2006-07-29  Sergey Udaltsov
+
+	* symbols/lk: updated Sinhala, thanks to Harshula
+
+2006-07-10  Sergey Udaltsov
+
+	* symbols/de: added Mac variants, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6671
+
+2006-07-04  Sergey Udaltsov
+
+	* symbols/ch: fixed KPDL in ch(de_mac), patch from
+	https://bugs.freedesktop.org/show_bug.cgi?id=6960
+
+2006-07-02  Sergey Udaltsov
+
+	* rules/base.xml.in: fixed mismatch between directory and symbols/inet
+	file.
+	https://bugs.freedesktop.org/show_bug.cgi?id=7398
+	
+	* symbols/ro: fixed Romanian academic
+	https://bugs.freedesktop.org/show_bug.cgi?id=7393
+	
+2006-06-28  Sergey Udaltsov
+
+	* keycodes/evdev: pc105 compatiliby, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=7347
+
+2006-06-25  Sergey Udaltsov
+
+	* rules/base.xml.in, geometry/pc, symbols/inet: added Dell Lattitude,
+	https://bugs.freedesktop.org/show_bug.cgi?id=6894
+
+	* symbols/inet, rules/base.xml.in: added 2 new layouts, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=7325
+
+	* symbols/np: added Nepali, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6373
+
+2006-06-25  Sergey Udaltsov
+
+	* geometry/pc, rules/base.lists.part, rules/base.m_g.part,
+	rules/base.xml.in, symbols/kr: updated Korean layouts/geometry
+	https://bugs.freedesktop.org/show_bug.cgi?id=7316
+
+2006-06-22  Sergey Udaltsov
+
+	* symbols/inet: fixing double RaiseVolume, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=7095
+
+2006-06-14  Sergey Udaltsov
+
+	* symbols/mt, rules/base.xml.in: fixed the US variant group name
+	* symbols/gh: fixed 'D' key, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=7216
+
+2006-06-13  Sergey Udaltsov
+
+	* symbols/level5, compat/level5: replacing F21-F23 with explicit
+	hexadecimal values of XK_ISO_Level5_*. So for next months people could
+	have Canadian layout fixed and, at the same time, do not have to
+	upgrade xorg. Closing https://bugs.freedesktop.org/show_bug.cgi?id=4411
+
+	* symbols/ch, symbols/inet, symbols/base.xml.in: added mac stuff from
+	https://bugs.freedesktop.org/show_bug.cgi?id=6960
+
+2006-06-13  Sergey Udaltsov
+
+	* symbols/mt: fixed mt(us), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=1411
+
+2006-06-10  Sergey Udaltsov
+
+	* symbols/level5, compat5/level5: better working Canadian
+	layout, but not complete yet
+
+2006-06-01  Sergey Udaltsov
+
+	* symbols/am: fixed comma in Armenian, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=7080
+
+2006-05-28  Sergey Udaltsov
+
+	* symbols/inet,rules/base.xml.in,rules/base.lists.part: 
+	added Logitech Cordless Desktop LX-300
+	https://bugs.freedesktop.org/show_bug.cgi?id=5609
+
+2006-05-28  Sergey Udaltsov
+
+	* rules/base.ml_c: fixed compat for jp layout, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4002
+
+2006-05-17  Sergey Udaltsov
+
+	* symbols/inet: fixed power_g5, partially closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6960
+
+2006-05-13  Sergey Udaltsov
+
+	* symbols/fi: added fi(kotoistus)
+	https://bugs.freedesktop.org/show_bug.cgi?id=6901
+
+2006-05-05  Sergey Udaltsov
+
+	* symbols/de: added de(neo)
+	https://bugs.freedesktop.org/show_bug.cgi?id=6837
+
+2006-05-04  Sergey Udaltsov
+
+	* symbols/inet: fixed cymotionlinux, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6828
+
+2006-05-04  Sergey Udaltsov
+
+	* rules/base.xml.in,symbols/iq,symbols/in,symbols/sy: added Kurdish, 
+	closed https://bugs.freedesktop.org/show_bug.cgi?id=6159
+	one more time
+
+2006-04-20  Sergey Udaltsov
+
+	* keycodes/evdev: added LSGT, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6674
+
+2006-04-19  Sergey Udaltsov
+
+	* symbols/macintosh_vndr/(be,de,ch): use keypad(comma)
+
+2006-04-19  Sergey Udaltsov
+
+	* rules/*, keymap/sgi_vndr/*: shift_toggle -> shifts_toggle,
+	fixing https://bugs.freedesktop.org/show_bug.cgi?id=5078
+
+2006-04-08  Sergey Udaltsov
+
+	* keycodes/xfree86,symbols/br: fixed abnt2 keymap and layout
+	https://bugs.freedesktop.org/show_bug.cgi?id=4910
+
+2006-04-08  Sergey Udaltsov
+
+	* geometry/macintosh: fixed mac geometry
+	https://bugs.freedesktop.org/show_bug.cgi?id=4714
+
+2006-04-05  Sergey Udaltsov
+
+	* rules/base.xml.in, changed PC-98xx Series to Japan,
+	https://bugs.freedesktop.org/show_bug.cgi?id=5591
+
+2006-04-04  Sergey Udaltsov
+
+	* symbols/compose,rules/base.xml.in,rules/base.o_s.part: added
+	compose(lwin)
+	https://bugs.freedesktop.org/show_bug.cgi?id=2396
+
+2006-04-04  Sergey Udaltsov
+
+	* symbols/inet,rules/base.xml.in: added Logitech diNovo
+	https://bugs.freedesktop.org/show_bug.cgi?id=1681
+
+2006-04-04  Sergey Udaltsov
+
+	* symbols/inet: fixed Logitech Access Keyboard
+	https://bugs.freedesktop.org/show_bug.cgi?id=1018
+
+2006-04-04  Sergey Udaltsov
+
+	* symbols/pt: added LSGT
+	https://bugs.freedesktop.org/show_bug.cgi?id=970
+
+2006-04-02  Sergey Udaltsov
+
+	* symbols/be, rules/base.xml.in: added 'be(wang)'
+	https://bugs.freedesktop.org/show_bug.cgi?id=6474
+
+2006-03-28  Sergey Udaltsov
+
+	* symbols/cd, symbols/Makefile.am: added 'cd'
+	https://bugs.freedesktop.org/show_bug.cgi?id=5500
+
+2006-03-27  Sergey Udaltsov
+
+	* keycodes/macintosh,keymap/macintosh,rules/base.m_k.part: fixed
+	Macintosh F13-F15, closed 
+	https://bugs.freedesktop.org/show_bug.cgi?id=6399
+
+2006-03-25  Sergey Udaltsov
+
+	* symbols/inet: fixed cymotion,
+	https://bugs.freedesktop.org/show_bug.cgi?id=3541
+
+2006-03-25  Sergey Udaltsov
+
+	* symbols/il,rules/compat/variantRename.lst: generalized 'basic', 
+	removed si1452, closed 
+	https://bugs.freedesktop.org/show_bug.cgi?id=6375
+
+2006-03-23  Sergey Udaltsov
+
+	* symbols/group: another attempt to fix unfamous
+	RAlt problem, reported in ubuntu:
+	https://launchpad.net/distros/ubuntu/+source/xkeyboard-config/+bug/35845
+	Now all types are specified for Group1, to make it consistent
+	
+2006-03-22  Sergey Udaltsov
+
+	* rules/base.xml.in,symbols/tr: added Kurdish, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=6159
+	
+2006-03-22  Sergey Udaltsov
+
+	* rules/base.xml.in: added missing Logitech models, fixed
+	https://bugs.freedesktop.org/show_bug.cgi?id=6350
+	
+2006-03-21  Sergey Udaltsov
+
+	* symbols/kr: added Korean layout, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6323
+
+2006-03-21  Sergey Udaltsov
+
+	* types/pc,symbols/level3: another attempt to fix unfamous
+	RAlt problem, reported in ubuntu:
+	https://launchpad.net/distros/ubuntu/+source/xkeyboard-config/+bug/35845
+
+2006-03-17  Sergey Udaltsov
+
+	* symbols/inet, rules/base*: added Acer Ferrari 4K
+	https://bugs.freedesktop.org/show_bug.cgi?id=5259
+
+2006-03-16  Sergey Udaltsov
+
+	* symbols/ee: improved ee(dvorak), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4568
+
+2006-03-05  Sergey Udaltsov
+
+	* configure.in, NEWS, Changelog:Preparing release 0.8
+
+2006-02-26  Sergey Udaltsov
+
+	* symbols/es, rules/base.xml.in: added es(cat), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6047
+
+2006-02-25  Alan Coopersmith 
+
+	* symbols/sun_vndr/*, compat/japan, compat/mousekeys,
+	geometry/sun:
+	massive update from Sun, see
+	https://bugs.freedesktop.org/show_bug.cgi?id=5725
+	
+2006-02-24  M. Emal Alekozai <memala@gmx.net>
+
+	* symbols/af, symbols/Makefile.am, rules/base.xml:
+	added Afghan, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6013
+
+2006-02-15  Zephaniah E. Hull  <warp@aehallh.com>
+
+	* keycodes/Makefile.am:
+	* keycodes/evdev:
+	* rules/base.m_k.part:
+	Add the evdev keyboard data files. Closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=5903
+
+2006-02-21 svu
+
+	* symbols/inet: Fixed inet(armada)
+	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=5893
+	
+2006-02-21 svu
+
+	* symbols/hr: Fixed hr(us)
+	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=3807
+	
+2006-02-01 svu
+
+	* rules/compat/layoutRename.lst: Added cz_qwerty compat rule
+	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=177362
+	
+2006-01-31 svu
+
+	* symbols/us: Added single-handed dvoraks
+	https://bugs.freedesktop.org/show_bug.cgi?id=5659
+	
+2006-01-22 svu
+
+	* types/level5: Fixed ScrollLock behaviour
+	https://bugs.freedesktop.org/show_bug.cgi?id=5635
+	
+2006-01-15 svu
+
+	* symbols/bd: Corrected Bangladesh layout, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=5480
+	
+2006-01-14 svu
+
+	* rules/base.ml_*.part: Japanese layouts are nec_vndr/jp, for
+	consistency
+	
+2006-01-14 svu
+
+	* symbols/macintosh_vnd/is: some cosmetic stuff and some info, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=5597
+	
+2006-01-14 svu
+
+	* rules/base.lists.part: extended non-latin list, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=5590
+
+2006-01-11 svu
+
+	* rules/base*part: improved stuff for non-AT keyboards, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=5507
+
+2006-01-10 svu
+
+	* geometry/pc: fixed geometry, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=5568
+
+2006-01-08 svu
+
+	* symbols/gh: added Ghana layout, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=5497
+
+2006-01-06 svu
+
+	* symbols/ad: added Catalan layout, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=5526
+
+2006-01-01 svu
+
+	* symbols/in: fixed ben_probhat, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=1012
+
+2005-12-31 svu
+
+	* symbols/ru, rules/base.xml.in: added
+	Tatar, closing https://bugs.freedesktop.org/show_bug.cgi?id=4818
+
+2005-12-31 svu
+
+	* symbols/kh, rules/base.xml.in, symbols/Makefile.am: added
+	Khmer, closing https://bugs.freedesktop.org/show_bug.cgi?id=5389
+
+2005-12-31 svu
+
+	* symbols/epo, rules/base.xml.in, symbols/Makefile.am: added
+	Esperanto, closing https://bugs.freedesktop.org/show_bug.cgi?id=5454
+
+2005-12-30 svu
+
+	* symbols/ctrl: expanding Caps a bit, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=3193
+
+2005-12-20 svu
+
+	* symbols/hu: returned def_dot (instead of def_comma, really
+	eliminated)
+	
+2005-12-10 svu
+
+	* symbols/compat/layoutRename.lst: added en_US
+
+2005-12-01 svu
+
+	* symbols/inet, rules/base.xml.in: added Inspiron 6000 keys, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=5195
+
+2005-12-01 svu
+
+	* symbols/inet: HUGE redesign of the inet file. Major reorganization
+	of Logitech keyboard. HUGE thanks to Fr?d?ric BOITEUX
+
+2005-11-26 svu
+
+	* symbols/group, symbols/level3, compat/level5, compat/misc:
+	Fixing problem with level3(ralt) and group(alts_toggle).
+	Now "us,ru,se" works ok.
+
+2005-10-20 svu
+
+	* symbols/inet, rules:
+	adding Dell USB Multimedia Keybard, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4826
+
+2005-10-17 svu
+
+	* symbols, types, compat, rules:
+	adding 5th level and beyond, trying to hack 1-group Canadian layout
+
+2005-10-11 svu
+
+	* symbols/macintosh_vndr/fr: update French Macintosh keyboard, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=2870
+
+2005-10-10 svu
+
+	* symbols/za, rules/base.xml.in: added South Afrika, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=2856
+
+2005-10-09 svu
+
+	* symbols/inet: expanded Inspiron definition, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=4071
+
+2005-10-07 svu
+
+	* symbols/hu: fixed comma issue, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=4693
+
+2005-10-04 svu
+
+	* symbols/by, rules/base.xml.in: added by(latin), closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=4576
+	
+2005-10-04 svu
+
+	* symbols/gr: added keypad(comma), closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=3538
+
+2005-10-02 svu
+
+	* symbols/se:
+	updating svorak, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=3635
+
+2005-10-02 svu
+
+	* rules/base.lists.part, rules/base.xml.in, 
+	symbols/inet:
+	adding Genius Comfy, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=2275
+
+2005-10-02 svu
+
+	* rules/Makefile.am, rules/HDR, 
+	rules/base.l1o_s.part, rules/base.l2o_s.part,
+	rules/base.l3o_s.part, rules/base.l4o_s.part:
+	adding "layout + option -> symbols" rules,
+	for properly maingating RAlt as AltGr + alts_toggle
+	IMPORTANT: REQUIRES FIXING XORG
+
+2005-10-02 svu
+
+	* rules/base.xml.in, symbols/ee:
+	added Estonian Dvorak, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=4568
+
+2005-10-02 svu
+
+	* rules/base.xml.in, symbols/inet, rules/base.lists.part:
+	Added eMachines m68xx notebooks keyboards, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=4000
+
+2005-10-01 svu
+
+	* rules/base.xml.in, symbols/inet, rules/base.lists.part:
+	Added SILVERCREST Multimedia Wireless Keyboard, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=4217
+
+2005-09-30 svu
+
+	* rules/compat/layoutRename.lst:
+	added us_intl, fixed https://bugs.freedesktop.org/show_bug.cgi?id=4642
+
+2005-09-30 svu
+
+	* po/sl.po:
+	Slovenian translation
+
+2005-09-22 svu
+
+	* rules/base.xml.in, rules/base.o_s.part, symbols/compose:
+	adding CapsLock as Compose, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4548
+
+2005-09-22 svu
+
+	* rules/Makefile.am, rules/merge.sh
+	fixing merging in env where srcdir != objdir, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4547
+	
+2005-09-22 svu
+
+	* rules/base.xml.in, symbols/kz:
+	change Cyr to Rus
+	
+2005-09-21 svu
+
+	* rules/base.ml_s.part:
+	IMPORTANT: NO MORE 2-GROUP CANADIAN DEFAULT CONFIGURATION
+
+2005-09-21 svu
+
+	* symbols/kz, symbols/Makefile.am, rules/base.xml.in:
+	added Kazakh, fixing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4497
+
+2005-09-20 svu
+
+	* symbols/macintoch_vndr/ch:
+	Updated de_CH, from
+	https://bugs.freedesktop.org/show_bug.cgi?id=4520
+
+2005-09-20 svu
+
+	* symbols/mk, rules/base.xml.in:
+	removing controversal 'FYROM'
+
+2005-09-14 svu
+
+	* symbols/inet, rules/base.xml.in rules/base.lists.part: 
+	Added Cherry CyBo@rd USB-Hub. Thanks to Paul Egan
+	Fixed https://bugs.freedesktop.org/show_bug.cgi?id=4498
+
+2005-09-14 svu
+
+	* symbols/cs: a bit of cleanup by Denis
+
+2005-09-13 svu
+
+	* configure.in: added Finnish translation
+
+2005-09-04 svu
+
+	* symbols/no:
+	fixed no(dvorak), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4397
+
+2005-09-04 svu
+
+	* rules/base.xml.in, symbols/inet:
+	adding Power G5
+
+2005-09-04 svu
+
+	* rules/base.xml.in, symbols/ro:
+	Fixing Romanian, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=371
+
+2005-09-04 svu
+
+	* rules/base.xml.in, symbols/lk:
+	No TSCII/INSCRIPT in Sri Lanka, 
+	according to <hash@jayasolutions.cjb.net>
+
+2005-08-25 svu
+
+	* rules/base.xml.in:
+	Control -> Ctrl everywhere, for consistency sake
+
+2005-08-25 svu
+
+	* rules/base.xml.in, symbols/cs:
+	Serbia -> Serbia and Montenegro
+
+2005-08-25 svu
+
+	* configure.in, po/sr@Latn.po:
+	adding sr@Latn translation, thanks to Danilo
+
+2005-08-24 svu
+
+	* configure.in:
+	preparing 0.6
+
+2005-08-24 svu
+
+	* rules/base.xml.in, symbols/mk, 
+	rules/compat/layoutRename.lst:
+	Move Macedonian to country-based
+
+2005-08-23 svu
+
+	* rules/base.xml.in, symbols/ba, 
+	symbols/si, symbols/cs, symbols/hr:
+	Major Balkanian revolution by Danilo Segan. GREAT THANKS to him.
+
+2005-08-22 svu
+
+	* rules/base.xml.in, symbols/mv:
+	Moved Dhivehi to Maldives, fixed #3716
+
+2005-08-22 svu
+
+	* rules/compat/layoutRename.lst:
+	fixed http://bugzilla.ubuntu.com/show_bug.cgi?id=13919
+
+2005-08-16 svu
+
+	* rules/base.xml.in, symbols/ir:
+	fixed https://bugs.freedesktop.org/show_bug.cgi?id=4102
+
+2005-08-11 svu
+
+	* symbols/jp, symbols/pc:
+	fixed https://bugs.freedesktop.org/show_bug.cgi?id=847
+
+2005-08-07 svu
+
+	* symbols/bg:
+	fixed https://bugs.freedesktop.org/show_bug.cgi?id=4010
+
+2005-08-06 svu
+
+	* Makefile.am:
+	Allowing multiple compatibility symlinks (xfree86,xorg).
+	Thanks to Daniel Stone for the feedback
+
+2005-08-06 svu
+
+	* Makefile.am:
+	Fixing the xkbcomp symlink creation
+	Thanks to Daniel Stone for the feedback
+
+2005-08-04 svu
+
+	* Makefile.am, configure.in, xkbrules.am:
+	Taking nice ideas from xkbdata. 
+	Thanks to Daniel Stone for his knowledge of autofoo
+
+2005-08-04 svu
+
+	* symbols/in, symbols/lk,
+	rules/base.xml.in, rules/compat/variantRename.lst:
+	a bit reogranizing tamil stuff
+
+2005-08-03 svu
+
+	* symbols/ie, rules/base.xml.in, rules/compat/variantRename.lst:
+	getting rid of laptop variants in 'ie'
+
+2005-08-02 svu
+
+	* symbols/in, rules/base.xml.in, rules/compat/variantRename.lst:
+	moving 'mal_plusnum' to 'mal'
+
+2005-08-01 svu
+
+	* symbols/il, symbols/hr, symbols/tj:
+	fixing two-group layouts
+
+2005-08-01 svu
+
+	* symbols, rules:
+	putting syr to sy, dzo to bt
+
+2005-07-31 svu
+
+	* symbols, rules:
+	putting smi to no, fi, se
+
+2005-07-31 svu
+
+	* symbols, rules:
+	putting Syriac to Syria (setting 'ara' as default)
+
+2005-07-31 svu
+
+	* symbols, rules:
+	putting Devangari, Gurmukhi into 'in'
+
+2005-07-31 svu
+
+	* symbols, rules:
+	changing 'lao' to 'la'
+
+2005-07-31 svu
+
+	* symbols, rules:
+	putting Inuktitut into 'ca'
+
+2005-07-31 svu
+
+	* symbols, rules:
+	putting Ogham into 'ie'. Cleaning it up.
+
+2005-07-29 svu
+
+	* symbols, rules:
+	reorganizing Asian layouts, round #1
+
+2005-07-25 svu
+
+	* symbols/tr:
+	fixed Turkish, according to
+	https://bugs.freedesktop.org/show_bug.cgi?id=2558
+
+2005-07-25 svu
+
+	* symbols/hr:
+	added belowdot, abovedot, in relation to 
+	https://bugs.freedesktop.org/show_bug.cgi?id=475
+
+2005-07-24 svu
+
+	* symbols/div,
+	symbols/Makefile.am,
+	rules/base.xml.in: adding Dhivehi, fixing
+	https://bugs.freedesktop.org/show_bug.cgi?id=3716
+
+2005-07-23 svu
+
+	* symbols/es,
+	rules/base.xml.in:
+	adding Spanish dvorak, pointer from
+	https://bugs.freedesktop.org/show_bug.cgi?id=2344
+
+2005-07-21 svu
+
+	* symbols/sun_vndr/us,
+	rules/sun,
+	keycodes/sun,
+	geometry/sun: adding more keyboards, fixing
+	https://bugs.freedesktop.org/show_bug.cgi?id=2037
+
+2005-07-20 svu
+
+	* symbols/ru, 
+	symbols/us, 
+	symbols/se, 
+	symbols/ua, 
+	rules/base.xml.in: 
+	sorting out Russian layout, fixing (without 3rd and 4th groups)
+	https://bugs.freedesktop.org/show_bug.cgi?id=2582
+
+2005-07-15 svu
+
+	* symbols/inet, rules/base.xml.in: 
+	added Cherry CyMotion Linux, fixed
+	https://bugs.freedesktop.org/show_bug.cgi?id=3789
+
+2005-07-02 svu
+
+	* symbols/nl: fixed Dutch layout
+
+2005-06-17 svu
+
+	* symbols/pl: added AB10 to qwertz
+	https://bugs.freedesktop.org/show_bug.cgi?id=3298
+
+2005-06-17 svu
+
+	* symbols/inet, rules/base.xml.in: added logiultrax,
+	https://bugs.freedesktop.org/show_bug.cgi?id=3523
+
+2005-04-17 svu
+
+	* symbols/tam, rules/base.xml.in: changed default for Tamil,
+	https://bugs.freedesktop.org/show_bug.cgi?id=2971
+
+2005-04-02 svu
+
+	* symbols/de, rules/base.xml.in: added de(dvorak),
+	https://bugs.freedesktop.org/show_bug.cgi?id=2681
+
+2005-03-10 svu
+
+	* po/Makefile.am: adding POTFILES* into the dist
+	* Makefile.am, rules/Makefile.am: adding DISTCLEANFILES
+
+2005-03-09 svu
+
+	* symbols/us: fixing dvorak,
+	https://bugs.freedesktop.org/show_bug.cgi?id=2641
+
+2005-02-05 svu
+
+	* configure.in, NEWS: preparing 0.5
+
+2005-02-03 svu
+
+	* symbols/srp, types/extra: replaced SERBIAN_ALPHABETIC with 
+	FOUR_LEVEL_ALPHABETIC, as Danilo requested. Also, SERBIAN_CAPS 
+	renamed to SEPARATE_CAPS_AND_SHIFT_ALPHABETIC.
+
+2005-01-21 svu
+
+	* rules/base.lists.part,
+	rules/base.xml.in,
+	symbols/inet: addin my own Acer Travelmate 800 keyboard
+	(based on acerhk kernel module).
+
+2005-01-21 svu
+
+	* symbols/gr: a bit more order in group name (needed for 'basic' but 
+	not for 'bare'
+
+2005-01-20 svu
+
+	* symbols/hr: added missing keymapping, 
+	fixed https://bugs.freedesktop.org/show_bug.cgi?id=2325
+
+2005-01-19 svu
+
+	* symbols/us: removed illegal 'hidden' attribute from the default layout
+
+2005-01-18 svu
+
+	* symbols/cz, rules/base.xml.in: fixed the Czech layout,
+	https://bugs.freedesktop.org/show_bug.cgi?id=2319
+
+2005-01-16 svu
+
+	* symbols, rules/base.xml.in: HUGE commit - adjusting the group names
+	according to the descriptions. 
+	Also, some layouts were missing the default variants - added one.
+	Also, some default variants were listed in the variantLists - now they are removed.
+
+2005-01-06 svu
+
+	* symbols/am, rules/base.xml.in: Removing old Armenian layout,
+	fixing http://bugs.freedesktop.org/show_bug.cgi?id=2226
+
+2004-12-22 svu
+
+	* symbols: massive patch for the group names (by Denis Barbier)
+	* rules/base.xml.in: first iteration, match the country names with 
+	the group names
+
+2004-12-21 02:07  svu
+
+	* po/el.po,
+	configure.in: Greek translation
+
+2004-12-20 20:30  svu
+
+	* symbols/inet,
+	rules/base.lists.part,
+	rules/base.xml.in: added A4Tech KBS-8, thanks to olo at force dot sk.
+	fixed https://bugs.freedesktop.org/show_bug.cgi?id=2113
+
+2004-12-10 00:30  svu
+
+	* symbols/inet: removed keyboard names from the group names,
+	fixed https://bugs.freedesktop.org/show_bug.cgi?id=2044
+
+2004-12-08 00:30  svu
+
+	* symbols/mkd, 
+	rules/base.xml.in,
+	rules/compat/layoutRename.lst,
+	rules/compat/Makefile.am: Macedonian is now language-based, 
+	not country-based. Compatibility rule added.
+
+2004-12-04 01:40  svu
+
+	* symbols/mk, rules/base.xml.in: small fix for Makedonian
+
+2004-12-03 00:40  svu
+
+	* configure.in, Makefile.am, compiled: some cleanup in the
+	build process
+
+2004-11-29 19:00  svu
+
+	* symbols/sin: Small patch for Sinhala from Harshula
+
+2004-11-14 22:14  svu
+
+	* symbols/sin: Small patch for Sinhala from Harshula
+
+2004-10-31 01:20  svu
+
+	* symbols/ca, rules/base.xml.in: added fr-dvorak, thanks to
+	Jonathan Bastien-Filiatrault
+
+2004-10-29 01:15  svu
+
+	* symbols/am: fixed phonetic layout, bug
+	http://freedesktop.org/bugzilla/show_bug.cgi?id=1714
+
+2004-10-29 00:55  svu
+
+	* rules/base.xml.in, rules/base.lists.part, symbols/inet: 
+	Added Cherry CyMotion Master XPress, fixed 
+	http://freedesktop.org/bugzilla/show_bug.cgi?id=1715
+
+2004-10-26 21:08  svu
+
+	* symbols/Makefile.am, symbols/kg, rules/base.xml.in: added 
+	Kyrgyz, thanks to Yury Fedorov
+
+2004-10-12 18:45  svu
+
+	* symbols/Makefile.am, symbols/sin, rules/base.xml.in: added 
+	Sinhalese, thanks to Harshula Jayasuriya
+
+2004-10-10 23:59  svu
+
+	* po/: af.po, az.po, bg.po, cs.po, da.po, fr.po, hu.po, nl.po,
+	  ru.po, sk.po, sq.po, sr.po, sv.po, tr.po, uk.po, zh_CN.po: update
+	  from TP
+
+2004-10-09 19:34  svu
+
+	* symbols/: mal, mao, mm, mn, mt, nl, ogam, ori, pc, pl, pt, ru,
+	  sk, smi, srvr_ctrl, syr, tam, tel, th, tr, ua, urd, us: adding
+	  the keyword
+
+2004-10-09 18:40  svu
+
+	* symbols/: jp, kan, lao, latam, latin, level3, lt, lv: adding the
+	  keyword
+
+2004-10-09 18:35  svu
+
+	* symbols/: deva, dzo, ee, es, eurosign, fo, fr, gb, ge, gr, guj,
+	  guru, ie, iku, il, inet, ir, is, it: adding the keyword
+
+2004-10-09 18:29  svu
+
+	* symbols/: al, altwin, am, ara, az, be, ben, bg, by, capslock, ch,
+	  compose, ctrl, cz: adding the keyword
+
+2004-10-09 18:26  svu
+
+	* symbols/: ca, uz, vn: adding the keyword
+
+2004-10-09 18:23  svu
+
+	* symbols/: ca, uz, vn: fixing
+	  https://freedesktop.org/bugzilla/show_bug.cgi?id=1566
+
+2004-10-09 00:31  svu
+
+	* symbols/ch: fixing
+	  https://freedesktop.org/bugzilla/show_bug.cgi?id=1562
+
+2004-10-09 00:20  svu
+
+	* symbols/ca: fixing
+	  https://freedesktop.org/bugzilla/show_bug.cgi?id=1563
+
+2004-10-08 21:55  svu
+
+	* symbols/hu: fixing
+	  https://freedesktop.org/bugzilla/show_bug.cgi?id=1561
+
+2004-09-29 23:25  svu
+
+	* symbols/macintosh_vndr/: Makefile.am, is: Added Icelandic layout
+	  to the Macintosh group
+
+2004-09-28 00:00  svu
+
+	* NEWS, configure.in: preparing 0.4
+
+2004-09-18 01:00  svu
+
+	* BUGS, rules/base.xml.in: David noticed small glitches in
+	  base.xml.in
+
+2004-09-16 01:11  svu
+
+	* rules/Makefile.am, rules/base.o_s.part, rules/base.xml.in,
+	  rules/compat/Makefile.am, rules/compat/base.o_s.part,
+	  symbols/group: shift_toggle -> shifts_toggle
+
+2004-09-15 23:20  svu
+
+	* symbols/group: make the ctrsl_toggle consistend with the others
+
+2004-09-14 20:54  svu
+
+	* symbols/ba: more commas
+
+2004-09-14 20:38  svu
+
+	* symbols/: mk, srp: more commas
+
+2004-09-14 20:14  svu
+
+	* symbols/: br, de, dk, fi, hr, hu, keypad, no, pl, ro, se, si:
+	  keymap(comma) introduced by Frank
+
+2004-09-13 22:39  svu
+
+	* symbols/tj: new local cvs keyword seems to be ok - no more $Id$
+
+2004-09-13 22:38  svu
+
+	* symbols/tj: trying new local cvs keyword
+
+2004-09-13 19:49  svu
+
+	* symbols/ara, symbols/bg, symbols/by, symbols/capslock,
+	  symbols/deva, symbols/fo, symbols/guj, symbols/guru, symbols/iku,
+	  symbols/il, symbols/ir, symbols/kan, symbols/lao, symbols/mk,
+	  symbols/mm, symbols/mt, symbols/ori, symbols/sk, symbols/srp,
+	  symbols/tel, compat/README, compat/ledcaps, compat/lednum,
+	  compat/ledscroll, docs/README.config, geometry/README,
+	  geometry/dell, geometry/everex, geometry/keytronic,
+	  geometry/kinesis, geometry/microsoft, geometry/northgate,
+	  geometry/sgi_vndr/O2, geometry/sgi_vndr/indigo,
+	  geometry/sgi_vndr/indy, keycodes/README, keycodes/aliases,
+	  keymap/README, keymap/sgi_vndr/cz, keymap/sgi_vndr/sk,
+	  rules/README, symbols/macintosh_vndr/ch,
+	  symbols/macintosh_vndr/es, symbols/macintosh_vndr/fi,
+	  symbols/macintosh_vndr/fr, symbols/macintosh_vndr/it,
+	  symbols/macintosh_vndr/nl, symbols/sun_vndr/usb, types/README,
+	  types/basic, types/default, types/numpad: no dummy XFree keyword
+
+2004-09-11 21:41  svu
+
+	* symbols/tj: trying Id
+
+2004-09-09 23:05  svu
+
+	* symbols/: tj: fixing keyword
+
+2004-09-09 23:02  svu
+
+	* symbols/tj: fixing keyword
+
+2004-09-09 22:07  svu
+
+	* symbols/level3: ONE_LEVEL fixing by Frank
+
+2004-09-09 00:01  svu
+
+	* symbols/group: more fair comment
+
+2004-09-08 23:40  svu
+
+	* symbols/level3: they agreed on this
+
+2004-09-08 20:14  svu
+
+	* compat/Makefile.am, rules/base.o_c.part: no more capsled traces
+
+2004-09-07 23:58  svu
+
+	* symbols/level3: restoring for a while, till guys make agreement
+
+2004-09-07 23:16  svu
+
+	* symbols/mn: just for sync:)
+
+2004-09-07 21:51  svu
+
+	* po/ru.po: updated translation
+
+2004-09-07 21:50  svu
+
+	* rules/base.xml.in: small polish of the option descriptions
+
+2004-09-07 20:56  svu
+
+	* symbols/: al, az, be, br, ca, cz, de, dk, dzo, ee, es, fi, fo,
+	  fr, gb, hr, hu, is, it, latam, level3, lt, mt, nl, no, pt, ro,
+	  se, si, sk, smi, srp, tr, us, vn: changing to ralt_switch
+
+2004-09-07 20:39  svu
+
+	* rules/: base.o_s.part, sgi, sun: small fixes, thanks to Frank
+
+2004-09-07 20:33  svu
+
+	* symbols/urd: forgotten to add
+
+2004-09-06 00:59  svu
+
+	* rules/base.xml.in, symbols/Makefile.am: Adding Urdu layout,
+	  thanks to Zaeem Arshad
+
+2004-09-04 22:39  svu
+
+	* compat/Makefile.am, compat/basic, compat/group_led,
+	  compat/ledcaps, compat/lednum, compat/leds, compat/ledscroll,
+	  compat/misc, rules/base.o_c.part, rules/base.o_s.part,
+	  rules/base.xml.in, symbols/Makefile.am, symbols/capslock,
+	  symbols/group, symbols/lock: reorganizing indicators, thanks to
+	  Frank Murphy
+
+2004-08-28 02:04  svu
+
+	* symbols/compose, rules/base.o_s.part, rules/base.xml.in: adding
+	  RCtrl as Compose
+
+2004-08-27 23:57  svu
+
+	* symbols/us: thanks to Frank, he noticed two default variants in
+	  the us layout
+
+2004-08-27 19:20  svu
+
+	* rules/: base.o_s.part, base.xml.in: meta-info about eurosign
+
+2004-08-27 02:23  svu
+
+	* symbols/: Makefile.am, eurosign: added eurosign
+
+2004-07-25 14:55  svu
+
+	* Makefile.am, mkinstalldirs: fixing mkinstalldirs
+
+2004-07-24 00:42  svu
+
+	* rules/Makefile.am: minor fix for the minor bug detected by
+	  distcheck
+
+2004-07-23 22:21  svu
+
+	* TODO: up2date
+
+2004-07-23 22:00  svu
+
+	* NEWS, configure.in: preparing 0.3
+
+2004-07-23 00:11  svu
+
+	* rules/: HDR, Makefile.am, compat/.cvsignore, compat/Makefile.am,
+	  compat/lnv_s.sh, compat/ml1v1_s.sh: HURRAY!!! Rules are working!
+	  Am I cool or what?
+
+2004-07-22 02:03  svu
+
+	* rules/HDR: fixing the header for MLV
+
+2004-07-21 02:21  svu
+
+	* rules/: HDR, Makefile.am, base.mlv_s.part, base.mvl_s.part,
+	  compat/.cvsignore, compat/Makefile.am, compat/ln_s.sh,
+	  compat/ml1_s.sh, compat/ml_s.sh, compat/mlv_s.sh: variants are
+	  there
+
+2004-07-21 01:57  svu
+
+	* rules/: HDR, Makefile.am, compat/.cvsignore, compat/Makefile.am,
+	  compat/lnv_s.sh, compat/ml1_s.sh, compat/ml1v_s.sh: a bit more
+	  about variants
+
+2004-07-21 01:48  svu
+
+	* rules/: .cvsignore, HDR, Makefile.am, compat/.cvsignore,
+	  compat/Makefile.am, compat/lnv_s.sh, compat/variantRename.lst:
+	  adding variants - not complete yet
+
+2004-07-21 01:25  svu
+
+	* rules/compat/: Makefile.am, l2_s.sh, l3_s.sh, l4_s.sh, ln_s.sh:
+	  single script for the layouts 2-4
+
+2004-07-21 00:02  svu
+
+	* rules/merge.sh: bash is great but sh is standard - and think
+	  optimal, dude
+
+2004-07-20 02:57  svu
+
+	* rules/compat/: l2_s.sh, l3_s.sh, l4_s.sh: the extra layouts (2-4)
+	  should be ADDED using '+' character
+
+2004-07-20 02:49  svu
+
+	* rules/: base.ml1_c.part, base.ml1_s.part, base.ml_c.part,
+	  base.ml_s.part, compat/l2_s.sh, compat/l3_s.sh, compat/l4_s.sh,
+	  compat/ml1_s.sh, compat/ml_s.sh: alignment
+
+2004-07-20 02:33  svu
+
+	* rules/compat/: ml1_s.sh, ml_s.sh: little fix
+
+2004-07-20 02:29  svu
+
+	* rules/: HDR, Makefile.am, base.l1_k.part, base.l2_s.part,
+	  base.l3_s.part, base.l4_s.part, base.l_k.part, base.m_g.part,
+	  base.m_k.part, base.m_s.part, base.m_t.part, base.ml1_c.part,
+	  base.ml1_s.part, base.ml_c.part, base.ml_s.part, base.mvl_s.part,
+	  base.o_c.part, base.o_s.part, base.o_t.part, merge.sh: Now, we
+	  compoze the parts using bash script
+
+2004-07-18 03:54  svu
+
+	* configure.in, rules/.cvsignore, rules/compat/.cvsignore,
+	  rules/compat/Makefile.am, rules/compat/base.lists.part,
+	  rules/compat/l2_s.sh, rules/compat/l3_s.sh, rules/compat/l4_s.sh,
+	  rules/compat/layoutRename.lst, rules/compat/ml1_s.sh,
+	  rules/compat/ml_s.sh: starting bundling compatibility parts
+
+2004-07-18 03:44  svu
+
+	* rules/: Makefile.am, base: cleaning a bit before adding the
+	  compat directory
+
+2004-07-18 01:56  svu
+
+	* rules/: Makefile.am, base, base.l1_k.part, base.l2_s.part,
+	  base.l3_s.part, base.l4_s.part, base.l_k.part, base.lists.part,
+	  base.m_g.part, base.m_k.part, base.m_s.part, base.m_t.part,
+	  base.ml1_c.part, base.ml1_s.part, base.ml_c.part, base.ml_s.part,
+	  base.mvl_s.part, base.o_c.part, base.o_s.part, base.o_t.part:
+	  better empty line handling between rule groups
+
+2004-07-18 01:42  svu
+
+	* rules/: Makefile.am, base, base.hdr.part, base.l1_k.part,
+	  base.l2_s.part, base.l3_s.part, base.l4_s.part, base.l_k.part,
+	  base.lists.part, base.m_g.part, base.m_k.part, base.m_s.part,
+	  base.m_t.part, base.ml1_c.part, base.ml1_s.part, base.ml_c.part,
+	  base.ml_s.part, base.mvl_s.part, base.o_c.part, base.o_s.part,
+	  base.o_t.part: Now, the base rules are composed from microfiles
+	  *.part. I see no other way to handle compatibility in a
+	  manageable way. Kill me if I know it.
+
+2004-07-09 05:21  daniel
+
+	* ChangeLog, configure.in: * configure.in: Alter with-xkb-base
+	  default to $(prefix)/lib/X11/xkb, instead of
+	  $(prefix)/X11R6/lib/xkb, which makes --prefix=/usr behave sanely.
+
+2004-07-08 21:40  svu
+
+	* configure.in: getting rid of unnecessary AM_GLIB_GNU_GETTEXT
+
+2004-07-07 22:52  kidcrash
+
+	* ChangeLog: adding required ChangeLog file
+
+2004-07-06 23:44  svu
+
+	* .cvsignore: Anjuta files are not in CVS - and'll never be
+
+2004-07-04 02:00  svu
+
+	* po/ru.po: updating Russian translation
+
+2004-07-04 01:31  svu
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/cs, symbols/srp:
+	  streamlining ex-yu layouts
+
+2004-07-03 03:32  svu
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/dvorak,
+	  symbols/fr, symbols/gb, symbols/no, symbols/pl, symbols/se,
+	  symbols/us, po/ru.po: splitting dvorak
+
+2004-07-02 01:59  svu
+
+	* symbols/smi: fixing broken layouts, thanks to my testing scripts
+
+2004-07-02 01:49  svu
+
+	* symbols/: Makefile.am, ara, gr, latam, lv, mal, ogam: fixing
+	  broken layouts, thanks to my testing scripts
+
+2004-07-02 00:16  svu
+
+	* po/Makefile.am: adding update-po
+
+2004-07-01 22:28  svu
+
+	* docs/: iso3166.csv, iso639.csv: more fresh version of the
+	  standards
+
+2004-07-01 03:01  svu
+
+	* po/ru.po: completing Russian translation - though some things are
+	  questionable
+
+2004-07-01 02:59  svu
+
+	* config.rpath, mkinstalldirs: why would I need these files in
+	  CVS???
+
+2004-07-01 02:55  svu
+
+	* ABOUT-NLS: empty but very useful file
+
+2004-07-01 02:48  svu
+
+	* Makefile.am, autogen.sh, configure.in, po/Makefile.am,
+	  rules/base.xml.in: Starting to fix intltool problem, Danilo just
+	  roxx
+
+2004-06-30 23:47  svu
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/cs, symbols/yu:
+	  Changed yu to cs as Danilo advised - but not sure it is ok.
+	  Investigating...
+
+2004-06-30 23:25  svu
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/scc, symbols/srp:
+	  Changing scc to srp - as Danilo advised
+
+2004-06-26 01:54  svu
+
+	* BUGS: hopefully fixed Latvian layout
+
+2004-06-26 01:50  svu
+
+	* rules/base.xml.in, symbols/lv: hopefully fixed Latvian layout
+
+2004-06-22 01:11  svu
+
+	* configure.in: trying to set order in the Makefiles list
+
+2004-06-22 00:56  svu
+
+	* Makefile.am, configure.in, autogen.sh: trying to fix intltool -
+	  but without much luck
+
+2004-06-20 20:09  svu
+
+	* rules/base.xml.in: fixing shortDescr for Smi
+
+2004-06-20 19:04  svu
+
+	* docs/: iso15924.csv, iso3166.csv, iso3166.txt, iso639.csv,
+	  iso639.txt: putting order into standards
+
+2004-06-20 15:36  svu
+
+	* symbols/bg: bad patch application
+
+2004-06-20 15:36  svu
+
+	* rules/base.xml.in: typo in Sami id
+
+2004-06-20 15:22  svu
+
+	* symbols/Makefile.am: Frank forgets to chance Makefile.am:)
+
+2004-06-20 14:57  svu
+
+	* xkeyboard-config.spec.in, rules/base, rules/base.xml.in,
+	  docs/Makefile.am, docs/README.symbols, symbols/ar, symbols/ara,
+	  symbols/ba, symbols/bs, symbols/dev, symbols/deva, symbols/dz,
+	  symbols/dzo, symbols/el, symbols/gr, symbols/gur, symbols/guru,
+	  symbols/iku, symbols/iu, symbols/la, symbols/lao, symbols/latam,
+	  symbols/lo, symbols/mal, symbols/mao, symbols/mi, symbols/ml,
+	  symbols/ogam, symbols/ogham, symbols/sapmi, symbols/scc,
+	  symbols/smi, symbols/sr, symbols/tam, symbols/tml: Second phase
+	  of i18n. Frank rocks the world:)
+
+2004-06-19 04:34  svu
+
+	* symbols/mk: Macedonia AKA FYROM
+
+2004-06-19 04:32  svu
+
+	* rules/: Makefile.am, base-it.lst, base.lst, sgi.lst, sun.lst,
+	  xfree98.lst: lst file is not generated automatically - only
+	  base.lst
+
+2004-06-19 04:16  svu
+
+	* rules/: sgi, sun: en_US actually died only now
+
+2004-06-19 04:07  svu
+
+	* symbols/: en_US, sun_vndr/se: en_US actually died only now
+
+2004-06-16 02:07  svu
+
+	* rules/base.xml.in: ISOization, part1
+
+2004-06-16 02:00  svu
+
+	* rules/base.xml.in, symbols/bg, symbols/ch, symbols/el,
+	  symbols/il, symbols/mm: ISOization, part1
+
+2004-06-15 22:04  svu
+
+	* rules/base.xml.in: better wording for Urkainian RSTU description
+
+2004-06-15 19:19  svu
+
+	* rules/base.xml.in, symbols/ru, symbols/ua: Added RSTU
+	  Ukranian/Russian layouts. Thanks to Andrew Porokhnyak
+
+2004-06-13 23:12  svu
+
+	* symbols/inet: actually adding gyration keyboard
+
+2004-06-13 21:30  svu
+
+	* docs/HOWTO.testing: Forgot to add actual document
+
+2004-06-13 21:21  svu
+
+	* BUGS, rules/base, rules/base.lst, rules/base.xml.in, symbols/am,
+	  symbols/inet, symbols/lt, symbols/us: fixing loads of bugs from
+	  fd.o bugzilla
+
+2004-06-13 13:28  svu
+
+	* xkeyboard-config.spec.in, docs/Makefile.am: Added HOWTO.testing
+	  by Frank Murphy
+
+2004-06-12 02:17  svu
+
+	* symbols/mi: getting rid of pc/
+
+2004-06-12 02:14  svu
+
+	* symbols/mi: getting rid of pc/
+
+2004-06-12 02:06  svu
+
+	* NEWS: Redoing 0.2
+
+2004-06-12 02:05  svu
+
+	* symbols/br: fixing bug 515
+
+2004-06-12 02:01  svu
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/mi: Added Maori,
+	  thanks to John C Barstow
+
+2004-06-12 01:50  svu
+
+	* docs/: iso3166.txt, iso639.txt: just to have standards for
+	  reference
+
+2004-06-10 23:58  svu
+
+	* NEWS: Preparing 0.2
+
+2004-06-10 23:51  svu
+
+	* README, configure.in: Preparing 0.2
+
+2004-06-06 04:22  svu
+
+	* xkeyboard-config.spec.in, docs/HOWTO.transition,
+	  docs/Makefile.am, rules/Makefile.am: adding HOWTO.transition
+
+2004-05-28 23:59  svu
+
+	* Makefile.am, configure.in: Optional creation of xkbcomp symlink
+	  in .../X11/xkb
+
+2004-05-25 22:30  svu
+
+	* NEWS: something to say
+
+2004-05-24 22:15  svu
+
+	* po/xkbdesc.pot: changing the project name
+
+2004-05-24 22:08  svu
+
+	* .cvsignore, Makefile.am, autogen.sh, configure.in,
+	  xkbdesc.spec.in, xkeyboard-config.spec.in: changing the project
+	  name
+
+2004-05-23 21:01  svu
+
+	* rules/base, rules/base.xml.in, symbols/altwin: Daniel Elstner
+	  sent new option for Tux keys
+
+2004-05-18 00:24  svu
+
+	* configure.in: no glib stuff
+
+2004-05-12 13:51  pascal
+
+	* rules/base, symbols/bs: Convert Bosnian keymap to multi-layout
+	  compatible form.
+
+2004-05-09 22:26  svu
+
+	* Makefile.am, README.config, README.enhancing, configure.in,
+	  xkbdesc.spec.in, docs/.cvsignore, docs/Makefile.am,
+	  docs/README.config: reorganization in docs
+
+2004-05-09 21:40  svu
+
+	* TODO, docs/README.enhancing: 2 bits of docs
+
+2004-05-07 19:48  svu
+
+	* po/ru.po: up2date
+
+2004-05-07 19:27  svu
+
+	* rules/base.xml.in, symbols/tr, tests/testLayouts.pl,
+	  tests/testOptions.pl, tests/xkbTestFunc.pm: Some small fixes
+	  made. Options are now testable as well.
+
+2004-05-06 02:00  svu
+
+	* tests/: listCI2.xsl, testLayouts.pl, testOptions.pl,
+	  xkbTestFunc.pm: one more test - but still problems passing it
+
+2004-05-06 01:15  svu
+
+	* configure.in, symbols/mk, tests/testLayouts.pl: Makedonian
+	  problem fixed - and BOTH tests are OK
+
+2004-05-06 01:05  svu
+
+	* symbols/digital_vndr/Makefile.am, symbols/digital_vndr/lk,
+	  symbols/digital_vndr/pc, symbols/digital_vndr/us,
+	  symbols/digital_vndr/vt, symbols/fujitsu_vndr/Makefile.am,
+	  symbols/fujitsu_vndr/jp, keycodes/digital_vndr/Makefile.am,
+	  keycodes/digital_vndr/lk, keycodes/digital_vndr/pc,
+	  keycodes/sgi_vndr/Makefile.am, keycodes/sgi_vndr/indigo,
+	  keycodes/sgi_vndr/indy, keycodes/sgi_vndr/iris, keymap/macintosh,
+	  keymap/sony, keymap/xfree98, keymap/digital_vndr/Makefile.am,
+	  keymap/digital_vndr/us, keymap/sgi_vndr/Makefile.am,
+	  keymap/sgi_vndr/be, keymap/sgi_vndr/bg, keymap/sgi_vndr/ca,
+	  keymap/sgi_vndr/ch, keymap/sgi_vndr/cz, keymap/sgi_vndr/de,
+	  keymap/sgi_vndr/dk, keymap/sgi_vndr/dvorak,
+	  keymap/sgi_vndr/en_US, keymap/sgi_vndr/es, keymap/sgi_vndr/fi,
+	  keymap/sgi_vndr/fr, keymap/sgi_vndr/gb, keymap/sgi_vndr/hu,
+	  keymap/sgi_vndr/it, keymap/sgi_vndr/jp, keymap/sgi_vndr/no,
+	  keymap/sgi_vndr/pl, keymap/sgi_vndr/pt, keymap/sgi_vndr/ru,
+	  keymap/sgi_vndr/se, keymap/sgi_vndr/sk, keymap/sgi_vndr/th,
+	  keymap/sgi_vndr/us, keymap/sun_vndr/Makefile.am,
+	  keymap/sun_vndr/de, keymap/sun_vndr/es, keymap/sun_vndr/fi,
+	  keymap/sun_vndr/fr, keymap/sun_vndr/no, keymap/sun_vndr/pl,
+	  keymap/sun_vndr/ru, keymap/sun_vndr/se, keymap/sun_vndr/uk,
+	  keymap/sun_vndr/us, rules/base, rules/base.xml.in,
+	  symbols/hp_vndr/Makefile.am, symbols/macintosh_vndr/Makefile.am,
+	  symbols/macintosh_vndr/apple, symbols/macintosh_vndr/ch,
+	  symbols/macintosh_vndr/de, symbols/macintosh_vndr/dk,
+	  symbols/macintosh_vndr/fi, symbols/macintosh_vndr/no,
+	  symbols/macintosh_vndr/pt, symbols/macintosh_vndr/se,
+	  symbols/macintosh_vndr/us, symbols/nec_vndr/Makefile.am,
+	  symbols/sgi_vndr/Makefile.am, symbols/sony_vndr/Makefile.am,
+	  symbols/sun_vndr/Makefile.am, symbols/sun_vndr/se,
+	  symbols/sun_vndr/us, symbols/xfree68_vndr/Makefile.am,
+	  tests/testLayouts.pl, tests/testModels.pl, tests/xkbTestFunc.pm,
+	  geometry/digital_vndr/Makefile.am, geometry/digital_vndr/pc,
+	  geometry/ibm_vndr/Makefile.am, geometry/ibm_vndr/thinkpad,
+	  geometry/sgi_vndr/Makefile.am: Yahoo! Models test pased ok!
+
+2004-05-05 23:32  svu
+
+	* configure.in, symbols/Makefile.am,
+	  symbols/digital_vndr/.cvsignore,
+	  symbols/digital_vndr/Makefile.am, symbols/digital_vndr/lk,
+	  symbols/digital_vndr/pc, symbols/digital_vndr/us,
+	  symbols/digital_vndr/vt, symbols/fujitsu_vndr/.cvsignore,
+	  symbols/fujitsu_vndr/Makefile.am, symbols/fujitsu_vndr/jp,
+	  symbols/fujitsu_vndr/us, symbols/hp_vndr/.cvsignore,
+	  symbols/hp_vndr/Makefile.am, symbols/hp_vndr/us,
+	  symbols/macintosh_vndr/.cvsignore,
+	  symbols/macintosh_vndr/Makefile.am, symbols/macintosh_vndr/ch,
+	  symbols/macintosh_vndr/de, symbols/macintosh_vndr/dk,
+	  symbols/macintosh_vndr/es, symbols/macintosh_vndr/fi,
+	  symbols/macintosh_vndr/fr, symbols/macintosh_vndr/gb,
+	  symbols/macintosh_vndr/it, symbols/macintosh_vndr/nl,
+	  symbols/macintosh_vndr/no, symbols/macintosh_vndr/pt,
+	  symbols/macintosh_vndr/se, symbols/macintosh_vndr/us,
+	  symbols/nec_vndr/.cvsignore, symbols/nec_vndr/Makefile.am,
+	  symbols/nec_vndr/jp, geometry/Makefile.am,
+	  geometry/digital_vndr/.cvsignore,
+	  geometry/digital_vndr/Makefile.am, geometry/digital_vndr/lk,
+	  geometry/digital_vndr/pc, geometry/digital_vndr/unix,
+	  geometry/ibm_vndr/.cvsignore, geometry/ibm_vndr/Makefile.am,
+	  geometry/ibm_vndr/thinkpad, geometry/sgi_vndr/.cvsignore,
+	  geometry/sgi_vndr/Makefile.am, geometry/sgi_vndr/O2,
+	  geometry/sgi_vndr/indigo, geometry/sgi_vndr/indy,
+	  keycodes/Makefile.am, symbols/sgi_vndr/.cvsignore,
+	  symbols/sgi_vndr/Makefile.am, symbols/sgi_vndr/jp,
+	  symbols/sony_vndr/.cvsignore, symbols/sony_vndr/Makefile.am,
+	  symbols/sony_vndr/us, symbols/sun_vndr/.cvsignore,
+	  symbols/sun_vndr/Makefile.am, symbols/sun_vndr/se,
+	  symbols/sun_vndr/us, symbols/sun_vndr/usb,
+	  symbols/xfree68_vndr/.cvsignore,
+	  symbols/xfree68_vndr/Makefile.am, symbols/xfree68_vndr/amiga,
+	  symbols/xfree68_vndr/ataritt, keycodes/digital_vndr/.cvsignore,
+	  keycodes/digital_vndr/Makefile.am, keycodes/digital_vndr/lk,
+	  keycodes/digital_vndr/pc, keycodes/sgi_vndr/.cvsignore,
+	  keycodes/sgi_vndr/Makefile.am, keycodes/sgi_vndr/indigo,
+	  keycodes/sgi_vndr/indy, keycodes/sgi_vndr/iris,
+	  keymap/Makefile.am, keymap/digital_vndr/.cvsignore,
+	  keymap/digital_vndr/Makefile.am, keymap/digital_vndr/us,
+	  keymap/sgi_vndr/.cvsignore, keymap/sgi_vndr/Makefile.am,
+	  keymap/sgi_vndr/be, keymap/sgi_vndr/bg, keymap/sgi_vndr/ca,
+	  keymap/sgi_vndr/ch, keymap/sgi_vndr/cz, keymap/sgi_vndr/de,
+	  keymap/sgi_vndr/dk, keymap/sgi_vndr/dvorak,
+	  keymap/sgi_vndr/en_US, keymap/sgi_vndr/es, keymap/sgi_vndr/fi,
+	  keymap/sgi_vndr/fr, keymap/sgi_vndr/gb, keymap/sgi_vndr/hu,
+	  keymap/sgi_vndr/it, keymap/sgi_vndr/jp, keymap/sgi_vndr/no,
+	  keymap/sgi_vndr/pl, keymap/sgi_vndr/pt, keymap/sgi_vndr/ru,
+	  keymap/sgi_vndr/se, keymap/sgi_vndr/sk, keymap/sgi_vndr/th,
+	  keymap/sgi_vndr/us, keymap/sun_vndr/.cvsignore,
+	  keymap/sun_vndr/Makefile.am, keymap/sun_vndr/de,
+	  keymap/sun_vndr/es, keymap/sun_vndr/fi, keymap/sun_vndr/fr,
+	  keymap/sun_vndr/no, keymap/sun_vndr/pl, keymap/sun_vndr/ru,
+	  keymap/sun_vndr/se, keymap/sun_vndr/uk, keymap/sun_vndr/us: Ivan
+	  found dots are not good for us
+
+2004-05-03 02:33  svu
+
+	* tests/: testLayouts.pl, testModels.pl, xkbTestFunc.pm: The perl
+	  code is a bit structured now
+
+2004-05-03 00:48  svu
+
+	* po/ru.po: Russian translation, up2date
+
+2004-05-03 00:48  svu
+
+	* po/xkbdesc.pot: new strings
+
+2004-05-03 00:38  svu
+
+	* rules/: base, base.xml.in: some fixes in rules, more tests pass
+	  ok
+
+2004-05-03 00:05  svu
+
+	* rules/base.xml.in, symbols/ch, symbols/mk, tests/testModels.pl:
+	  at least variants pass ok with tests
+
+2004-05-01 02:17  svu
+
+	* symbols/: Makefile.am, hu: Hungarian layout added, thanks to
+	  Soós
+
+2004-04-30 05:27  pascal
+
+	* rules/base, symbols/Makefile.am, symbols/jp, symbols/mn: Add
+	  Japanese and Mongolian layouts.
+
+2004-04-27 23:17  svu
+
+	* rules/base.xml.in: Canadian layout meta-info fixed
+
+2004-04-27 23:13  svu
+
+	* symbols/ge: fixed syntax typo
+
+2004-04-27 22:19  svu
+
+	* rules/base, rules/base.xml.in, symbols/Makefile.am, symbols/fr,
+	  symbols/fr-latin9: French layouts are now merged. Thanks to
+	  Guylhem for the positive answer
+
+2004-04-26 00:57  svu
+
+	* tests/: listCI2.xsl, testModels.pl: trying to test layouts as
+	  well
+
+2004-04-25 20:26  svu
+
+	* tests/: listCIs.xsl, testModels.pl: starting test scripts
+
+2004-04-25 00:37  svu
+
+	* symbols/us: fixing include
+
+2004-04-25 00:17  svu
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/us: us_intl is
+	  returned as alt-intl
+
+2004-04-24 20:29  svu
+
+	* symbols/Makefile.am: new layouts by Ivan should be included into
+	  Makefile.am
+
+2004-04-24 13:32  pascal
+
+	* symbols/ca: Remove 'pc' directory name from includes in Canadian
+	  keymap.
+
+2004-04-24 12:35  pascal
+
+	* rules/base, symbols/az, symbols/ca, symbols/group, symbols/vn:
+	  Add Azeri, Canadian and Vietnamese keymaps.
+
+2004-04-24 02:23  svu
+
+	* rules/base.xml.in, symbols/hr: Croatian US stuff appended
+
+2004-04-24 01:55  svu
+
+	* rules/base, rules/base.xml.in, symbols/Makefile.am, symbols/pl,
+	  symbols/pl2: second polish layout is merged
+
+2004-04-24 01:28  svu
+
+	* keymap/macintosh, keymap/sony, keymap/xfree86, keymap/xfree98,
+	  rules/base.lst, rules/base.xml.in, symbols/Makefile.am,
+	  symbols/ch, symbols/cz, symbols/cz_qwerty, symbols/ge,
+	  symbols/ge_la, symbols/ge_ru, symbols/il, symbols/il_phonetic,
+	  symbols/lt, symbols/mt, symbols/mt_us, symbols/ro, symbols/se_FI,
+	  symbols/se_NO, symbols/se_SE, symbols/sk, symbols/sk_qwerty,
+	  symbols/syr, symbols/syr_phonetic, symbols/th, symbols/th_pat,
+	  symbols/th_tis, symbols/us_intl: a lot of layouts cleaned up -
+	  but way way more to go
+
+2004-04-23 00:46  svu
+
+	* Makefile.am, configure.in, compiled/.cvsignore,
+	  compiled/Makefile.am, compiled/README: The 'compiled' directory
+	  is really necessary. Even if it is empty
+
+2004-04-22 00:39  svu
+
+	* po/af.po, po/az.po, po/bg.po, po/cs.po, po/da.po, po/fr.po,
+	  po/hu.po, po/nl.po, po/ru.po, po/sk.po, po/sq.po, po/sr.po,
+	  po/sv.po, po/tr.po, po/uk.po, po/xkbdesc.pot, po/zh_CN.po,
+	  rules/Makefile.am, symbols/Makefile.am, symbols/al, symbols/am,
+	  symbols/ar, symbols/be, symbols/ben, symbols/br, symbols/by,
+	  symbols/ch, symbols/cz, symbols/cz_qwerty, symbols/de,
+	  symbols/dk, symbols/dvorak, symbols/ee, symbols/el,
+	  symbols/en_US, symbols/es, symbols/fi, symbols/fo, symbols/fr,
+	  symbols/fr-latin9, symbols/gb, symbols/ge_la, symbols/hr,
+	  symbols/ie, symbols/il, symbols/is, symbols/it, symbols/la,
+	  symbols/latin, symbols/lt, symbols/lv, symbols/mk, symbols/ml,
+	  symbols/mt, symbols/mt_us, symbols/nl, symbols/no, symbols/ogham,
+	  symbols/pc, symbols/pl, symbols/pl2, symbols/pt, symbols/ro,
+	  symbols/ru, symbols/sapmi, symbols/se, symbols/se_FI,
+	  symbols/se_NO, symbols/se_SE, symbols/si, symbols/sk,
+	  symbols/sk_qwerty, symbols/sr, symbols/syr, symbols/syr_phonetic,
+	  symbols/th, symbols/tml, symbols/tr, symbols/ua, symbols/us,
+	  symbols/us_intl, symbols/uz, symbols/yu: adding Swiss layouts and
+	  removing references to pc/ from files
+
+2004-04-21 00:19  svu
+
+	* symbols/: Makefile.am, bs, srvr_ctrl: Bosninan layout was
+	  forgotten
+
+2004-04-19 23:57  svu
+
+	* symbols/: Makefile.am, altwin, compose, ctrl, group, inet,
+	  keypad, level3, lock: adding all-important option files
+
+2004-04-16 00:58  svu
+
+	* configure.in, xkbdesc.spec.in, rules/Makefile.am: now, the
+	  symlinks allow distributors to use their own names for the rules
+	  - though not really recommended, we have to be
+	  backward-compatible
+
+2004-04-15 00:33  svu
+
+	* COPYING, Makefile.am, xkbdesc.spec.in, po/af.po, po/az.po,
+	  po/bg.po, po/cs.po, po/da.po, po/fr.po, po/hu.po, po/nl.po,
+	  po/ru.po, po/sk.po, po/sq.po, po/sr.po, po/sv.po, po/tr.po,
+	  po/uk.po, po/xkbdesc.pot, po/zh_CN.po: COPYING added - MIT
+	  license (thanks to Keithp). Some minor fixes on infrastructure
+
+2004-04-12 00:13  svu
+
+	* .cvsignore, Makefile.am, autogen.sh, configure.in, rules/base,
+	  symbols/Makefile.am: First buildable version
+
+2004-04-11 23:03  svu
+
+	* configure.in, keycodes/Makefile.am, keymap/.cvsignore,
+	  keymap/Makefile.am, po/af.po, po/az.po, po/bg.po, po/cs.po,
+	  po/da.po, po/fr.po, po/hu.po, po/nl.po, po/ru.po, po/sk.po,
+	  po/sq.po, po/sr.po, po/sv.po, po/tr.po, po/uk.po, po/xkbdesc.pot,
+	  po/zh_CN.po, rules/.cvsignore, rules/Makefile.am,
+	  semantics/.cvsignore, semantics/Makefile.am, symbols/.cvsignore,
+	  types/.cvsignore, types/Makefile.am: more automake foo - but
+	  still far from building the whole thing
+
+2004-04-10 03:22  svu
+
+	* autogen_gnome.sh, keycodes/.cvsignore, keycodes/Makefile.am: more
+	  makefiles.am - but still long way to the first build
+
+2004-04-10 03:08  svu
+
+	* Makefile.am, README, README.config, README.enhancing,
+	  configure.in, xfree86.xml.in, xfree86_xkb_xml.spec.in, xkb.dtd,
+	  xkbdesc.spec.in, compat/.cvsignore, compat/Makefile.am,
+	  compat/README, compat/accessx, compat/basic, compat/complete,
+	  compat/default, compat/group_led, compat/iso9995, compat/japan,
+	  compat/keypad, compat/leds, compat/misc, compat/mousekeys,
+	  compat/norepeat, compat/pc, compat/pc98, compat/xfree86,
+	  compat/xtest, geometry/.cvsignore, geometry/Makefile.am,
+	  geometry/README, geometry/amiga, geometry/ataritt,
+	  geometry/chicony, geometry/dell, geometry/everex,
+	  geometry/fujitsu, geometry/hp, geometry/keytronic,
+	  geometry/kinesis, geometry/macintosh, geometry/microsoft,
+	  geometry/nec, geometry/northgate, geometry/pc, geometry/sony,
+	  geometry/sun, geometry/winbook, keycodes/README,
+	  keycodes/aliases, keycodes/amiga, keycodes/ataritt,
+	  keycodes/fujitsu, keycodes/hp, keycodes/ibm, keycodes/macintosh,
+	  keycodes/powerpcps2, keycodes/sony, keycodes/sun,
+	  keycodes/xfree86, keycodes/xfree98, keymap/README, keymap/amiga,
+	  keymap/ataritt, keymap/macintosh, keymap/sony, keymap/xfree86,
+	  keymap/xfree98, po/POTFILES.in, po/af.po, po/az.po, po/bg.po,
+	  po/cs.po, po/da.po, po/fr.po, po/hu.po, po/nl.po, po/ru.po,
+	  po/sk.po, po/sq.po, po/sr.po, po/sv.po, po/tr.po, po/uk.po,
+	  po/zh_CN.po, rules/README, rules/base, rules/base-it.lst,
+	  rules/base.lst, rules/base.xml.in, rules/sgi, rules/sgi.lst,
+	  rules/sun, rules/sun.lst, rules/xfree98, rules/xfree98.lst,
+	  rules/xkb.dtd, rules/xml2lst.pl, semantics/basic,
+	  semantics/complete, semantics/default, semantics/xtest,
+	  symbols/al, symbols/am, symbols/ar, symbols/be, symbols/ben,
+	  symbols/bg, symbols/br, symbols/by, symbols/cz,
+	  symbols/cz_qwerty, symbols/de, symbols/dev, symbols/dk,
+	  symbols/dvorak, symbols/dz, symbols/ee, symbols/el,
+	  symbols/en_US, symbols/es, symbols/fi, symbols/fo, symbols/fr,
+	  symbols/fr-latin9, symbols/gb, symbols/ge_la, symbols/ge_ru,
+	  symbols/guj, symbols/gur, symbols/hr, symbols/ie, symbols/il,
+	  symbols/il_phonetic, symbols/ir, symbols/is, symbols/it,
+	  symbols/iu, symbols/kan, symbols/la, symbols/latin, symbols/lo,
+	  symbols/lt, symbols/lv, symbols/mk, symbols/ml, symbols/mm,
+	  symbols/mt, symbols/mt_us, symbols/nl, symbols/no, symbols/ogham,
+	  symbols/ori, symbols/pc, symbols/pl, symbols/pl2, symbols/pt,
+	  symbols/ro, symbols/ru, symbols/sapmi, symbols/se, symbols/se_FI,
+	  symbols/se_NO, symbols/se_SE, symbols/si, symbols/sk,
+	  symbols/sk_qwerty, symbols/sr, symbols/syr, symbols/syr_phonetic,
+	  symbols/tel, symbols/th, symbols/th_pat, symbols/th_tis,
+	  symbols/tj, symbols/tml, symbols/tr, symbols/ua, symbols/us,
+	  symbols/us_intl, symbols/uz, symbols/yu, types/README,
+	  types/basic, types/cancel, types/caps, types/complete,
+	  types/default, types/extra, types/iso9995, types/mousekeys,
+	  types/numpad, types/pc: first feed-in of the layouts. The
+	  revolution is coming
+
+2004-04-04 02:40  svu
+
+	* configure.in, po/az.po: Azerbaijani translation, thanks to Metin
+	  Amiroff
+
+2004-04-04 01:14  svu
+
+	* po/ru.po: Russian translation of the Syriac phonetic
+
+2004-04-04 01:12  svu
+
+	* xfree86.xml.in: Syriac phonetic was not there
+
+2004-03-19 21:37  svu
+
+	* configure.in: some more translations
+
+2004-03-19 21:37  svu
+
+	* po/hu.po: Hungarian one
+
+2004-03-19 21:02  svu
+
+	* po/: af.po, bg.po, cs.po, da.po, fr.po, nl.po, ru.po, sk.po,
+	  sq.po, sr.po, sv.po, tr.po, uk.po, zh_CN.po: three new
+	  translations
+
+2004-01-20 10:51  svu
+
+	* po/ru.po: corrected tibetian language translation
+
+2004-01-19 14:41  svu
+
+	* po/ru.po: updated Russian translation
+
+2004-01-19 14:41  svu
+
+	* xfree86.xml.in: new items from Ivan
+
+2004-01-19 14:39  svu
+
+	* xslt/xfree86.xsl: bugfix
+
+2004-01-09 14:44  svu
+
+	* po/ru.po: up2date
+
+2004-01-09 14:43  svu
+
+	* xfree86.xml.in: patch from Ivan - new items
+
+2004-01-07 09:32  svu
+
+	* configure.in, po/fr.po: French translation, thanks to Michel
+	  Robitaille
+
+2004-01-06 16:20  svu
+
+	* xfree86.xml.in, po/ru.po: updates from Ivan
+
+2004-01-03 14:43  svu
+
+	* po/nl.po: new version, thanks to Elros
+
+2003-12-18 22:43  svu
+
+	* .cvsignore, po/.cvsignore: little cleanup on messages
+
+2003-12-18 22:42  svu
+
+	* Makefile.am, configure.in: little things for the latest intltool
+
+2003-12-18 22:39  svu
+
+	* po/sk.po: Slovak translation, thanks to Zdenko Podobný
+
+2003-12-18 22:38  svu
+
+	* po/da.po: Danish translation, thanks to Ole Laursen
+
+2003-12-18 22:34  svu
+
+	* xfree86.xml.in: One more layout, one more variant, updates from
+	  Ivan
+
+2003-12-05 11:37  svu
+
+	* xslt/xfree86.xsl: helper xslt - reduces the resulting file
+
+2003-12-05 10:39  svu
+
+	* configure.in, po/tr.po: Turkish translation added, thanks to
+	  Nilgün Belma Bugüner
+
+2003-11-30 02:11  svu
+
+	* configure.in, po/sr.po: Serbian translation added, thanks to
+	  Danilo Segan
+
+2003-11-29 04:06  svu
+
+	* configure.in, po/zh_CN.po: Chinese simplified translation, thanks
+	  to Funda Wang
+
+2003-11-27 22:57  svu
+
+	* configure.in, po/nl.po: NL translation. Thanks to Elros Cyriatan
+
+2003-11-27 21:19  svu
+
+	* configure.in: added cs translation
+
+2003-11-27 21:15  svu
+
+	* po/cs.po: First non-cyrillic translation. Thanks to Michal
+	  Bukovjan
+
+2003-11-25 23:52  svu
+
+	* Makefile.am, NEWS, autogen_gnome.sh, configure.in,
+	  xfree86.xml.in, po/.cvsignore, po/Makevars, po/POTFILES.in,
+	  po/bg.po, po/ru.po, po/uk.po: Now the project should be buildable
+	  and translatable - but please no translations till the English
+	  version is approved
+
+2003-11-25 16:35  svu
+
+	* .cvsignore, AUTHORS, Makefile.am, autogen.sh, configure.in,
+	  xfree86.xml.in, xfree86_xkb_xml.spec.in, xkb.dtd: first batch of
+	  files - but no translation yet
+
+2003-11-24 23:32  svu
+
+	* README: first file in
+
diff --git a/xorg-server/xkbdata.src/Makefile.am b/xorg-server/xkbdata.src/Makefile.am
new file mode 100644
index 000000000..b044dc1d2
--- /dev/null
+++ b/xorg-server/xkbdata.src/Makefile.am
@@ -0,0 +1,27 @@
+AUTOMAKE_OPTIONS = foreign
+
+SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs
+
+EXTRA_DIST=config.rpath COPYING CREDITS README \
+       autogen.sh \
+       xkeyboard-config.spec \
+       xkeyboard-config.spec.in \
+       intltool-extract.in intltool-merge.in intltool-update.in
+
+DISTCLEANFILES=intltool-extract intltool-merge intltool-update
+
+# ACLOCAL_AMFLAGS = -I m4
+
+if CREATE_XKBCOMP_SYMLINK
+install-xkbcomp:
+	ln -sf $(XKBCOMP) $(DESTDIR)$(xkb_base)/xkbcomp
+
+else
+install-xkbcomp:
+
+endif
+
+install-data-hook: install-xkbcomp
+
+sync-po:
+	rsync -Lrtvz translationproject.org::tp/latest/xkeyboard-config/  po
diff --git a/xorg-server/xkbdata.src/Makefile.in b/xorg-server/xkbdata.src/Makefile.in
new file mode 100644
index 000000000..37bf2ea1e
--- /dev/null
+++ b/xorg-server/xkbdata.src/Makefile.in
@@ -0,0 +1,638 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = .
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/xkeyboard-config.spec.in \
+	$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
+	NEWS TODO config.rpath install-sh missing
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno configure.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES = xkeyboard-config.spec
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs
+EXTRA_DIST = config.rpath COPYING CREDITS README \
+       autogen.sh \
+       xkeyboard-config.spec \
+       xkeyboard-config.spec.in \
+       intltool-extract.in intltool-merge.in intltool-update.in
+
+DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+all: all-recursive
+
+.SUFFIXES:
+am--refresh:
+	@:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+xkeyboard-config.spec: $(top_builddir)/config.status $(srcdir)/xkeyboard-config.spec.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	mkdir $(distdir)
+	$(mkdir_p) $(distdir)/. $(distdir)/po
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-tarZ: distdir
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
+	chmod a-w $(distdir)
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && cd $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+distuninstallcheck:
+	@cd $(distuninstallcheck_dir) \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+	check-am clean clean-generic clean-recursive ctags \
+	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
+	dist-tarZ dist-zip distcheck distclean distclean-generic \
+	distclean-recursive distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-hook install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive \
+	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-info-am
+
+
+# ACLOCAL_AMFLAGS = -I m4
+
+@CREATE_XKBCOMP_SYMLINK_TRUE@install-xkbcomp:
+@CREATE_XKBCOMP_SYMLINK_TRUE@	ln -sf $(XKBCOMP) $(DESTDIR)$(xkb_base)/xkbcomp
+
+@CREATE_XKBCOMP_SYMLINK_FALSE@install-xkbcomp:
+
+install-data-hook: install-xkbcomp
+
+sync-po:
+	rsync -Lrtvz translationproject.org::tp/latest/xkeyboard-config/  po
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/NEWS b/xorg-server/xkbdata.src/NEWS
new file mode 100644
index 000000000..1edd53443
--- /dev/null
+++ b/xorg-server/xkbdata.src/NEWS
@@ -0,0 +1,33 @@
+1.4	Bugfixes (31). Updated/new translations. Some new layouts and models. Added evdev ruleset.
+1.3	Bugfixes (35). Updated/new translations. Some new layouts and models. A lot of country and language-related information put into base.xml. Dropped unsupported rulesets sgi and sun.
+1.2	Bugfixes (36). Updated/new translations, renewed relations with TP. Some new layouts and models. A lot of changes from OLPC project. Changed base.xml merging schema (.gmo files are installed and used explicitly)
+1.1	First time-based release. Bugfixes (27). Updated/new translations, renewed relations with TP. Renamed (for clarity) types. Some new layouts and models.
+1.0	Maintenance release. Bugfixes (72). Updated/new translations. Updated/new layouts and models.
+0.9	Maintenance release. Bugfixes (76). Updated/new translations. Updated/new layouts.
+0.8	Maintenance release. Bugfixes. Updated/new translations. Updated/new layouts.
+	Massive patch from Sun Microsystems incorporated.
+0.7	New layouts and keyboard models (mostly media keyboards)
+	Massive reorganization of the symbols/inet file (huge credits to Frederic Boiteux)
+	Improved RAlt handling (for grp:alts_toggle and lvl3:ralt_switch)
+	A lot of bugs fixed (from fd.o bugzilla)
+	Added more translations.
+0.5	More bugs from freedesktop.org bugzilla fixed.
+	The group names now are matching the descriptions - and the validating
+	scripts are implemented.
+	Some layouts, variants, models are added/fixed.
+	Some translations are updated (though the overall translation activity 
+	is disappointinly low).
+0.4	A lot of fixes and polishing (introduced own CVS keyword).
+	Highlights:
+	More universal EURO-related options added.
+	Improved reorganized indicator handling.
+	More logical level3 handling
+0.3	HEAVILY restructured layout names
+	Compatibility rules are introduced
+	intltool problem resolved (sorry, with warnings)
+0.2	Now automatically create symlink for xkbcomp (XFree/XOrg servers need it).
+	Added HOWTO.transition.
+        Added Maori layout.
+	Fixed bug 515.
+0.1	First public release. 
+	XKB configuration only. Restructured layouts tree. Only additive layouts are included. No compatibility rules.
diff --git a/xorg-server/xkbdata.src/README b/xorg-server/xkbdata.src/README
new file mode 100644
index 000000000..9d3ae1071
--- /dev/null
+++ b/xorg-server/xkbdata.src/README
@@ -0,0 +1,25 @@
+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 'docs/README.config' file.
+
+For information how to further enhance XKB configuration see 'docs/README.enhancing'
+file.
+
+For information how to replace existing XKB configuration database with 
+XKeyboardConfig see 'docs/HOWTO.transition' file.
diff --git a/xorg-server/xkbdata.src/TODO b/xorg-server/xkbdata.src/TODO
new file mode 100644
index 000000000..8a10faa02
--- /dev/null
+++ b/xorg-server/xkbdata.src/TODO
@@ -0,0 +1,6 @@
++ Ensure all national layouts are 'normalized' (no multiple layouts for same country/language - only variants)
++ Write tests checking that every model/layout(variant)/option in base.xml is working
++ Add the vendor info to the keyboard geometry description
+- Check consistence (correctness, usability) of the descriptions in the registry. Note: ask help from GNOME Usability Team.
+- Write tests which would ensure that base.xml covers everything
+- Write compatibility rules for old models/layouts/variants (potentially eternal job)
diff --git a/xorg-server/xkbdata.src/aclocal.m4 b/xorg-server/xkbdata.src/aclocal.m4
new file mode 100644
index 000000000..8d8b5c242
--- /dev/null
+++ b/xorg-server/xkbdata.src/aclocal.m4
@@ -0,0 +1,1519 @@
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+#
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
+#
+# Modified to never use included libintl. 
+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
+#
+# Major rework to remove unused code
+# Owen Taylor <otaylor@redhat.com>, 12/11/2002
+#
+# Added better handling of ALL_LINGUAS from GNU gettext version 
+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+#
+# Modified to require ngettext
+# Matthias Clasen <mclasen@redhat.com> 08/06/2004
+#
+# We need this here as well, since someone might use autoconf-2.5x
+# to configure GLib then an older version to configure a package
+# using AM_GLIB_GNU_GETTEXT
+AC_PREREQ(2.53)
+
+dnl
+dnl We go to great lengths to make sure that aclocal won't 
+dnl try to pull in the installed version of these macros
+dnl when running aclocal in the glib directory.
+dnl
+m4_copy([AC_DEFUN],[glib_DEFUN])
+m4_copy([AC_REQUIRE],[glib_REQUIRE])
+dnl
+dnl At the end, if we're not within glib, we'll define the public
+dnl definitions in terms of our private definitions.
+dnl
+
+# GLIB_LC_MESSAGES
+#--------------------
+glib_DEFUN([GLIB_LC_MESSAGES],
+  [AC_CHECK_HEADERS([locale.h])
+    if test $ac_cv_header_locale_h = yes; then
+    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+    if test $am_cv_val_LC_MESSAGES = yes; then
+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
+        [Define if your <locale.h> file defines LC_MESSAGES.])
+    fi
+  fi])
+
+# GLIB_PATH_PROG_WITH_TEST
+#----------------------------
+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+  /*)
+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if [$3]; then
+	ac_cv_path_$1="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+  ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
+
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
+  dnl NLS is obligatory
+  [USE_NLS=yes
+    AC_SUBST(USE_NLS)
+
+    gt_cv_have_gettext=no
+
+    CATOBJEXT=NONE
+    XGETTEXT=:
+    INTLLIBS=
+
+    AC_CHECK_HEADER(libintl.h,
+     [gt_cv_func_dgettext_libintl="no"
+      libintl_extra_libs=""
+
+      #
+      # First check in libc
+      #
+      AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
+        [AC_TRY_LINK([
+#include <libintl.h>
+],
+         [return !ngettext ("","", 1)],
+	  gt_cv_func_ngettext_libc=yes,
+          gt_cv_func_ngettext_libc=no)
+        ])
+  
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+	      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+        	[AC_TRY_LINK([
+#include <libintl.h>
+],
+	          [return !dgettext ("","")],
+		  gt_cv_func_dgettext_libc=yes,
+	          gt_cv_func_dgettext_libc=no)
+        	])
+      fi
+  
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+        AC_CHECK_FUNCS(bind_textdomain_codeset)
+      fi
+
+      #
+      # If we don't have everything we want, check in libintl
+      #
+      if test "$gt_cv_func_dgettext_libc" != "yes" \
+	 || test "$gt_cv_func_ngettext_libc" != "yes" \
+         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+        
+        AC_CHECK_LIB(intl, bindtextdomain,
+	    [AC_CHECK_LIB(intl, ngettext,
+		    [AC_CHECK_LIB(intl, dgettext,
+			          gt_cv_func_dgettext_libintl=yes)])])
+
+	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
+	  AC_MSG_RESULT([])
+  	  AC_CHECK_LIB(intl, ngettext,
+          	[AC_CHECK_LIB(intl, dcgettext,
+		       [gt_cv_func_dgettext_libintl=yes
+			libintl_extra_libs=-liconv],
+			:,-liconv)],
+		:,-liconv)
+        fi
+
+        #
+        # If we found libintl, then check in it for bind_textdomain_codeset();
+        # we'll prefer libc if neither have bind_textdomain_codeset(),
+        # and both have dgettext and ngettext
+        #
+        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS -lintl $libintl_extra_libs"
+          unset ac_cv_func_bind_textdomain_codeset
+          AC_CHECK_FUNCS(bind_textdomain_codeset)
+          LIBS="$glib_save_LIBS"
+
+          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+            gt_cv_func_dgettext_libc=no
+          else
+            if test "$gt_cv_func_dgettext_libc" = "yes" \
+		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
+              gt_cv_func_dgettext_libintl=no
+            fi
+          fi
+        fi
+      fi
+
+      if test "$gt_cv_func_dgettext_libc" = "yes" \
+	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        gt_cv_have_gettext=yes
+      fi
+  
+      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        INTLLIBS="-lintl $libintl_extra_libs"
+      fi
+  
+      if test "$gt_cv_have_gettext" = "yes"; then
+	AC_DEFINE(HAVE_GETTEXT,1,
+	  [Define if the GNU gettext() function is already present or preinstalled.])
+	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+	if test "$MSGFMT" != "no"; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS $INTLLIBS"
+	  AC_CHECK_FUNCS(dcgettext)
+	  MSGFMT_OPTS=
+	  AC_MSG_CHECKING([if msgfmt accepts -c])
+	  GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo@bar.xx>\n"
+"Language-Team: C <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+	  AC_SUBST(MSGFMT_OPTS)
+	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+			 return _nl_msg_cat_cntr],
+	    [CATOBJEXT=.gmo 
+             DATADIRNAME=share],
+	    [case $host in
+	    *-*-solaris*)
+	    dnl On Solaris, if bind_textdomain_codeset is in libc,
+	    dnl GNU format message catalog is always supported,
+            dnl since both are added to the libc all together.
+	    dnl Hence, we'd like to go with DATADIRNAME=share and
+	    dnl and CATOBJEXT=.gmo in this case.
+            AC_CHECK_FUNC(bind_textdomain_codeset,
+	      [CATOBJEXT=.gmo 
+               DATADIRNAME=share],
+	      [CATOBJEXT=.mo
+               DATADIRNAME=lib])
+	    ;;
+	    *)
+	    CATOBJEXT=.mo
+            DATADIRNAME=lib
+	    ;;
+	    esac])
+          LIBS="$glib_save_LIBS"
+	  INSTOBJEXT=.mo
+	else
+	  gt_cv_have_gettext=no
+	fi
+      fi
+    ])
+
+    if test "$gt_cv_have_gettext" = "yes" ; then
+      AC_DEFINE(ENABLE_NLS, 1,
+        [always defined to indicate that i18n is enabled])
+    fi
+
+    dnl Test whether we really found GNU xgettext.
+    if test "$XGETTEXT" != ":"; then
+      dnl If it is not GNU xgettext we define it as : so that the
+      dnl Makefiles still can work.
+      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+        : ;
+      else
+        AC_MSG_RESULT(
+	  [found xgettext program is not GNU xgettext; ignore it])
+        XGETTEXT=":"
+      fi
+    fi
+
+    # We need to process the po/ directory.
+    POSUB=po
+
+    AC_OUTPUT_COMMANDS(
+      [case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac])
+
+    dnl These rules are solely for the distribution goal.  While doing this
+    dnl we only have to keep exactly one list of the available catalogs
+    dnl in configure.in.
+    for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(CATALOGS)
+    AC_SUBST(CATOBJEXT)
+    AC_SUBST(DATADIRNAME)
+    AC_SUBST(GMOFILES)
+    AC_SUBST(INSTOBJEXT)
+    AC_SUBST(INTLLIBS)
+    AC_SUBST(PO_IN_DATADIR_TRUE)
+    AC_SUBST(PO_IN_DATADIR_FALSE)
+    AC_SUBST(POFILES)
+    AC_SUBST(POSUB)
+  ])
+
+# AM_GLIB_GNU_GETTEXT
+# -------------------
+# Do checks necessary for use of gettext. If a suitable implementation 
+# of gettext is found in either in libintl or in the C library,
+# it will set INTLLIBS to the libraries needed for use of gettext
+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
+# on various variables needed by the Makefile.in.in installed by 
+# glib-gettextize.
+dnl
+glib_DEFUN([GLIB_GNU_GETTEXT],
+  [AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_HEADER_STDC])dnl
+   
+   GLIB_LC_MESSAGES
+   GLIB_WITH_NLS
+
+   if test "$gt_cv_have_gettext" = "yes"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       AC_MSG_CHECKING(for catalogs to be installed)
+       NEW_LINGUAS=
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+           desiredlanguages="$LINGUAS"
+         else
+           desiredlanguages="$ALL_LINGUAS"
+         fi
+         for desiredlang in $desiredlanguages; do
+ 	   # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
+
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+   dnl Try to locate is.
+   MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
+   dnl Generate list of files to be processed by xgettext which will
+   dnl be included in po/Makefile.
+   test -d po || mkdir po
+   if test "x$srcdir" != "x."; then
+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+       posrcprefix="$srcdir/"
+     else
+       posrcprefix="../$srcdir/"
+     fi
+   else
+     posrcprefix="../"
+   fi
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
+  ])
+
+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+# -------------------------------
+# Define VARIABLE to the location where catalog files will
+# be installed by po/Makefile.
+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+glib_save_prefix="$prefix"
+glib_save_exec_prefix="$exec_prefix"
+glib_save_datarootdir="$datarootdir"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+datarootdir=`eval echo "${datarootdir}"`
+if test "x$CATOBJEXT" = "x.mo" ; then
+  localedir=`eval echo "${libdir}/locale"`
+else
+  localedir=`eval echo "${datadir}/locale"`
+fi
+prefix="$glib_save_prefix"
+exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
+AC_DEFINE_UNQUOTED($1, "$localedir",
+  [Define the location where the catalogs will be installed])
+])
+
+dnl
+dnl Now the definitions that aclocal will find
+dnl
+ifdef(glib_configure_in,[],[
+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+])dnl
+
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+# 
+# Create a temporary file with TEST-FILE as its contents and pass the
+# file name to PROGRAM.  Perform ACTION-IF-PASS if PROGRAM exits with
+# 0 and perform ACTION-IF-FAIL for any other exit status.
+AC_DEFUN([GLIB_RUN_PROG],
+[cat >conftest.foo <<_ACEOF
+$2
+_ACEOF
+if AC_RUN_LOG([$1 conftest.foo]); then
+  m4_ifval([$3], [$3], [:])
+m4_ifvaln([$4], [else $4])dnl
+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+fi])
+
+
+
+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+# serial 40 IT_PROG_INTLTOOL
+AC_DEFUN([IT_PROG_INTLTOOL], [
+AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_NLS])dnl
+
+case "$am__api_version" in
+    1.[01234])
+	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+    ;;
+    *)
+    ;;
+esac
+
+if test -n "$1"; then
+    AC_MSG_CHECKING([for intltool >= $1])
+
+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+    ]
+    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
+fi
+
+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
+fi
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+
+AC_SUBST(INTLTOOL_DESKTOP_RULE)
+AC_SUBST(INTLTOOL_DIRECTORY_RULE)
+AC_SUBST(INTLTOOL_KEYS_RULE)
+AC_SUBST(INTLTOOL_PROP_RULE)
+AC_SUBST(INTLTOOL_OAF_RULE)
+AC_SUBST(INTLTOOL_PONG_RULE)
+AC_SUBST(INTLTOOL_SERVER_RULE)
+AC_SUBST(INTLTOOL_SHEET_RULE)
+AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
+AC_SUBST(INTLTOOL_UI_RULE)
+AC_SUBST(INTLTOOL_XAM_RULE)
+AC_SUBST(INTLTOOL_KBD_RULE)
+AC_SUBST(INTLTOOL_XML_RULE)
+AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+AC_SUBST(INTLTOOL_CAVES_RULE)
+AC_SUBST(INTLTOOL_SCHEMAS_RULE)
+AC_SUBST(INTLTOOL_THEME_RULE)
+AC_SUBST(INTLTOOL_SERVICE_RULE)
+AC_SUBST(INTLTOOL_POLICY_RULE)
+
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
+AC_PATH_PROG(MSGFMT, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+
+AC_PATH_PROG(INTLTOOL_PERL, [perl])
+if test -z "$INTLTOOL_PERL"; then
+   AC_MSG_ERROR([perl not found; required for intltool])
+fi
+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+   AC_MSG_ERROR([perl 5.x required for intltool])
+fi
+if test "x$2" != "xno-xml"; then
+   AC_MSG_CHECKING([for XML::Parser])
+   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+       AC_MSG_RESULT([ok])
+   else
+       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+   fi
+fi
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+  AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM([[]],
+                     [[extern int _nl_msg_cat_cntr;
+                       return _nl_msg_cat_cntr]])],
+    [DATADIRNAME=share],
+    [case $host in
+    *-*-solaris*)
+    dnl On Solaris, if bind_textdomain_codeset is in libc,
+    dnl GNU format message catalog is always supported,
+    dnl since both are added to the libc all together.
+    dnl Hence, we'd like to go with DATADIRNAME=share
+    dnl in this case.
+    AC_CHECK_FUNC(bind_textdomain_codeset,
+      [DATADIRNAME=share], [DATADIRNAME=lib])
+    ;;
+    *)
+    [DATADIRNAME=lib]
+    ;;
+    esac])
+fi
+AC_SUBST(DATADIRNAME)
+
+IT_PO_SUBDIR([po])
+
+])
+
+
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir "po" is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN([IT_PO_SUBDIR],
+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be exetuted at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE([
+  AC_CONFIG_COMMANDS([$1/stamp-it], [
+    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+    >"$1/stamp-it.tmp"
+    [sed '/^#/d
+	 s/^[[].*] *//
+	 /^[ 	]*$/d
+	'"s|^|	$ac_top_srcdir/|" \
+      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+    ]
+    [sed '/^POTFILES =/,/[^\\]$/ {
+		/^POTFILES =/!d
+		r $1/POTFILES
+	  }
+	 ' "$1/Makefile.in" >"$1/Makefile"]
+    rm -f "$1/Makefile.tmp"
+    mv "$1/stamp-it.tmp" "$1/stamp-it"
+  ])
+])dnl
+])
+
+# deprecated macros
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+
+
+# nls.m4 serial 3 (gettext-0.15)
+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ(2.50)
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE(nls,
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT($USE_NLS)
+  AC_SUBST(USE_NLS)
+])
+
+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION so it can be traced.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+	 [AM_AUTOMAKE_VERSION([1.9.6])])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 7
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 8
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+#serial 3
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # So let's grep whole file.
+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+    dirpart=`AS_DIRNAME("$mf")`
+  else
+    continue
+  fi
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n 's/^U = //p' < "$mf"`
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`AS_DIRNAME(["$file"])`
+    AS_MKDIR_P([$dirpart/$fdir])
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 12
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.58])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+   test -f $srcdir/config.status; then
+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+	      		     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [_AM_DEPENDENCIES(CC)],
+                  [define([AC_PROG_CC],
+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_CXX],
+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+])
+])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $1 | $1:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 3
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+#
+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+# created by `make install' are always world readable, even if the
+# installer happens to have an overly restrictive umask (e.g. 077).
+# This was a mistake.  There are at least two reasons why we must not
+# use `-m 0755':
+#   - it causes special bits like SGID to be ignored,
+#   - it may be too restrictive (some setups expect 775 directories).
+#
+# Do not use -m 0755 and let people choose whatever they expect by
+# setting umask.
+#
+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+# Some implementations (such as Solaris 8's) are not thread-safe: if a
+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+# concurrently, both version can detect that a/ is missing, but only
+# one can create it and the other will error out.  Consequently we
+# restrict ourselves to GNU make (using the --version option ensures
+# this.)
+AC_DEFUN([AM_PROG_MKDIR_P],
+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+  # We used to keeping the `.' as first argument, in order to
+  # allow $(mkdir_p) to be used without argument.  As in
+  #   $(mkdir_p) $(somedir)
+  # where $(somedir) is conditionally defined.  However this is wrong
+  # for two reasons:
+  #  1. if the package is installed by a user who cannot write `.'
+  #     make install will fail,
+  #  2. the above comment should most certainly read
+  #     $(mkdir_p) $(DESTDIR)$(somedir)
+  #     so it does not work when $(somedir) is undefined and
+  #     $(DESTDIR) is not.
+  #  To support the latter case, we have to write
+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+  #  so the `.' trick is pointless.
+  mkdir_p='mkdir -p --'
+else
+  # On NextStep and OpenStep, the `mkdir' command does not
+  # recognize any option.  It will interpret all options as
+  # directories to create, and then abort because `.' already
+  # exists.
+  for d in ./-p ./--version;
+  do
+    test -d $d && rmdir $d
+  done
+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+  if test -f "$ac_aux_dir/mkinstalldirs"; then
+    mkdir_p='$(mkinstalldirs)'
+  else
+    mkdir_p='$(install_sh) -d'
+  fi
+fi
+AC_SUBST([mkdir_p])])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 3
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
diff --git a/xorg-server/xkbdata.src/autogen.sh b/xorg-server/xkbdata.src/autogen.sh
new file mode 100644
index 000000000..f9cd42b58
--- /dev/null
+++ b/xorg-server/xkbdata.src/autogen.sh
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+intltoolize
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/xorg-server/xkbdata.src/compat/Makefile.am b/xorg-server/xkbdata.src/compat/Makefile.am
new file mode 100644
index 000000000..4e56a2427
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/Makefile.am
@@ -0,0 +1,15 @@
+compatdir = $(xkb_base)/compat
+
+dist_compat_DATA = \
+accessx basic complete \
+default iso9995 \
+japan keypad ledcaps \
+lednum ledscroll level5 \
+misc mousekeys norepeat \
+olpc pc pc98 xfree86 \
+xtest README
+
+dir_data = $(dist_compat_DATA)
+
+include $(top_srcdir)/xkbrules.am
+
diff --git a/xorg-server/xkbdata.src/compat/Makefile.in b/xorg-server/xkbdata.src/compat/Makefile.in
new file mode 100644
index 000000000..9f0b27772
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/Makefile.in
@@ -0,0 +1,408 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Common rules for building *.dir files in all xkb subdirectories
+# Replaces Imake's MakeXkbDir() rule
+# svu: taken from xkbdata
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+DIST_COMMON = README $(dist_compat_DATA) $(dist_dir_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/xkbrules.am
+subdir = compat
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(compatdir)" "$(DESTDIR)$(dirdir)"
+dist_compatDATA_INSTALL = $(INSTALL_DATA)
+dist_dirDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_compat_DATA) $(dist_dir_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+compatdir = $(xkb_base)/compat
+dist_compat_DATA = \
+accessx basic complete \
+default iso9995 \
+japan keypad ledcaps \
+lednum ledscroll level5 \
+misc mousekeys norepeat \
+olpc pc pc98 xfree86 \
+xtest README
+
+dir_data = $(dist_compat_DATA)
+dist_dir_DATA = $(subdir).dir
+dirdir = $(xkb_base)
+CLEANFILES = $(subdir).dir
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xkbrules.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  compat/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  compat/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_compatDATA: $(dist_compat_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(compatdir)" || $(mkdir_p) "$(DESTDIR)$(compatdir)"
+	@list='$(dist_compat_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_compatDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(compatdir)/$$f'"; \
+	  $(dist_compatDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(compatdir)/$$f"; \
+	done
+
+uninstall-dist_compatDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_compat_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(compatdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(compatdir)/$$f"; \
+	done
+install-dist_dirDATA: $(dist_dir_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)"
+	@list='$(dist_dir_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_dirDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dirdir)/$$f'"; \
+	  $(dist_dirDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dirdir)/$$f"; \
+	done
+
+uninstall-dist_dirDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_dir_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(dirdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(dirdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/..
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(compatdir)" "$(DESTDIR)$(dirdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_compatDATA install-dist_dirDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_compatDATA uninstall-dist_dirDATA \
+	uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_compatDATA install-dist_dirDATA install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_compatDATA uninstall-dist_dirDATA \
+	uninstall-info-am
+
+
+$(subdir).dir: $(dir_data)
+	-rm -f $@
+	here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*'
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/compat/README b/xorg-server/xkbdata.src/compat/README
new file mode 100644
index 000000000..00d591e7b
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/README
@@ -0,0 +1,33 @@
+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.
diff --git a/xorg-server/xkbdata.src/compat/accessx b/xorg-server/xkbdata.src/compat/accessx
new file mode 100644
index 000000000..3e4b46163
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/compat/basic b/xorg-server/xkbdata.src/compat/basic
new file mode 100644
index 000000000..8f99c7b73
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/basic
@@ -0,0 +1,52 @@
+// $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;
+
+    include "ledcaps"
+    include "lednum"
+    indicator "Shift Lock" {
+	!allowExplicit;
+	whichModState= Locked;
+	modifiers= Shift;
+    };
+};
diff --git a/xorg-server/xkbdata.src/compat/compat.dir b/xorg-server/xkbdata.src/compat/compat.dir
new file mode 100644
index 000000000..c99d7fbaf
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/compat.dir
@@ -0,0 +1,29 @@
+-d------ -------- pc98(basic)
+-d------ -------- xtest(xtest)
+-dp----- -------- misc(misc)
+-dp----- -------- mousekeys(mousekeys)
+-dp----- -------- norepeat(norepeat)
+-dp----- -------- ledcaps(caps_lock)
+--p----- -------- ledcaps(group_lock)
+--p----- -------- ledcaps(shift_lock)
+-dp----- -------- japan(japan)
+--p----- -------- japan(kana_lock)
+-d------ -------- default(default)
+-d------ -------- complete(complete)
+-dp----- -------- iso9995(default)
+h-p----- -------- keypad(overlay)
+h-p----- -------- keypad(overlay1)
+h-p----- -------- keypad(overlay2)
+-d------ -------- basic(basic)
+-dp----- -------- level5(default)
+-dp----- -------- lednum(num_lock)
+--p----- -------- lednum(group_lock)
+--p----- -------- lednum(shift_lock)
+-dp----- -------- ledscroll(scroll_lock)
+--p----- -------- ledscroll(group_lock)
+--p----- -------- ledscroll(shift_lock)
+-dp----- -------- pc(pc)
+-d------ -------- olpc(olpc)
+-dp----- -------- accessx(basic)
+--p----- -------- accessx(full)
+-dp----- -------- xfree86(basic)
diff --git a/xorg-server/xkbdata.src/compat/complete b/xorg-server/xkbdata.src/compat/complete
new file mode 100644
index 000000000..dd49a5c43
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/complete
@@ -0,0 +1,12 @@
+// $XKeyboardConfig$
+// $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"
+    augment "level5"
+};
+
diff --git a/xorg-server/xkbdata.src/compat/default b/xorg-server/xkbdata.src/compat/default
new file mode 100644
index 000000000..5355e1318
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/default
@@ -0,0 +1,13 @@
+// $XKeyboardConfig$
+// $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"
+    augment "level5"
+// ??should be changed/renamed/removed
+//    augment "xfree86"
+    augment "japan"
+};
diff --git a/xorg-server/xkbdata.src/compat/iso9995 b/xorg-server/xkbdata.src/compat/iso9995
new file mode 100644
index 000000000..d513c1ce4
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/compat/japan b/xorg-server/xkbdata.src/compat/japan
new file mode 100644
index 000000000..00187d00f
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/japan
@@ -0,0 +1,48 @@
+// $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();
+    };
+};
+
+// Some Japanese keyboards have an explict Kana Lock key & matching LED
+
+partial xkb_compatibility "kana_lock"  {
+
+    virtual_modifiers Kana_Lock;
+
+    interpret Kana_Lock+AnyOfOrNone(all) {
+        virtualModifier= Kana_Lock;
+        useModMapMods=level1;
+        action= LockGroup(group=+1);
+    };
+
+    indicator "Kana" {
+        !allowExplicit;
+	groups= All-Group1;
+    };
+};
+
diff --git a/xorg-server/xkbdata.src/compat/keypad b/xorg-server/xkbdata.src/compat/keypad
new file mode 100644
index 000000000..469edec28
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/compat/ledcaps b/xorg-server/xkbdata.src/compat/ledcaps
new file mode 100644
index 000000000..fc3084eec
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/ledcaps
@@ -0,0 +1,23 @@
+// Use Caps Lock LED to show either Caps Lock, Group, or Shift Lock state
+
+default partial xkb_compatibility "caps_lock"   {
+   indicator "Caps Lock" {
+       !allowExplicit;
+       whichModState= Locked;
+       modifiers= Lock;
+   };
+};
+
+partial xkb_compatibility "group_lock"   {
+   indicator "Caps Lock" {
+       modifiers= None;
+       groups=All-group1;
+   };
+};
+
+partial xkb_compatibility "shift_lock"   {
+   indicator "Caps Lock" {
+       whichModState= Locked;
+       modifiers= Shift;
+   };
+};
diff --git a/xorg-server/xkbdata.src/compat/lednum b/xorg-server/xkbdata.src/compat/lednum
new file mode 100644
index 000000000..24a60a595
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/lednum
@@ -0,0 +1,23 @@
+// Use Num Lock LED to show either Num Lock, Group, or Shift Lock state
+
+default partial xkb_compatibility "num_lock"   {
+    indicator "Num Lock" {
+       !allowExplicit;
+       whichModState= Locked;
+       modifiers= NumLock;
+   };
+};
+
+partial xkb_compatibility "group_lock"   {
+   indicator "Num Lock" {
+       modifiers= None;
+       groups=All-group1;
+   };
+};
+
+partial xkb_compatibility "shift_lock"   {
+   indicator "Num Lock" {
+       whichModState= Locked;
+       modifiers= Shift;
+   };
+};
diff --git a/xorg-server/xkbdata.src/compat/ledscroll b/xorg-server/xkbdata.src/compat/ledscroll
new file mode 100644
index 000000000..ca5a82c4c
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/ledscroll
@@ -0,0 +1,23 @@
+// Use Scroll Lock LED to show either Scroll Lock, Group, or Shift Lock state
+
+default partial xkb_compatibility "scroll_lock"   {
+   indicator "Scroll Lock" {
+       allowExplicit;
+       whichModState= Locked;
+       modifiers= ScrollLock;
+   };
+};
+
+partial xkb_compatibility "group_lock"   {
+   indicator "Scroll Lock" {
+       modifiers= None;
+       groups=All-group1;
+   };
+};
+
+partial xkb_compatibility "shift_lock"   {
+   indicator "Scroll Lock" {
+       whichModState= Locked;
+       modifiers= Shift;
+   };
+};
diff --git a/xorg-server/xkbdata.src/compat/level5 b/xorg-server/xkbdata.src/compat/level5
new file mode 100644
index 000000000..db87d4dcc
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/level5
@@ -0,0 +1,47 @@
+// $XKeyboardConfig$
+// $Xorg: level5,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
+
+// Fairly complete set of symbol interpretations 
+// to provide reasonable default behavior
+
+// $XFree86: xc/programs/xkbcomp/compat/iso9995,v 1.3 2003/02/21 03:16:34 dawes Exp $
+
+default partial xkb_compatibility "default"  {
+    virtual_modifiers LevelFive;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    //ISO_Level5_Shift
+    interpret 0xfe11+Any {
+	useModMapMods= level1;
+	virtualModifier= LevelFive;
+	action= SetMods(modifiers=LevelFive);
+    };
+
+    interpret 0xfe11 {
+	action= SetMods(modifiers=LevelFive);
+    };
+
+    //ISO_Level5_Latch
+    interpret 0xfe12+Any {
+	virtualModifier= LevelFive;
+	action= LatchMods(modifiers=LevelFive);
+    };
+
+    interpret 0xfe12 {
+	action= LatchMods(modifiers=LevelFive);
+    };
+
+    //ISO_Level5_Lock
+    interpret 0xfe13+Any {
+	virtualModifier= LevelFive;
+	action= LockMods(modifiers=LevelFive);
+    };
+
+    interpret 0xfe13 {
+	action= LockMods(modifiers=LevelFive);
+    };
+};
diff --git a/xorg-server/xkbdata.src/compat/misc b/xorg-server/xkbdata.src/compat/misc
new file mode 100644
index 000000000..9566bc6f6
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/misc
@@ -0,0 +1,117 @@
+// $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=Meta);
+    };
+
+    // 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);
+    };
+
+    include "ledscroll"
+};
diff --git a/xorg-server/xkbdata.src/compat/mousekeys b/xorg-server/xkbdata.src/compat/mousekeys
new file mode 100644
index 000000000..fbd2b889a
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/mousekeys
@@ -0,0 +1,205 @@
+
+// $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); 
+    };
+
+    // Additional mappings for Solaris keypad compatibility
+    interpret F25 { // aka KP_Divide
+	action = SetPtrDflt(affect=defaultButton,button=1); 
+    };
+    interpret F26 { // aka KP_Multiply
+	action = SetPtrDflt(affect=defaultButton,button=2); 
+    };
+    interpret F27 { // aka KP_Home
+	action = MovePtr(x=-1,y=-1); 
+    };
+    interpret F29 { // aka KP_Prior
+	action = MovePtr(x=+1,y=-1); 
+    };
+    interpret F31 { // aka KP_Begin
+	action = PointerButton(button=default); 
+    };
+    interpret F33 { // aka KP_End
+	action = MovePtr(x=-1,y= +1); 
+    };
+    interpret F35 { // aka KP_Next
+ 	action = MovePtr(x=+1,y=+1); 
+    };
+
+    interpret.repeat= False;
+
+
+    // New Keysym Actions.
+    //
+    interpret Pointer_Button_Dflt {
+	action= PointerButton(button=default);
+    };
+    interpret Pointer_Button1 {
+	action= PointerButton(button=1);
+    };
+    interpret Pointer_Button2 {
+	action= PointerButton(button=2);
+    };
+    interpret Pointer_Button3 {
+	action= PointerButton(button=3);
+    };
+    interpret Pointer_DblClick_Dflt {
+	action= PointerButton(button=default,count=2);
+    };
+    interpret Pointer_DblClick1 {
+	action= PointerButton(button=1,count=2);
+    };
+    interpret Pointer_DblClick2 {
+	action= PointerButton(button=2,count=2);
+    };
+    interpret Pointer_DblClick3 {
+	action= PointerButton(button=3,count=2);
+    };
+    interpret Pointer_Drag_Dflt	{
+	action= LockPointerButton(button=default);
+    };
+    interpret Pointer_Drag1 {
+	action= LockPointerButton(button=1);
+    };
+    interpret Pointer_Drag2 {
+	action= LockPointerButton(button=2);
+    };
+    interpret Pointer_Drag3 {
+	action= LockPointerButton(button=3);
+    };
+
+    interpret Pointer_EnableKeys {
+	action= LockControls(controls=MouseKeys);
+    };
+    interpret Pointer_Accelerate {
+	action= LockControls(controls=MouseKeysAccel);
+    };
+    interpret Pointer_DfltBtnNext {
+	action= SetPtrDflt(affect=defaultButton,button= +1);
+    };
+    interpret Pointer_DfltBtnPrev {
+	action= SetPtrDflt(affect=defaultButton,button= -1);
+    };
+
+
+    // Allow an indicator for MouseKeys.
+    indicator "Mouse Keys" {
+//	!allowExplicit;
+	indicatorDrivesKeyboard;
+	controls= MouseKeys;
+    };
+};
diff --git a/xorg-server/xkbdata.src/compat/norepeat b/xorg-server/xkbdata.src/compat/norepeat
new file mode 100644
index 000000000..07b0b7a60
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/compat/olpc b/xorg-server/xkbdata.src/compat/olpc
new file mode 100644
index 000000000..001da12c1
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/olpc
@@ -0,0 +1,52 @@
+// $XKeyboardConfig$
+//
+// Created by Bernardo Innocenti <bernie@codewiz.org>
+//
+// Map the OLPC game keys to virtual modifiers
+//
+
+default xkb_compatibility "olpc"  {
+    include "complete"
+
+    virtual_modifiers  Square,Cross,Triangle,Circle;
+
+    interpret KP_Home+Any     {
+        //useModMapMods= level1;
+       virtualModifier= Square;
+       action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret KP_Home  {
+       action = SetMods(modifiers=Square);
+    };
+
+    interpret KP_Next+Any     {
+        //useModMapMods= level1;
+       virtualModifier= Cross;
+       action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret KP_Next  {
+       action = SetMods(modifiers=Cross);
+    };
+
+    interpret KP_End+Any     {
+        //useModMapMods= level1;
+       virtualModifier= Circle;
+       action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret KP_End   {
+       action = SetMods(modifiers=Circle);
+    };
+
+    interpret KP_Prior+Any     {
+        //useModMapMods= level1;
+       virtualModifier= Triangle;
+       action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret KP_Prior {
+       action = SetMods(modifiers=Triangle);
+    };
+};
diff --git a/xorg-server/xkbdata.src/compat/pc b/xorg-server/xkbdata.src/compat/pc
new file mode 100644
index 000000000..5ce7d767d
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/compat/pc98 b/xorg-server/xkbdata.src/compat/pc98
new file mode 100644
index 000000000..23f3f7987
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/compat/xfree86 b/xorg-server/xkbdata.src/compat/xfree86
new file mode 100644
index 000000000..2da65fd6a
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/compat/xtest b/xorg-server/xkbdata.src/compat/xtest
new file mode 100644
index 000000000..a35ced915
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/config.rpath b/xorg-server/xkbdata.src/config.rpath
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/xorg-server/xkbdata.src/config.rpath
diff --git a/xorg-server/xkbdata.src/configure b/xorg-server/xkbdata.src/configure
new file mode 100644
index 000000000..04991cd55
--- /dev/null
+++ b/xorg-server/xkbdata.src/configure
@@ -0,0 +1,7643 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.61 for xkeyboard-config 1.4.
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+  fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+
+  if test $as_have_required = yes && 	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  case $as_dir in
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	   done;;
+       esac
+done
+IFS=$as_save_IFS
+
+
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+        done
+        export CONFIG_SHELL
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell autoconf@gnu.org about your system,
+  echo including any error possibly output before this
+  echo message
+}
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir
+fi
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+    as_ln_s='cp -p'
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+
+exec 7<&0 </dev/null 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Identity of this package.
+PACKAGE_NAME='xkeyboard-config'
+PACKAGE_TARNAME='xkeyboard-config'
+PACKAGE_VERSION='1.4'
+PACKAGE_STRING='xkeyboard-config 1.4'
+PACKAGE_BUGREPORT=''
+
+ac_unique_file="rules/base.xml.in"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='SHELL
+PATH_SEPARATOR
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+CYGPATH_W
+PACKAGE
+VERSION
+ACLOCAL
+AUTOCONF
+AUTOMAKE
+AUTOHEADER
+MAKEINFO
+install_sh
+STRIP
+INSTALL_STRIP_PROGRAM
+mkdir_p
+AWK
+SET_MAKE
+am__leading_dot
+AMTAR
+am__tar
+am__untar
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
+XKBCOMP
+CREATE_RULES_SYMLINK_TRUE
+CREATE_RULES_SYMLINK_FALSE
+CREATE_XKBCOMP_SYMLINK_TRUE
+CREATE_XKBCOMP_SYMLINK_FALSE
+USE_COMPAT_RULES_TRUE
+USE_COMPAT_RULES_FALSE
+USE_NLS
+INTLTOOL_UPDATE
+INTLTOOL_MERGE
+INTLTOOL_EXTRACT
+INTLTOOL_DESKTOP_RULE
+INTLTOOL_DIRECTORY_RULE
+INTLTOOL_KEYS_RULE
+INTLTOOL_PROP_RULE
+INTLTOOL_OAF_RULE
+INTLTOOL_PONG_RULE
+INTLTOOL_SERVER_RULE
+INTLTOOL_SHEET_RULE
+INTLTOOL_SOUNDLIST_RULE
+INTLTOOL_UI_RULE
+INTLTOOL_XAM_RULE
+INTLTOOL_KBD_RULE
+INTLTOOL_XML_RULE
+INTLTOOL_XML_NOMERGE_RULE
+INTLTOOL_CAVES_RULE
+INTLTOOL_SCHEMAS_RULE
+INTLTOOL_THEME_RULE
+INTLTOOL_SERVICE_RULE
+INTLTOOL_POLICY_RULE
+XGETTEXT
+MSGMERGE
+MSGFMT
+GMSGFMT
+INTLTOOL_PERL
+ALL_LINGUAS
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+EXEEXT
+OBJEXT
+DEPDIR
+am__include
+am__quote
+AMDEP_TRUE
+AMDEP_FALSE
+AMDEPBACKSLASH
+CCDEPMODE
+am__fastdepCC_TRUE
+am__fastdepCC_FALSE
+DATADIRNAME
+GETTEXT_PACKAGE
+CPP
+GREP
+EGREP
+MSGFMT_OPTS
+CATALOGS
+CATOBJEXT
+GMOFILES
+INSTOBJEXT
+INTLLIBS
+PO_IN_DATADIR_TRUE
+PO_IN_DATADIR_FALSE
+POFILES
+POSUB
+MKINSTALLDIRS
+xkb_base
+xkb_rules_symlink
+LIBOBJS
+LTLIBOBJS'
+ac_subst_files=''
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
+fi
+
+# Be sure to have absolute directory names.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  { echo "$as_me: error: Working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  { echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$0" ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$0" : 'X\(//\)[^/]' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$0" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+   { (exit 1); exit 1; }; }
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures xkeyboard-config 1.4 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+			  [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+			  [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR          info documentation [DATAROOTDIR/info]
+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR           man documentation [DATAROOTDIR/man]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/xkeyboard-config]
+  --htmldir=DIR          html documentation [DOCDIR]
+  --dvidir=DIR           dvi documentation [DOCDIR]
+  --pdfdir=DIR           pdf documentation [DOCDIR]
+  --psdir=DIR            ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of xkeyboard-config 1.4:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer
+  --enable-xkbcomp-symlink      create xkbcomp symlink to $(xkb_base)../../../bin/xkbcomp
+  --enable-compat-rules      create compatibility rules
+  --disable-nls           do not use Native Language Support
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-xkb-base=DIR     XKB base path [DATADIR/X11/xkb]
+  --with-xkb-rules-symlink=NAME1(,NAME2)*        create symlink(s) to "old style" rules files (xfree86 and/or xorg)
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" || continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+xkeyboard-config configure 1.4
+generated by GNU Autoconf 2.61
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by xkeyboard-config $as_me 1.4, which was
+generated by GNU Autoconf 2.61.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  echo "PATH: $as_dir"
+done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    2)
+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      ac_configure_args="$ac_configure_args '$ac_arg'"
+      ;;
+    esac
+  done
+done
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      echo "$as_me: caught signal $ac_signal"
+    echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer explicitly selected file to automatically selected ones.
+if test -n "$CONFIG_SITE"; then
+  set x "$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+else
+  set x "$ac_default_prefix/share/config.site" \
+	"$ac_default_prefix/etc/config.site"
+fi
+shift
+for ac_site_file
+do
+  if test -r "$ac_site_file"; then
+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+	ac_cache_corrupted=:
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+am__api_version="1.9"
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	    break 3
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+done
+IFS=$as_save_IFS
+
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&5
+echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+Check your system clock" >&5
+echo "$as_me: error: newly created file is older than distributed files!
+Check your system clock" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.  echo might interpret backslashes.
+# By default was `s,x,x', remove it if useless.
+cat <<\_ACEOF >conftest.sed
+s/[\\$]/&&/g;s/;s,x,x,$//
+_ACEOF
+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+rm -f conftest.sed
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+  # We used to keeping the `.' as first argument, in order to
+  # allow $(mkdir_p) to be used without argument.  As in
+  #   $(mkdir_p) $(somedir)
+  # where $(somedir) is conditionally defined.  However this is wrong
+  # for two reasons:
+  #  1. if the package is installed by a user who cannot write `.'
+  #     make install will fail,
+  #  2. the above comment should most certainly read
+  #     $(mkdir_p) $(DESTDIR)$(somedir)
+  #     so it does not work when $(somedir) is undefined and
+  #     $(DESTDIR) is not.
+  #  To support the latter case, we have to write
+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+  #  so the `.' trick is pointless.
+  mkdir_p='mkdir -p --'
+else
+  # On NextStep and OpenStep, the `mkdir' command does not
+  # recognize any option.  It will interpret all options as
+  # directories to create, and then abort because `.' already
+  # exists.
+  for d in ./-p ./--version;
+  do
+    test -d $d && rmdir $d
+  done
+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+  if test -f "$ac_aux_dir/mkinstalldirs"; then
+    mkdir_p='$(mkinstalldirs)'
+  else
+    mkdir_p='$(install_sh) -d'
+  fi
+fi
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+  SET_MAKE=
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+   test -f $srcdir/config.status; then
+  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='xkeyboard-config'
+ VERSION='1.4'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
+
+
+
+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+
+
+if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+
+
+
+# Extract the first word of "xkbcomp", so it can be a program name with args.
+set dummy xkbcomp; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_XKBCOMP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $XKBCOMP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XKBCOMP="$XKBCOMP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_XKBCOMP="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_XKBCOMP" && ac_cv_path_XKBCOMP="not_found"
+  ;;
+esac
+fi
+XKBCOMP=$ac_cv_path_XKBCOMP
+if test -n "$XKBCOMP"; then
+  { echo "$as_me:$LINENO: result: $XKBCOMP" >&5
+echo "${ECHO_T}$XKBCOMP" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+if test x$XKBCOMP = xnot_found ; then
+        { { echo "$as_me:$LINENO: error: xkbcomp is required to install the xkb data files" >&5
+echo "$as_me: error: xkbcomp is required to install the xkb data files" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+# Check whether --with-xkb_base was given.
+if test "${with_xkb_base+set}" = set; then
+  withval=$with_xkb_base; xkb_base="$withval"
+else
+  xkb_base="\$(datadir)/X11/xkb"
+fi
+
+
+
+# Check whether --with-xkb_rules_symlink was given.
+if test "${with_xkb_rules_symlink+set}" = set; then
+  withval=$with_xkb_rules_symlink; xkb_rules_symlink="$withval"
+fi
+
+
+# Check whether --enable-xkbcomp_symlink was given.
+if test "${enable_xkbcomp_symlink+set}" = set; then
+  enableval=$enable_xkbcomp_symlink; enable_xkbcomp_symlink="$enableval"
+else
+  enable_xkbcomp_symlink="yes"
+fi
+
+
+# Check whether --enable-compat_rules was given.
+if test "${enable_compat_rules+set}" = set; then
+  enableval=$enable_compat_rules; enable_compat_rules="$enableval"
+else
+  enable_compat_rules="yes"
+fi
+
+
+
+
+if test "x$xkb_rules_symlink" != "x"; then
+  CREATE_RULES_SYMLINK_TRUE=
+  CREATE_RULES_SYMLINK_FALSE='#'
+else
+  CREATE_RULES_SYMLINK_TRUE='#'
+  CREATE_RULES_SYMLINK_FALSE=
+fi
+
+
+
+
+if test "x$enable_xkbcomp_symlink" = "xyes"; then
+  CREATE_XKBCOMP_SYMLINK_TRUE=
+  CREATE_XKBCOMP_SYMLINK_FALSE='#'
+else
+  CREATE_XKBCOMP_SYMLINK_TRUE='#'
+  CREATE_XKBCOMP_SYMLINK_FALSE=
+fi
+
+
+
+
+if test "x$enable_compat_rules" = "xyes"; then
+  USE_COMPAT_RULES_TRUE=
+  USE_COMPAT_RULES_FALSE='#'
+else
+  USE_COMPAT_RULES_TRUE='#'
+  USE_COMPAT_RULES_FALSE=
+fi
+
+
+# ****
+# i18n
+# ****
+
+  { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
+    # Check whether --enable-nls was given.
+if test "${enable_nls+set}" = set; then
+  enableval=$enable_nls; USE_NLS=$enableval
+else
+  USE_NLS=yes
+fi
+
+  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
+echo "${ECHO_T}$USE_NLS" >&6; }
+
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+
+
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+
+
+if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:$LINENO: checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+#
+# List of possible output files, starting from the most likely.
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+# only as a last resort.  b.out is created by i960 compilers.
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+#
+# The IRIX 6 linker writes into existing files which may not be
+# executable, retaining their permissions.  Remove them first so a
+# subsequent execution test works.
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { (ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+See \`config.log' for more details." >&5
+echo "$as_me: error: C compiler cannot create executables
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }
+fi
+
+ac_exeext=$ac_cv_exeext
+
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  fi
+fi
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
+
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+rm -f conftest$ac_cv_exeext
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+if test "${ac_cv_objext+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+GCC=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_c89=$ac_arg
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+  xno)
+    { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CC"   am_compiler_list=
+
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+
+
+if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+
+
+case "$am__api_version" in
+    1.01234)
+	{ { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+   { (exit 1); exit 1; }; }
+    ;;
+    *)
+    ;;
+esac
+
+if test -n "0.30"; then
+    { echo "$as_me:$LINENO: checking for intltool >= 0.30" >&5
+echo $ECHO_N "checking for intltool >= 0.30... $ECHO_C" >&6; }
+
+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.30 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+
+    { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+	{ { echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool 0.30 or later." >&5
+echo "$as_me: error: Your intltool is too old.  You need intltool 0.30 or later." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# Extract the first word of "intltool-update", so it can be a program name with args.
+set dummy intltool-update; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $INTLTOOL_UPDATE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
+if test -n "$INTLTOOL_UPDATE"; then
+  { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
+echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+# Extract the first word of "intltool-merge", so it can be a program name with args.
+set dummy intltool-merge; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $INTLTOOL_MERGE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
+if test -n "$INTLTOOL_MERGE"; then
+  { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
+echo "${ECHO_T}$INTLTOOL_MERGE" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+# Extract the first word of "intltool-extract", so it can be a program name with args.
+set dummy intltool-extract; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $INTLTOOL_EXTRACT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
+if test -n "$INTLTOOL_EXTRACT"; then
+  { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
+echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+    { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
+echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check the gettext tools to make sure they are GNU
+# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_XGETTEXT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $XGETTEXT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+XGETTEXT=$ac_cv_path_XGETTEXT
+if test -n "$XGETTEXT"; then
+  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+echo "${ECHO_T}$XGETTEXT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+# Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_MSGMERGE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $MSGMERGE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+MSGMERGE=$ac_cv_path_MSGMERGE
+if test -n "$MSGMERGE"; then
+  { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+echo "${ECHO_T}$MSGMERGE" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_MSGFMT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $MSGFMT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+MSGFMT=$ac_cv_path_MSGFMT
+if test -n "$MSGFMT"; then
+  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
+echo "${ECHO_T}$MSGFMT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+# Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_GMSGFMT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $GMSGFMT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+echo "${ECHO_T}$GMSGFMT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+    { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+    { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $INTLTOOL_PERL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+if test -n "$INTLTOOL_PERL"; then
+  { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
+echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+if test -z "$INTLTOOL_PERL"; then
+   { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
+echo "$as_me: error: perl not found; required for intltool" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+   { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
+echo "$as_me: error: perl 5.x required for intltool" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test "x" != "xno-xml"; then
+   { echo "$as_me:$LINENO: checking for XML::Parser" >&5
+echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
+   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+       { echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6; }
+   else
+       { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+fi
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+extern int _nl_msg_cat_cntr;
+                       return _nl_msg_cat_cntr
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  DATADIRNAME=share
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	case $host in
+    *-*-solaris*)
+                        { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
+if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char bind_textdomain_codeset (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef bind_textdomain_codeset
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char bind_textdomain_codeset ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+choke me
+#endif
+
+int
+main ()
+{
+return bind_textdomain_codeset ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_func_bind_textdomain_codeset=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_bind_textdomain_codeset=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
+if test $ac_cv_func_bind_textdomain_codeset = yes; then
+  DATADIRNAME=share
+else
+  DATADIRNAME=lib
+fi
+
+    ;;
+    *)
+    DATADIRNAME=lib
+    ;;
+    esac
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+
+
+
+
+
+
+GETTEXT_PACKAGE=xkeyboard-config
+
+
+cat >>confdefs.h <<_ACEOF
+#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
+_ACEOF
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # Extract the first word of "grep ggrep" to use in msg output
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
+if test "${ac_cv_path_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_path_GREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in grep ggrep; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+    # Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+    $ac_path_GREP_found && break 3
+  done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     # Extract the first word of "egrep" to use in msg output
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_path_EGREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in egrep; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+    # Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+    $ac_path_EGREP_found && break 3
+  done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+EGREP="$ac_cv_path_EGREP"
+if test -z "$EGREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+
+   fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_stdc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_header_stdc=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then
+  :
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+for ac_header in locale.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+    if test $ac_cv_header_locale_h = yes; then
+    { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <locale.h>
+int
+main ()
+{
+return LC_MESSAGES
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  am_cv_val_LC_MESSAGES=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	am_cv_val_LC_MESSAGES=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
+    if test $am_cv_val_LC_MESSAGES = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LC_MESSAGES 1
+_ACEOF
+
+    fi
+  fi
+     USE_NLS=yes
+
+
+    gt_cv_have_gettext=no
+
+    CATOBJEXT=NONE
+    XGETTEXT=:
+    INTLLIBS=
+
+    if test "${ac_cv_header_libintl_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for libintl.h" >&5
+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_libintl_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <libintl.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <libintl.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libintl.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: libintl.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for libintl.h" >&5
+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_libintl_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_libintl_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
+
+fi
+if test $ac_cv_header_libintl_h = yes; then
+  gt_cv_func_dgettext_libintl="no"
+      libintl_extra_libs=""
+
+      #
+      # First check in libc
+      #
+      { echo "$as_me:$LINENO: checking for ngettext in libc" >&5
+echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }
+if test "${gt_cv_func_ngettext_libc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <libintl.h>
+
+int
+main ()
+{
+return !ngettext ("","", 1)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  gt_cv_func_ngettext_libc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gt_cv_func_ngettext_libc=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
+echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
+
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+	      { echo "$as_me:$LINENO: checking for dgettext in libc" >&5
+echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
+if test "${gt_cv_func_dgettext_libc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <libintl.h>
+
+int
+main ()
+{
+return !dgettext ("","")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  gt_cv_func_dgettext_libc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gt_cv_func_dgettext_libc=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
+echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
+      fi
+
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+
+for ac_func in bind_textdomain_codeset
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+      fi
+
+      #
+      # If we don't have everything we want, check in libintl
+      #
+      if test "$gt_cv_func_dgettext_libc" != "yes" \
+	 || test "$gt_cv_func_ngettext_libc" != "yes" \
+         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+
+        { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
+echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char bindtextdomain ();
+int
+main ()
+{
+return bindtextdomain ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_intl_bindtextdomain=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_intl_bindtextdomain=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
+if test $ac_cv_lib_intl_bindtextdomain = yes; then
+  { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ngettext ();
+int
+main ()
+{
+return ngettext ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_intl_ngettext=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_intl_ngettext=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
+if test $ac_cv_lib_intl_ngettext = yes; then
+  { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
+echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dgettext ();
+int
+main ()
+{
+return dgettext ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_intl_dgettext=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_intl_dgettext=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }
+if test $ac_cv_lib_intl_dgettext = yes; then
+  gt_cv_func_dgettext_libintl=yes
+fi
+
+fi
+
+fi
+
+
+	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+	  { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
+echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }
+	  { echo "$as_me:$LINENO: result: " >&5
+echo "${ECHO_T}" >&6; }
+  	  { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl -liconv $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ngettext ();
+int
+main ()
+{
+return ngettext ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_intl_ngettext=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_intl_ngettext=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
+if test $ac_cv_lib_intl_ngettext = yes; then
+  { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
+echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl -liconv $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dcgettext ();
+int
+main ()
+{
+return dcgettext ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_intl_dcgettext=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_intl_dcgettext=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }
+if test $ac_cv_lib_intl_dcgettext = yes; then
+  gt_cv_func_dgettext_libintl=yes
+			libintl_extra_libs=-liconv
+else
+  :
+fi
+
+else
+  :
+fi
+
+        fi
+
+        #
+        # If we found libintl, then check in it for bind_textdomain_codeset();
+        # we'll prefer libc if neither have bind_textdomain_codeset(),
+        # and both have dgettext and ngettext
+        #
+        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS -lintl $libintl_extra_libs"
+          unset ac_cv_func_bind_textdomain_codeset
+
+for ac_func in bind_textdomain_codeset
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+          LIBS="$glib_save_LIBS"
+
+          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+            gt_cv_func_dgettext_libc=no
+          else
+            if test "$gt_cv_func_dgettext_libc" = "yes" \
+		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
+              gt_cv_func_dgettext_libintl=no
+            fi
+          fi
+        fi
+      fi
+
+      if test "$gt_cv_func_dgettext_libc" = "yes" \
+	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        gt_cv_have_gettext=yes
+      fi
+
+      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        INTLLIBS="-lintl $libintl_extra_libs"
+      fi
+
+      if test "$gt_cv_have_gettext" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETTEXT 1
+_ACEOF
+
+	# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_MSGFMT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case "$MSGFMT" in
+  /*)
+  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
+	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
+  ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != "no"; then
+  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
+echo "${ECHO_T}$MSGFMT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+	if test "$MSGFMT" != "no"; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS $INTLLIBS"
+
+for ac_func in dcgettext
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+	  MSGFMT_OPTS=
+	  { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
+echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
+	  cat >conftest.foo <<_ACEOF
+
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo@bar.xx>\n"
+"Language-Team: C <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+_ACEOF
+if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+  ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+echo "$as_me: failed input was:" >&5
+sed 's/^/| /' conftest.foo >&5
+fi
+
+	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_GMSGFMT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $GMSGFMT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+echo "${ECHO_T}$GMSGFMT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+	  # Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_XGETTEXT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case "$XGETTEXT" in
+  /*)
+  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
+	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+  ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+echo "${ECHO_T}$XGETTEXT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+	  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+extern int _nl_msg_cat_cntr;
+			 return _nl_msg_cat_cntr
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  CATOBJEXT=.gmo
+             DATADIRNAME=share
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	case $host in
+	    *-*-solaris*)
+	    	                	    	                { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
+if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char bind_textdomain_codeset (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef bind_textdomain_codeset
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char bind_textdomain_codeset ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+choke me
+#endif
+
+int
+main ()
+{
+return bind_textdomain_codeset ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_func_bind_textdomain_codeset=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_bind_textdomain_codeset=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
+if test $ac_cv_func_bind_textdomain_codeset = yes; then
+  CATOBJEXT=.gmo
+               DATADIRNAME=share
+else
+  CATOBJEXT=.mo
+               DATADIRNAME=lib
+fi
+
+	    ;;
+	    *)
+	    CATOBJEXT=.mo
+            DATADIRNAME=lib
+	    ;;
+	    esac
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+          LIBS="$glib_save_LIBS"
+	  INSTOBJEXT=.mo
+	else
+	  gt_cv_have_gettext=no
+	fi
+      fi
+
+fi
+
+
+
+    if test "$gt_cv_have_gettext" = "yes" ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_NLS 1
+_ACEOF
+
+    fi
+
+        if test "$XGETTEXT" != ":"; then
+                  if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+        : ;
+      else
+        { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
+        XGETTEXT=":"
+      fi
+    fi
+
+    # We need to process the po/ directory.
+    POSUB=po
+
+    ac_config_commands="$ac_config_commands default-1"
+
+
+                for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+
+
+
+
+
+
+
+
+
+
+
+
+   if test "$gt_cv_have_gettext" = "yes"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
+       NEW_LINGUAS=
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+           desiredlanguages="$LINGUAS"
+         else
+           desiredlanguages="$ALL_LINGUAS"
+         fi
+         for desiredlang in $desiredlanguages; do
+ 	   # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
+       done
+       LINGUAS=$NEW_LINGUAS
+       { echo "$as_me:$LINENO: result: $LINGUAS" >&5
+echo "${ECHO_T}$LINGUAS" >&6; }
+     fi
+
+          if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+            MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+
+
+         test -d po || mkdir po
+   if test "x$srcdir" != "x."; then
+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+       posrcprefix="$srcdir/"
+     else
+       posrcprefix="../$srcdir/"
+     fi
+   else
+     posrcprefix="../"
+   fi
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
+
+
+ALL_LINGUAS="af az bg cs da el en_GB es fi fr hu it ka ko nl ru rw sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW"
+
+
+
+
+ac_config_files="$ac_config_files po/Makefile.in Makefile compat/Makefile geometry/Makefile geometry/digital_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 rules/compat/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 xkeyboard-config.spec docs/Makefile"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
+    cat confcache >$cache_file
+  else
+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+ac_script='
+t clear
+:clear
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+b any
+:quote
+s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+	g
+	s/^\n//
+	s/\n/ /g
+	p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
+
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${CREATE_RULES_SYMLINK_TRUE}" && test -z "${CREATE_RULES_SYMLINK_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"CREATE_RULES_SYMLINK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"CREATE_RULES_SYMLINK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${CREATE_XKBCOMP_SYMLINK_TRUE}" && test -z "${CREATE_XKBCOMP_SYMLINK_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"CREATE_XKBCOMP_SYMLINK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"CREATE_XKBCOMP_SYMLINK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${USE_COMPAT_RULES_TRUE}" && test -z "${USE_COMPAT_RULES_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_COMPAT_RULES\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_COMPAT_RULES\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+  ac_config_commands="$ac_config_commands po/stamp-it"
+
+
+
+: ${CONFIG_STATUS=./config.status}
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+  fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir
+fi
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+    as_ln_s='cp -p'
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+
+# Save the log message, to keep $[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by xkeyboard-config $as_me 1.4, which was
+generated by GNU Autoconf 2.61.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+  -q, --quiet      do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+		   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf@gnu.org>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+ac_cs_version="\\
+xkeyboard-config config.status 1.4
+configured by $0, generated by GNU Autoconf 2.61,
+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2006 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    ac_need_defaults=false;;
+  --he | --h |  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) { echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+if \$ac_cs_recheck; then
+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  CONFIG_SHELL=$SHELL
+  export CONFIG_SHELL
+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "compat/Makefile") CONFIG_FILES="$CONFIG_FILES compat/Makefile" ;;
+    "geometry/Makefile") CONFIG_FILES="$CONFIG_FILES geometry/Makefile" ;;
+    "geometry/digital_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES geometry/digital_vndr/Makefile" ;;
+    "geometry/sgi_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES geometry/sgi_vndr/Makefile" ;;
+    "keycodes/Makefile") CONFIG_FILES="$CONFIG_FILES keycodes/Makefile" ;;
+    "keycodes/digital_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES keycodes/digital_vndr/Makefile" ;;
+    "keycodes/sgi_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES keycodes/sgi_vndr/Makefile" ;;
+    "keymap/Makefile") CONFIG_FILES="$CONFIG_FILES keymap/Makefile" ;;
+    "keymap/digital_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES keymap/digital_vndr/Makefile" ;;
+    "keymap/sgi_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES keymap/sgi_vndr/Makefile" ;;
+    "keymap/sun_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES keymap/sun_vndr/Makefile" ;;
+    "semantics/Makefile") CONFIG_FILES="$CONFIG_FILES semantics/Makefile" ;;
+    "rules/Makefile") CONFIG_FILES="$CONFIG_FILES rules/Makefile" ;;
+    "rules/compat/Makefile") CONFIG_FILES="$CONFIG_FILES rules/compat/Makefile" ;;
+    "symbols/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/Makefile" ;;
+    "symbols/digital_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/digital_vndr/Makefile" ;;
+    "symbols/fujitsu_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/fujitsu_vndr/Makefile" ;;
+    "symbols/hp_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/hp_vndr/Makefile" ;;
+    "symbols/macintosh_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/macintosh_vndr/Makefile" ;;
+    "symbols/nec_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/nec_vndr/Makefile" ;;
+    "symbols/sgi_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/sgi_vndr/Makefile" ;;
+    "symbols/sony_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/sony_vndr/Makefile" ;;
+    "symbols/sun_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/sun_vndr/Makefile" ;;
+    "symbols/xfree68_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/xfree68_vndr/Makefile" ;;
+    "types/Makefile") CONFIG_FILES="$CONFIG_FILES types/Makefile" ;;
+    "xkeyboard-config.spec") CONFIG_FILES="$CONFIG_FILES xkeyboard-config.spec" ;;
+    "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
+    "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
+
+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} ||
+{
+   echo "$me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
+
+#
+# Set up the sed scripts for CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "$CONFIG_FILES"; then
+
+_ACEOF
+
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+CYGPATH_W!$CYGPATH_W$ac_delim
+PACKAGE!$PACKAGE$ac_delim
+VERSION!$VERSION$ac_delim
+ACLOCAL!$ACLOCAL$ac_delim
+AUTOCONF!$AUTOCONF$ac_delim
+AUTOMAKE!$AUTOMAKE$ac_delim
+AUTOHEADER!$AUTOHEADER$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
+install_sh!$install_sh$ac_delim
+STRIP!$STRIP$ac_delim
+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
+AWK!$AWK$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+MAINT!$MAINT$ac_delim
+XKBCOMP!$XKBCOMP$ac_delim
+CREATE_RULES_SYMLINK_TRUE!$CREATE_RULES_SYMLINK_TRUE$ac_delim
+CREATE_RULES_SYMLINK_FALSE!$CREATE_RULES_SYMLINK_FALSE$ac_delim
+CREATE_XKBCOMP_SYMLINK_TRUE!$CREATE_XKBCOMP_SYMLINK_TRUE$ac_delim
+CREATE_XKBCOMP_SYMLINK_FALSE!$CREATE_XKBCOMP_SYMLINK_FALSE$ac_delim
+USE_COMPAT_RULES_TRUE!$USE_COMPAT_RULES_TRUE$ac_delim
+USE_COMPAT_RULES_FALSE!$USE_COMPAT_RULES_FALSE$ac_delim
+USE_NLS!$USE_NLS$ac_delim
+INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
+INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
+INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
+INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
+INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
+INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
+INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim
+INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim
+INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim
+INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim
+INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim
+INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
+INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
+INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
+INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
+INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
+INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
+INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
+INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
+INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
+INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
+INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+MSGMERGE!$MSGMERGE$ac_delim
+MSGFMT!$MSGFMT$ac_delim
+GMSGFMT!$GMSGFMT$ac_delim
+INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
+ALL_LINGUAS!$ALL_LINGUAS$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
+DEPDIR!$DEPDIR$ac_delim
+am__include!$am__include$ac_delim
+am__quote!$am__quote$ac_delim
+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+CCDEPMODE!$CCDEPMODE$ac_delim
+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+DATADIRNAME!$DATADIRNAME$ac_delim
+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
+CPP!$CPP$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
+CATALOGS!$CATALOGS$ac_delim
+CATOBJEXT!$CATOBJEXT$ac_delim
+GMOFILES!$GMOFILES$ac_delim
+INSTOBJEXT!$INSTOBJEXT$ac_delim
+INTLLIBS!$INTLLIBS$ac_delim
+PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
+PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
+POFILES!$POFILES$ac_delim
+POSUB!$POSUB$ac_delim
+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
+xkb_base!$xkb_base$ac_delim
+xkb_rules_symlink!$xkb_rules_symlink$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
+_ACEOF
+
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+fi # test -n "$CONFIG_FILES"
+
+
+for ac_tag in  :F $CONFIG_FILES      :C $CONFIG_COMMANDS
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+   { (exit 1); exit 1; }; };;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
+      esac
+      ac_file_inputs="$ac_file_inputs $ac_f"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input="Generated from "`IFS=:
+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    fi
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin";;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+
+case `sed -n '/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+' $ac_file_inputs` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+    s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF
+  sed "$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s&@configure_input@&$configure_input&;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+$ac_datarootdir_hack
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
+
+  rm -f "$tmp/stdin"
+  case $ac_file in
+  -) cat "$tmp/out"; rm -f "$tmp/out";;
+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+  esac
+ ;;
+
+
+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # So let's grep whole file.
+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+    dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  else
+    continue
+  fi
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n 's/^U = //p' < "$mf"`
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    { as_dir=$dirpart/$fdir
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+ ;;
+    "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac ;;
+    "po/stamp-it":C)
+    rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
+    >"po/stamp-it.tmp"
+    sed '/^#/d
+	 s/^[[].*] *//
+	 /^[ 	]*$/d
+	'"s|^|	$ac_top_srcdir/|" \
+      "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
+
+    sed '/^POTFILES =/,/[^\\]$/ {
+		/^POTFILES =/!d
+		r po/POTFILES
+	  }
+	 ' "po/Makefile.in" >"po/Makefile"
+    rm -f "po/Makefile.tmp"
+    mv "po/stamp-it.tmp" "po/stamp-it"
+   ;;
+
+  esac
+done # for ac_tag
+
+
+{ (exit 0); exit 0; }
+_ACEOF
+chmod +x $CONFIG_STATUS
+ac_clean_files=$ac_clean_files_save
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
+
+
+echo '***********************************************************'
+echo "  $PACKAGE_NAME is configured with the following parameters:"
+echo "    XKB base directory: $xkb_base"
+if test -z "$xkb_rules_symlink" ; then
+  echo "    Symbolic link(s) to legacy rules are not created"
+else
+  echo "    Symbolic link(s) to legacy rules: $xkb_rules_symlink"
+fi
+
+if test "$enable_compat_rules" == "yes" ; then
+  echo "    Compatibility rules are included"
+else
+  echo "    Compatibility rules are not included"
+fi
+echo '***********************************************************'
+
diff --git a/xorg-server/xkbdata.src/configure.in b/xorg-server/xkbdata.src/configure.in
new file mode 100644
index 000000000..b2df0669c
--- /dev/null
+++ b/xorg-server/xkbdata.src/configure.in
@@ -0,0 +1,100 @@
+AC_INIT(xkeyboard-config, 1.4)
+AC_CONFIG_SRCDIR(rules/base.xml.in)
+AM_INIT_AUTOMAKE([dist-bzip2])
+AM_MAINTAINER_MODE
+
+AC_SUBST(VERSION)
+
+AC_PATH_PROG([XKBCOMP], [xkbcomp], [not_found])
+if test x$XKBCOMP = xnot_found ; then
+        AC_ERROR([xkbcomp is required to install the xkb data files])
+fi
+
+AC_ARG_WITH( xkb_base,
+             [AS_HELP_STRING([--with-xkb-base=DIR],[XKB base path @<:@DATADIR/X11/xkb@:>@])],
+             xkb_base="$withval", 
+             xkb_base="\$(datadir)/X11/xkb" )
+
+AC_ARG_WITH( xkb_rules_symlink,
+             [  --with-xkb-rules-symlink=NAME1(,NAME2)*        create symlink(s) to "old style" rules files (xfree86 and/or xorg)],
+             xkb_rules_symlink="$withval" )
+
+AC_ARG_ENABLE( xkbcomp_symlink,
+               [  --enable-xkbcomp-symlink      create xkbcomp symlink to $(xkb_base)../../../bin/xkbcomp],
+               enable_xkbcomp_symlink="$enableval",
+               enable_xkbcomp_symlink="yes" )
+
+AC_ARG_ENABLE( compat_rules,
+               [  --enable-compat-rules      create compatibility rules],
+               enable_compat_rules="$enableval",
+               enable_compat_rules="yes" )
+
+AM_CONDITIONAL(CREATE_RULES_SYMLINK, test "x$xkb_rules_symlink" != "x")
+
+AM_CONDITIONAL(CREATE_XKBCOMP_SYMLINK, test "x$enable_xkbcomp_symlink" = "xyes")
+
+AM_CONDITIONAL(USE_COMPAT_RULES, test "x$enable_compat_rules" = "xyes")
+
+# ****
+# i18n
+# ****
+AC_PROG_INTLTOOL(0.30)
+
+GETTEXT_PACKAGE=xkeyboard-config
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
+
+AM_GLIB_GNU_GETTEXT
+
+ALL_LINGUAS="af az bg cs da el en_GB es fi fr hu it ka ko nl ru rw sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW"
+
+AC_SUBST(xkb_base)
+AC_SUBST(xkb_rules_symlink)
+
+AC_OUTPUT([ po/Makefile.in
+Makefile
+compat/Makefile
+geometry/Makefile
+geometry/digital_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
+rules/compat/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
+xkeyboard-config.spec
+docs/Makefile
+])
+
+echo '***********************************************************'
+echo "  $PACKAGE_NAME is configured with the following parameters:"
+echo "    XKB base directory: $xkb_base"
+if test -z "$xkb_rules_symlink" ; then
+  echo "    Symbolic link(s) to legacy rules are not created"
+else
+  echo "    Symbolic link(s) to legacy rules: $xkb_rules_symlink"
+fi
+
+if test "$enable_compat_rules" == "yes" ; then
+  echo "    Compatibility rules are included"
+else
+  echo "    Compatibility rules are not included"
+fi
+echo '***********************************************************'
+
diff --git a/xorg-server/xkbdata.src/docs/HOWTO.testing b/xorg-server/xkbdata.src/docs/HOWTO.testing
new file mode 100644
index 000000000..01aa0500c
--- /dev/null
+++ b/xorg-server/xkbdata.src/docs/HOWTO.testing
@@ -0,0 +1,22 @@
+A mini-HOWTO test the XKB config without modifying the system configuration.
+(Only tested with XFree86 4.3+.) 
+
+First see what your configuration is. Note the model and layout.
+   $ setxkbmap -print
+
+Then unpack the sources locally ...
+   $ gzip -dc xkeyboard-config*.tar.gz | tar -tf -
+... and change to the delivered directory
+   $ cd xkeyboard-config-<version>
+
+Then try to load the current keyboard using the local rules
+   $ setxkbmap -v 10 -I$PWD -rules base
+
+Now try to set different keyboards using the -model and -layout.
+   $ setxkbmap -v 10 -I$PWD -rules base -model pc102 -layout intl
+Look in the file rules/base for other example models and layouts
+
+If there was a problem, you can reset the keyboard like so:
+   $ setxkbmap -rules xfree86 -model <noted model> -layout <noted layout>
+
+If that doesn't work, you may have to log out and log back in.
diff --git a/xorg-server/xkbdata.src/docs/HOWTO.transition b/xorg-server/xkbdata.src/docs/HOWTO.transition
new file mode 100644
index 000000000..f671af93d
--- /dev/null
+++ b/xorg-server/xkbdata.src/docs/HOWTO.transition
@@ -0,0 +1,19 @@
+PURPOSE
+
+This document describes the procedure for replacing the standard XKB configuration repository shipped with an X Window System implementation. The procedure should work for XFree86 4.3 and higher and X11R7 implementation from X.Org. Any other X server supporting so called "multiple layouts" can be powered with XKeyboardConfig in a similar way (at the moment NO known commercial X Window System implementations support "multimple layouts"). X servers which do not support "multiple layouts" can be used with XKeyboardConfig as well - but users should be aware that only one group will be accessible with each possible XKB configuration.
+
+PROCEDURE
+
+1. Find your current XKB configuration data directory. In most cases it is /usr/X11R6/lib/X11/xkb. This directory usually contain subdirectores: compat, compiled, geometry, keycodes, keymap, rules, semantics, symbols etc.
+
+2. Backup your current XKB configuration data directory (for example, rename it to xkb.orig) - so you would be able to restore your original configuration in case of troubles.
+
+3. Untar XKeyboardConfiguration tarball (tar -xzvf xkeyboard-config-0.2.tar.gz). Change to the root project directory. Run the configure script with appropriate options. There are several useful options:
+  
+  --with-xkb-rules-symlink=NAME - this option creates symlinks for the rules and registry files. The default file names are base and base.xml correspondingly. Using this option allows to create symlinks for configuration files compatibility (for example, --with-xkb-rules-symlink=xfree86 creates symlinks xfree86 and xfree86.xml - so users would be able to use rules set "xfree86").
+  
+  --enable-xkbcomp-symlink - creates symlink from original xkbcomp utility (usually found in /usr/X111R6/bin) to XKB configuration directory (usually it is required by XKB server). By default, this option is enabled - but user can disable it.
+  
+4. Run "make" and (as root) "make install". At that point, new /usr/X11R6/lib/X11/xkb should be created.
+
+5. Adjust the configuration files (XF86Config, xorg.conf etc.). If you don't use the symlinks, you should use the rules set "base" (as the "XkbRules" value). If you added --with-xkb-rules-symlink option, you can use either "base" or the name of the rules symlink you created (for example, "xfree86").
diff --git a/xorg-server/xkbdata.src/docs/Makefile.am b/xorg-server/xkbdata.src/docs/Makefile.am
new file mode 100644
index 000000000..5ae0e80a1
--- /dev/null
+++ b/xorg-server/xkbdata.src/docs/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST= README.config README.enhancing README.symbols HOWTO.transition HOWTO.testing
diff --git a/xorg-server/xkbdata.src/docs/Makefile.in b/xorg-server/xkbdata.src/docs/Makefile.in
new file mode 100644
index 000000000..d9cf91106
--- /dev/null
+++ b/xorg-server/xkbdata.src/docs/Makefile.in
@@ -0,0 +1,332 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = docs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+EXTRA_DIST = README.config README.enhancing README.symbols HOWTO.transition HOWTO.testing
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  docs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/docs/README.config b/xorg-server/xkbdata.src/docs/README.config
new file mode 100644
index 000000000..4a068867d
--- /dev/null
+++ b/xorg-server/xkbdata.src/docs/README.config
@@ -0,0 +1,195 @@
+                         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 $
diff --git a/xorg-server/xkbdata.src/docs/README.enhancing b/xorg-server/xkbdata.src/docs/README.enhancing
new file mode 100644
index 000000000..5e684925f
--- /dev/null
+++ b/xorg-server/xkbdata.src/docs/README.enhancing
@@ -0,0 +1,525 @@
+                  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.
+
+      FOUR_LEVEL_MIXED_KEYPAD
+	    A four-level keypad scheme where the first two levels are similar
+            to the KEYPAD scheme (NumLock+Shift)
+            LevelThree acts as an override providing access to two Shift-ed
+            levels. When LevelThree is active we totally ignore NumLock state
+            Intended for the digit area of the keypad
+
+      FOUR_LEVEL_X
+            A four-level scheme where the base level accepts no modifier,
+            LevelThree provides two more Shift-ed levels like in the previous
+            scheme, and Ctrl+Alt controls the fourth level
+            Intended for the operator part of a keypad, though since NumLock
+            plays no part, it is not keypad-specific
+
+Besides that, there are several schemes for special purposes:
+
+      PC_CONTROL_LEVEL2
+            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_ALT_LEVEL2
+            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: xc/programs/xkbcomp/README.enhancing,v 1.5 2003/10/19 19:57:44 dawes Exp $
diff --git a/xorg-server/xkbdata.src/docs/README.symbols b/xorg-server/xkbdata.src/docs/README.symbols
new file mode 100644
index 000000000..749618e77
--- /dev/null
+++ b/xorg-server/xkbdata.src/docs/README.symbols
@@ -0,0 +1,51 @@
+
+The files in the symbols directory describe possible layouts for a given 
+keyboard.
+
+The default layout in each file should describe the most common layout
+for its kind, usually the symbols printed on the keys. Layout variants
+can describe common differences that are not necessarily printed on the keys.
+(e.g. a phonetic version of Cyrillic).
+
+The names of the files are referenced throughout the XKB rules, and may be
+exposed in the X server configuration and in user configuration tools.
+The filenames use the following convention:
+
+Country layouts:
+
+  Keyboard layouts for a country must use the 2-letter code from the
+  ISO-3166 standard.
+
+Language layouts:
+
+  Keyboard layouts for a language must use the 3-letter code from the
+  ISO-639 standard.
+
+Script layouts:
+
+  Keyboard layouts for a script must use the 4-letter code from the
+  ISO-15924 standard.
+
+Other:
+
+  Keyboard layouts that do not fit in the above model and directories
+  must use a filename between 5 and 8 characters.
+
+The ISO codes can be found at the following addressed:
+
+Country layouts:  http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/iso_3166-1_decoding_table.html
+Language layouts: http://www.loc.gov/standards/iso639-2/langcodes.html
+Script layouts:   http://www.unicode.org/iso15924/iso15924-codes.html
+
+The description in the directory file base.xml.in should match the group names 
+in the symbols file. 
+
+If the layout is country-based, this has to be the full 
+name of the country. It is highly not recommended to use the forms 
+"Republic of XXX" or "XXX Republic" - the form "XXX" should be used instead.
+The only exception is "United Kingdom".
+
+If the layout is language-based, this has to be the name of the language.
+
+Within single symbols file, all the variants should have the same group name 
+(implemented using the "include" directive wherever possible).
diff --git a/xorg-server/xkbdata.src/geometry/Makefile.am b/xorg-server/xkbdata.src/geometry/Makefile.am
new file mode 100644
index 000000000..8dccdc288
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/Makefile.am
@@ -0,0 +1,15 @@
+SUBDIRS = digital_vndr  sgi_vndr
+
+geomdir = $(xkb_base)/geometry
+
+dist_geom_DATA = \
+amiga ataritt chicony \
+dell everex fujitsu \
+hhk hp keytronic kinesis \
+macintosh microsoft nec \
+northgate pc sony thinkpad \
+sun winbook README
+
+dir_data = $(dist_geom_DATA)
+
+include $(top_srcdir)/xkbrules.am
diff --git a/xorg-server/xkbdata.src/geometry/Makefile.in b/xorg-server/xkbdata.src/geometry/Makefile.in
new file mode 100644
index 000000000..46de52ae5
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/Makefile.in
@@ -0,0 +1,564 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Common rules for building *.dir files in all xkb subdirectories
+# Replaces Imake's MakeXkbDir() rule
+# svu: taken from xkbdata
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+DIST_COMMON = README $(dist_dir_DATA) $(dist_geom_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/xkbrules.am
+subdir = geometry
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(geomdir)"
+dist_dirDATA_INSTALL = $(INSTALL_DATA)
+dist_geomDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_dir_DATA) $(dist_geom_DATA)
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+SUBDIRS = digital_vndr  sgi_vndr
+geomdir = $(xkb_base)/geometry
+dist_geom_DATA = \
+amiga ataritt chicony \
+dell everex fujitsu \
+hhk hp keytronic kinesis \
+macintosh microsoft nec \
+northgate pc sony thinkpad \
+sun winbook README
+
+dir_data = $(dist_geom_DATA)
+dist_dir_DATA = $(subdir).dir
+dirdir = $(xkb_base)
+CLEANFILES = $(subdir).dir
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xkbrules.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  geometry/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  geometry/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_dirDATA: $(dist_dir_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)"
+	@list='$(dist_dir_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_dirDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dirdir)/$$f'"; \
+	  $(dist_dirDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dirdir)/$$f"; \
+	done
+
+uninstall-dist_dirDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_dir_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(dirdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(dirdir)/$$f"; \
+	done
+install-dist_geomDATA: $(dist_geom_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(geomdir)" || $(mkdir_p) "$(DESTDIR)$(geomdir)"
+	@list='$(dist_geom_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_geomDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(geomdir)/$$f'"; \
+	  $(dist_geomDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(geomdir)/$$f"; \
+	done
+
+uninstall-dist_geomDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_geom_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(geomdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(geomdir)/$$f"; \
+	done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/..
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(geomdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-dist_dirDATA install-dist_geomDATA
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-dist_dirDATA uninstall-dist_geomDATA \
+	uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-recursive ctags ctags-recursive \
+	distclean distclean-generic distclean-recursive distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dist_dirDATA \
+	install-dist_geomDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_dirDATA \
+	uninstall-dist_geomDATA uninstall-info-am
+
+
+$(subdir).dir: $(dir_data)
+	-rm -f $@
+	here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*'
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/geometry/README b/xorg-server/xkbdata.src/geometry/README
new file mode 100644
index 000000000..5f4dcc72c
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/README
@@ -0,0 +1,6 @@
+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.
diff --git a/xorg-server/xkbdata.src/geometry/amiga b/xorg-server/xkbdata.src/geometry/amiga
new file mode 100644
index 000000000..357c4c0e1
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/geometry/ataritt b/xorg-server/xkbdata.src/geometry/ataritt
new file mode 100644
index 000000000..e53cd94c2
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/geometry/chicony b/xorg-server/xkbdata.src/geometry/chicony
new file mode 100644
index 000000000..9bdd15b00
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/geometry/dell b/xorg-server/xkbdata.src/geometry/dell
new file mode 100644
index 000000000..76f135e25
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/dell
@@ -0,0 +1,542 @@
+// $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.
+//
+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
+
+
+xkb_geometry "dell65" {
+};
+
+xkb_geometry "dell65x" {
+
+    description= "Dell 101";
+    width= 470;
+    height= 210;
+    color="grey10";
+
+    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";
+    };
+
+    shape "BACKGROUND"  { cornerRadius=5, { [  470,  210 ] } };
+    solid "Background" {
+	shape= "BACKGROUND";
+	top=  0;
+	left= 0;
+	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>;
+
+};
+
+
+//
+// Dell Precision M65
+//
+
+xkb_geometry "dellm65" {
+
+    description= "Dell Precision M65";
+    width= 308;
+    height= 152;
+    baseColor = "grey20";
+    labelColor = "white";
+
+    shape "BACKGROUND"  { cornerRadius = 3, { [  308,  152 ] } };
+    shape "BACKGROUND2" { cornerRadius = 2, { [  7, 22 ], 
+                                              [ 171, 22 ],
+                                              [ 171, 10 ],
+                                              [ 301, 10 ],
+                                              [ 301, 148 ],
+                                              [ 244, 148 ],
+                                              [ 244, 132 ],
+                                              [   7, 132] } }; 
+    solid "Background" {
+	shape = "BACKGROUND";
+	top = 0;
+	left = 0;
+	color = "grey20";
+    };
+    solid "Background2" {
+	shape = "BACKGROUND2";
+	top = 0;
+	left = 0;
+	color = "black";
+    };
+
+    shape "LEDS" { cornerRadius = 4, { [ 26, 8 ] } };
+    shape "LED" { cornerRadius = 0, { [ 4, 4 ] } };
+    solid "LedPanel" {
+	shape = "LEDS";
+	top = 8;
+	left = 69;
+	color = "grey20";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "gray20";
+    indicator.top= 10;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 72; };
+    indicator "Caps Lock"    { left= 80; };
+    indicator "Scroll Lock"  { left= 88; };
+
+    shape "MEDIA" { cornerRadius = 5, { [ 2, 2], [ 12, 12 ] } };
+    shape "POWER" { cornerRadius = 7, { [ 14, 14 ] } };
+
+    section "Media" {
+        top = 5;
+        left = 102;
+        width = 60;
+        height = 14;
+        key.color="grey30";
+        key.shape = "MEDIA";
+        row {
+           top = 0;
+           keys {
+             <I2E>, <I30>, <I20>, { <I04>, shape = "POWER", gap = 3 }
+           };
+        };
+    };
+
+
+    shape "FKEY" { cornerRadius = 1, { [ 18, 12 ] }, { [ 1, 1 ], [ 17, 10 ] } };
+
+    section "Function" {
+       top = 12;
+       left = 8;
+       width = 290;
+       height = 24;
+       key.color = "grey80";
+       key.shape = "FKEY";
+       key.gap = 0;
+       row {
+	    top = 0;
+            keys {      { <MENU>, 165 }, <PRSC>, <NMLK>, <PAUS>, 
+                        { <INS>, 1 },  <HOME>, <PGUP> };
+       };
+       row {
+	    top = 12;
+            keys { <ESC>, { <FK01>, 1 }, <FK02>, <FK03>, <FK04>, 
+                          { <FK05>, 1 }, <FK06>, <FK07>, <FK08>,
+                          { <FK09>, 1 }, <FK10>, <FK11>, <FK12>,
+                          { <DELE>,  1 }, <END>, <PGDN> };
+       };
+   };
+
+   shape "AKEY" { cornerRadius = 1, { [ 19, 19 ] }, { [ 2, 1 ], [ 17, 15 ] } };
+   shape "BKSP" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
+   shape "TABK" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "BKSL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "CAPS" { cornerRadius = 1, { [ 34, 19 ] }, { [ 2, 1 ], [ 32, 15 ] } };
+   shape "RTRN" { cornerRadius = 1, { [ 47, 19 ] }, { [ 2, 1 ], [ 45, 15 ] } };
+   shape "LFSH" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
+   shape "RTSH" { cornerRadius = 1, { [ 56, 19 ] }, { [ 2, 1 ], [ 54, 15 ] } };
+   shape "LCTL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "LALT" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
+   shape "RCTL" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
+   shape "SPCE" { cornerRadius = 1, { [ 96, 19 ] }, { [ 2, 1 ], [ 94, 15 ] } };
+   
+
+   section "Alpha" {
+       top = 36;
+       left = 8;
+       width = 290;
+       height = 21;
+       key.color = "grey80";
+       key.shape = "AKEY";
+       key.gap = 0;
+       row {
+	    top = 1;
+            keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, 1, "BKSP" } };
+	};
+       row {
+	    top = 20;
+            keys { { <TAB>, "TABK" },
+		   { <AD01>, 1 }, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, 1, "BKSL" } };
+	};
+       row {
+	    top = 39;
+            keys { { <CAPS>, "CAPS" },
+		   { <AC01>, 1 }, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, 1, "RTRN" } };
+	};
+       row {
+	    top = 58;
+            keys { { <LFSH>, "LFSH" },
+		   { <AB01>, 1 }, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		   { <RTSH>, 1, "RTSH" } };
+	};
+       row {
+           top = 77;
+           keys { { <LCTL>, "LCTL" }, { <LWIN>, 20 }, { <LALT>, "LALT" }, 
+                  { <SPCE>, "SPCE" }, <RALT>, { <RCTL>, "RCTL" } };
+	};
+   };
+
+   shape "SKEY" { cornerRadius = 1, { [ 18, 17 ] }, { [ 2, 1 ], [ 16, 13 ] } };
+   section "Arrows" {
+        top = 113;
+        left = 243;
+        width = 54;
+        height = 36;
+        
+       key.color = "grey80";
+        key.shape = "SKEY";
+        row {
+           top = 0;
+           left = 20;
+
+           keys { <UP> };
+        };
+  
+        row {
+            top = 17;
+            left = 2;
+
+            keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+   };
+
+  shape "STIK" { cornerRadius = 4, { [ 7, 7 ] } };
+
+  solid "STIK" {
+      priority = 255;
+      color = "blue";
+      shape = "STIK";
+      top = 90; 
+      left = 135;
+  };
+};
+ 
+
diff --git a/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.am b/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.am
new file mode 100644
index 000000000..821c0ccf4
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.am
@@ -0,0 +1,4 @@
+geomdir = $(xkb_base)/geometry/digital_vndr
+
+dist_geom_DATA = \
+lk  pc  unix
diff --git a/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.in
new file mode 100644
index 000000000..370a54696
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.in
@@ -0,0 +1,367 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = geometry/digital_vndr
+DIST_COMMON = $(dist_geom_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(geomdir)"
+dist_geomDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_geom_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+geomdir = $(xkb_base)/geometry/digital_vndr
+dist_geom_DATA = \
+lk  pc  unix
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  geometry/digital_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  geometry/digital_vndr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_geomDATA: $(dist_geom_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(geomdir)" || $(mkdir_p) "$(DESTDIR)$(geomdir)"
+	@list='$(dist_geom_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_geomDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(geomdir)/$$f'"; \
+	  $(dist_geomDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(geomdir)/$$f"; \
+	done
+
+uninstall-dist_geomDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_geom_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(geomdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(geomdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(geomdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_geomDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_geomDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_geomDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am uninstall-dist_geomDATA \
+	uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/geometry/digital_vndr/lk b/xorg-server/xkbdata.src/geometry/digital_vndr/lk
new file mode 100644
index 000000000..1ccd33163
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/geometry/digital_vndr/pc b/xorg-server/xkbdata.src/geometry/digital_vndr/pc
new file mode 100644
index 000000000..ad4ffc655
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/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_vndr/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_vndr/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/xorg-server/xkbdata.src/geometry/digital_vndr/unix b/xorg-server/xkbdata.src/geometry/digital_vndr/unix
new file mode 100644
index 000000000..2ca477e82
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/geometry/everex b/xorg-server/xkbdata.src/geometry/everex
new file mode 100644
index 000000000..e70490680
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/everex
@@ -0,0 +1,172 @@
+// $Xorg: everex,v 1.3 2000/08/17 19:54:35 cpqbld Exp $
+//
+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/xorg-server/xkbdata.src/geometry/fujitsu b/xorg-server/xkbdata.src/geometry/fujitsu
new file mode 100644
index 000000000..02fe0bc20
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/geometry/geometry.dir b/xorg-server/xkbdata.src/geometry/geometry.dir
new file mode 100644
index 000000000..dad940531
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/geometry.dir
@@ -0,0 +1,105 @@
+-d------ -------- macintosh(macintosh)
+-------- -------- macintosh(applepro)
+-------- -------- macintosh(macbook78)
+-------- -------- macintosh(macbook79)
+-d------ -------- winbook(XP5)
+-d------ -------- kinesis(model100)
+-d------ -------- northgate(omnikey101)
+-d------ -------- sony(nwp5461)
+-------- -------- thinkpad(common)
+-------- -------- thinkpad(us)
+-------- -------- thinkpad(intl)
+-------- -------- thinkpad(60)
+-d------ -------- fujitsu(138)
+-------- -------- fujitsu(140)
+-------- -------- sun(type4)
+-------- -------- sun(type4tuv)
+-------- -------- sun(type4_ca)
+-------- -------- sun(type4jp)
+-------- -------- sun(t5)
+-------- -------- sun(t5tuv)
+-------- -------- sun(t5jp)
+-------- -------- sun(t5unix)
+-------- -------- sun(t5hobo)
+-------- -------- sun(t5tuvhobo)
+-------- -------- sun(t5jphobo)
+-------- -------- sun(type5_se)
+-------- -------- sun(type5c_se)
+-------- -------- sun(type4_se)
+-------- -------- sun(t6)
+-------- -------- sun(t6tuv)
+-------- -------- sun(t6jp)
+-------- -------- sun(t6unix)
+-------- -------- sun(type5)
+-------- -------- sun(type5jp)
+-------- -------- sun(type5tuv)
+-------- -------- sun(type5euro)
+-------- -------- sun(type5unix)
+-------- -------- sun(type5hobo)
+-------- -------- sun(type5tuvhobo)
+-------- -------- sun(type5jphobo)
+-d------ -------- sun(type6)
+-------- -------- sun(type6jp)
+-------- -------- sun(type6tuv)
+-------- -------- sun(type6unix)
+-------- -------- sun(x86)
+-------- -------- sun(MS_x86)
+-------- -------- sun(x86tuv)
+-d------ -------- amiga(usa1)
+-------- -------- amiga(de)
+-d------ -------- microsoft(natural)
+-------- -------- microsoft(elite)
+-d------ -------- hp(pc101)
+-------- -------- hp(hil)
+-------- -------- hp(omnibook)
+-------- -------- hp(omnibook_intl)
+-d------ -------- pc(pc101)
+-------- -------- pc(pc102)
+-------- -------- pc(pc104)
+-------- -------- pc(pc105)
+-------- -------- pc(jp106)
+-------- -------- pc(abnt2)
+-------- -------- pc(pc86)
+-------- -------- pc(kr106)
+-------- -------- pc(latitude)
+-------- -------- pc(pc104alt)
+-d------ -------- chicony(us)
+-d------ -------- hhk(win1)
+-------- -------- hhk(win2)
+-------- -------- hhk(win3)
+-------- -------- hhk(win4)
+-------- -------- hhk(jp1)
+-------- -------- hhk(jp2)
+-------- -------- hhk(jp3)
+-------- -------- hhk(jp4)
+h-p----- -------- hhk(basic)
+-d------ -------- sgi_vndr/O2(pc101)
+-------- -------- sgi_vndr/O2(pc102)
+-------- -------- sgi_vndr/O2(jp106)
+-d------ -------- sgi_vndr/indigo(pc101)
+-------- -------- sgi_vndr/indigo(pc102)
+-d------ -------- sgi_vndr/indy(pc101)
+-------- -------- sgi_vndr/indy(pc102)
+-------- -------- sgi_vndr/indy(jp106)
+-d------ -------- keytronic(FlexPro)
+-d------ -------- dell(dell101)
+-------- -------- dell(dell65)
+-------- -------- dell(dell65x)
+-------- -------- dell(dellm65)
+-d------ -------- everex(STEPnote)
+-d------ -------- nec(pc98)
+-------- -------- digital_vndr/lk(lk201)
+-------- -------- digital_vndr/lk(lk401)
+-------- -------- digital_vndr/lk(lk450)
+-------- -------- digital_vndr/lk(lk401bj)
+-------- -------- digital_vndr/lk(lk401jj)
+--p----- -------- digital_vndr/pc(common)
+--p----- -------- digital_vndr/pc(leds_on_keys)
+--p----- -------- digital_vndr/pc(leds_alone)
+-------- -------- digital_vndr/pc(pc101)
+-------- -------- digital_vndr/pc(pc102)
+-------- -------- digital_vndr/pc(pcxaj)
+-------- -------- digital_vndr/unix(unix)
+-------- -------- digital_vndr/unix(lk421jj)
+-d------ -------- ataritt(us)
+-------- -------- ataritt(de)
diff --git a/xorg-server/xkbdata.src/geometry/hhk b/xorg-server/xkbdata.src/geometry/hhk
new file mode 100644
index 000000000..901642b10
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/hhk
@@ -0,0 +1,268 @@
+//	$XKeyboardConfig$
+//
+//	XKB geometry for the Happy Hacking Keyboard (Lite).
+//	Different variants correspond to different switch
+//	settings on the HHK.
+//
+//  Copyright (c) Doug Palmer <doug@charvolant.org>, 2002
+//
+//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
+//AUTHORS OR COPYRIGHT HOLDERS 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.
+
+// SW = 100 Default layout with windows keys
+default xkb_geometry "win1" {
+	include "hhk(basic)"
+
+	key.gap = 1;
+	section "Space" {
+		top = 86;
+		left = 30;
+		row {
+			top = 1;
+			keys {
+				<LALT>,
+				{ <LWIN>, "DIAM" },
+				{ <SPCE>, "SPCE" },
+				{ <RWIN>, "DIAM" },
+				<RALT>
+			};
+		};
+	};
+};
+
+// SW = 101 Layout with windows and alt keys swapped
+xkb_geometry "win2" {
+	include "hhk(basic)"
+
+	key.gap = 1;
+	section "Space" {
+		top = 86;
+		left = 30;
+		row {
+			top = 1;
+			keys {
+				<LWIN>,
+				{ <LALT>, "DIAM" },
+				{ <SPCE>, "SPCE" },
+				{ <RALT>, "DIAM" },
+				<RWIN>
+			};
+		};
+	};
+};
+
+// SW = 110 Default layout with windows keys, and left diamond = Fn key
+xkb_geometry "win3" {
+	include "hhk(basic)"
+
+	key.gap = 1;
+	section "Space" {
+		top = 86;
+		left = 30;
+		row {
+			top = 1;
+			keys {
+				<LALT>,
+				{ <FN>, "DIAM" },
+				{ <SPCE>, "SPCE" },
+				{ <RWIN>, "DIAM" },
+				<RALT>
+			};
+		};
+	};
+};
+
+// SW = 101 Layout with windows and alt keys swapped and left-Alt = Fn key
+xkb_geometry "win4" {
+	include "hhk(basic)"
+
+	key.gap = 1;
+	section "Space" {
+		top = 86;
+		left = 30;
+		row {
+			top = 1;
+			keys {
+				<FN>,
+				{ <LALT>, "DIAM" },
+				{ <SPCE>, "SPCE" },
+				{ <RALT>, "DIAM" },
+				<RWIN>
+			};
+		};
+	};
+};
+
+// SW = 000 Layout with Muhenkan and Henkan keys
+xkb_geometry "jp1" {
+	include "hhk(basic)"
+
+	key.gap = 1;
+	section "Space" {
+		top = 86;
+		left = 30;
+		row {
+			top = 1;
+			keys {
+				<LALT>,
+				{ <NFER>, "DIAM" },
+				{ <SPCE>, "SPCE" },
+				{ <XFER>, "DIAM" },
+				<RALT>
+			};
+		};
+	};
+};
+
+// SW = 001 Layout with Muhenkan and Henkan keys swapped with Alt keys
+xkb_geometry "jp2" {
+	include "hhk(basic)"
+
+	key.gap = 1;
+	section "Space" {
+		top = 86;
+		left = 30;
+		row {
+			top = 1;
+			keys {
+				<NFER>,
+				{ <LALT>, "DIAM" },
+				{ <SPCE>, "SPCE" },
+				{ <RALT>, "DIAM" },
+				<XFER>
+			};
+		};
+	};
+};
+
+// SW = 010 Layout with Henkan key and left-diamond as Fn
+xkb_geometry "jp3" {
+	include "hhk(basic)"
+
+	key.gap = 1;
+	section "Space" {
+		top = 86;
+		left = 30;
+		row {
+			top = 1;
+			keys {
+				<LALT>,
+				{ <FN>, "DIAM" },
+				{ <SPCE>, "SPCE" },
+				{ <XFER>, "DIAM" },
+				<RALT>
+			};
+		};
+	};
+};
+
+// SW = 001 Layout with Henkan key swapped with Alt keys and left-Alt as Fn
+xkb_geometry "jp4" {
+	include "hhk(basic)"
+
+	key.gap = 1;
+	section "Space" {
+		top = 86;
+		left = 30;
+		row {
+			top = 1;
+			keys {
+				<FN>,
+				{ <LALT>, "DIAM" },
+				{ <SPCE>, "SPCE" },
+				{ <RALT>, "DIAM" },
+				<XFER>
+			};
+		};
+	};
+};
+
+// Basic layout for non-swictchable keys
+partial hidden xkb_geometry "basic" {
+
+	description = "Happy Hacking Keyboard";
+	width = 290;
+	height = 106;
+	
+	shape.cornerRadius = 1;
+	shape "NORM" { { [18, 18] }, { [2, 1], [14, 14] } };
+	shape "BKSP" { { [28, 18] }, { [2, 1], [24, 14] } };
+	shape "TABK" { { [28, 18] }, { [2, 1], [24, 14] } };
+	shape "CTRL" { { [32, 18] }, { [2, 1], [28, 14] } };
+	shape "RTRN" { { [42, 18] }, { [2, 1], [38, 14] } };
+	shape "LFSH" { { [42, 18] }, { [2, 1], [38, 14] } };
+	shape "RTSH" { { [32, 18] }, { [2, 1], [28, 14] } };
+	shape "DIAM" { { [28, 18] }, { [2, 1], [24, 14] } };
+	shape "SPCE" { { [114, 18] }, { [2, 1], [110, 14] } };
+
+	text.color = "black";
+	text "PFULabel" { left = 16; top = 2; fontsize = 20; text = "PFU"; };
+	text "HHKLabel" { left = 254; top = 90; text = "Happy Hacking\nKeyboard"; };
+
+	section.left = 1;
+	row.left = 1;
+	key.shape = "NORM";
+	key.gap = 1;
+
+	section "Alphanumeric" {
+		top = 10;
+		row {
+			top = 1;
+			keys {
+				 <ESC>, 
+				<AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
+				<AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
+				<AE11>, <AE12>, 
+				<BKSL>, <TLDE>
+			};
+		};
+		row {
+			top = 20;
+			keys {
+				{ <TAB>, "TABK" },
+				<AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+				<AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
+				<AD11>, <AD12>,
+				{ <BKSP>, "BKSP" }
+			};
+		};
+		row {
+			top = 39;
+			keys {
+				{ <LCTL>, "CTRL" },
+				<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" },
+				{ <FN>, color = "grey20" }
+			};
+		};
+	};
+
+	alias <AC00> = <LCTL>;
+};
+
diff --git a/xorg-server/xkbdata.src/geometry/hp b/xorg-server/xkbdata.src/geometry/hp
new file mode 100644
index 000000000..c93cb0cd1
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/geometry/keytronic b/xorg-server/xkbdata.src/geometry/keytronic
new file mode 100644
index 000000000..110274a2d
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/keytronic
@@ -0,0 +1,253 @@
+// $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.
+//
+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/xorg-server/xkbdata.src/geometry/kinesis b/xorg-server/xkbdata.src/geometry/kinesis
new file mode 100644
index 000000000..05acf4b6e
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/kinesis
@@ -0,0 +1,191 @@
+// $Xorg: kinesis,v 1.3 2000/08/17 19:54:35 cpqbld Exp $
+//
+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/xorg-server/xkbdata.src/geometry/macintosh b/xorg-server/xkbdata.src/geometry/macintosh
new file mode 100644
index 000000000..e4b47749f
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/macintosh
@@ -0,0 +1,570 @@
+// $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...)
+
+// Minor changes
+// - Mail address above is no longer valid
+// - Changed {L,R}MTA to {L,R}WIN, which are defined
+// 2005/10 -- Simon Vallet <svallet@gmail.com>
+
+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" },
+                   { <LWIN>, "LMTA" },
+                   { <SPCE>, "SPCE" }, 
+                   { <RWIN>, "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
+
+
+// This section describes the geometry of the "Apple Pro" keyboard
+// included with NewWorld desktop machines
+//
+// It adds four new keysyms, labeled SDDN, SDUP, SDNO, EJCT.
+//
+// 2005/10 -- Simon Vallet <svallet@gmail.com>
+
+xkb_geometry "applepro" {
+
+    description= "Apple Pro Keyboard";
+    width = 455;
+    height = 150;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18, 18] }, { [2, 1], [ 16, 15] } };
+    shape "FUNC" { { [ 18, 21] }, { [2, 1], [ 16, 16] } };
+    shape "BKSP" { { [ 38, 18] }, { [2, 1], [ 36, 15] } };
+    shape "TAB"  { { [ 29, 18] }, { [2, 1], [ 26, 15] } };
+    shape "LFSH" { { [ 28, 18] }, { [2, 1], [ 26, 15] } };
+    shape "RTSH" { { [ 47, 18] }, { [2, 1], [ 45, 15] } };
+
+    shape "RTRN" {
+        { [0,0],[27,0],[27,37],[4,37],[4,18],[0,18] }, 
+        { [2,1],[25,1],[25,34],[6,34],[6,15],[2,15] } };
+
+    shape "CAPS" { { [ 32, 18] }, { [2, 1], [ 26, 15] } };
+    shape "LCTL" { { [ 28, 20] }, { [2, 1], [ 26, 17] } };
+    shape "RCTL" { { [ 28, 20] }, { [2, 1], [ 26, 17] } };
+    shape "LALT" { { [ 23, 20] }, { [2, 1], [ 21, 17] } };
+    shape "RALT" { { [ 23, 20] }, { [2, 1], [ 21, 17] } };
+    shape "LMTA" { { [ 28, 20] }, { [2, 1], [ 26, 17] } };
+    shape "RMTA" { { [ 28, 20] }, { [2, 1], [ 26, 17] } };
+    shape "SPCE" { { [121, 20] }, { [3, 1], [118, 17] } };
+    shape "BOTM" { { [ 18, 20] }, { [2, 1], [ 16, 17] } }; 
+
+    shape "KP0"  { { [ 37, 20] }, { [2, 1], [ 35, 17] } };
+    shape "KPEN" { { [ 18, 39] }, { [2, 1], [ 16, 36] } };
+
+    section.left = 7;
+    row.left = 1;
+    key.gap =  1;
+    key.shape = "NORM";
+
+    section "Function" {
+       key.shape = "FUNC";
+        top = 26;
+       row {
+           top= 1;
+            keys { <ESC>, 
+                   { <FK01>, 14 }, <FK02>, <FK03>, <FK04>,
+                   { <FK05>, 14 }, <FK06>, <FK07>, <FK08>,
+                   { <FK09>, 14 }, <FK10>, <FK11>, <FK12>,
+                   { <PRSC>, 11 }, <SCLK>, <PAUS>,
+                  { <SDDN>, 11 }, <SDUP>, <SDNO>, <EJCT>
+            };
+       };
+    }; // End of "Function" section
+
+
+    section "Alpha" {
+        top = 48;
+       row {
+           top= 1;
+            keys { <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" },
+                       { <LWIN>, "LMTA" },
+                       { <SPCE>, "SPCE" }, 
+                       { <RWIN>, "RMTA" },
+                       { <RALT>, "RALT" }, { <RCTL>, "RCTL" }
+           };
+       };
+    }; // End of "Alpha" section
+
+    section "Editing" {
+        top = 48;
+        left = 303;
+       row {
+           top= 1;
+           keys { <INS>, <HOME>, <PGUP> };
+       };
+        row {
+           top= 20;
+           keys { <DELE>, <END>, <PGDN> };
+       };
+       row {
+           top= 58;
+           left= 20;
+           keys { <UP> };
+       };
+       row {
+           top= 77;
+           key.shape = "BOTM";
+           keys { <LEFT>, <DOWN>, <RGHT> };
+       };
+    }; // End of "Editing" section
+
+    // Begin of "Keypad" section
+    section "Keypad" {
+        top = 48;
+        left = 370;
+       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>, "BOTM" } };
+       };
+    }; // End of "Keypad" section
+
+}; // End of "applepro" geometry
+
+xkb_geometry "macbook78" {
+
+    description= "Apple Laptop 78-key (US)";
+    width= 273;
+    height= 110;
+
+    shape.cornerRadius= 0;
+    shape "ESC"  { { [ 21,9] }, cornerRadius=1, { [0,1], [ 19,8] } };
+    shape "FUNC" { { [ 18,9] }, cornerRadius=1, { [2,1], [ 16,8] } };
+    shape "EJCT" { { [ 20,9] }, cornerRadius=1, { [2,1], [ 20,8] } };
+    shape "DEGR" { { [ 16,18] }, cornerRadius=1, { [0,2], [ 14,16] } };
+    shape "NORM" { { [ 18,18] }, cornerRadius=1, { [2,2], [ 16,16] } };
+    shape "BKSP" { { [ 25,18] }, cornerRadius=1, { [2,2], [ 25,16] } };
+    shape "TABK" { { [ 24,18] }, cornerRadius=1, { [0,2], [ 22,16] } };
+    shape "BKSL" { { [ 17,18] }, cornerRadius=1, { [2,2], [17,16] } };
+    shape "RTRN" { { [ 31,18] }, cornerRadius=1, { [2,2], [31,16] } };
+    shape "CAPS" { { [ 29,18] }, cornerRadius=1, { [0,2], [ 27,16] } };
+    shape "LFSH" { { [ 40,18] }, cornerRadius=1, { [0,2], [ 38,16] } };
+    shape "RTSH" { { [ 39,18] }, cornerRadius=1, { [2,2], [ 39,16] } };
+    shape "APPL" { { [ 23,18] }, cornerRadius=1, { [2,2], [ 21,16] } };
+    shape "SPCE" { { [ 94,18] }, cornerRadius=1, { [2,2], [ 92,16] } };
+    shape "ARRO" { { [ 17,9] }, cornerRadius=1, { [2,1], [ 15,8] } };
+
+    shape "LED"  { cornerRadius= 1, { [  2,  2 ] } };
+
+    indicator.onColor= "green";
+    indicator.offColor= "gray";
+    indicator.shape= "LED";
+    indicator "Num Lock"   { top=4; left= 119; };
+    indicator "Caps Lock"  { top=53; left= 4; };
+
+    section.left=0;
+    row.left= 1;
+    key.shape= "FUNC";
+    key.gap= 1;
+    section "Function" {
+	top= 0;
+	row {
+	    top= 1;
+	    keys {  {<ESC>, "ESC" },
+		    <FK01>, <FK02>, <FK03>, <FK04>,
+		    <FK05>, <FK06>, <FK07>, <FK08>,
+		    <FK09>, <FK10>, <FK11>, <FK12>,
+                    {<K6C>, "EJCT" }
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    section "Alpha" {
+	top= 10;
+	row {
+	    top= 1;
+	    keys { {<TLDE>, "DEGR"},
+                   <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" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { {<FN>, "DEGR"}, 
+                   <LCTL>, <LALT>, 
+                   {<LMTA>, "APPL"},
+                   {<SPCE>, "SPCE" }, 
+                   {<RMTA>, "APPL"},
+                   <KPEN>
+	    };
+	};
+
+    }; // End of "Alpha" section
+
+    key.shape= "ARRO";
+    section "Editing" {
+        top = 86;
+        left = 217;
+	row {
+	    top= 1;
+	    left= 19;
+	    keys { <UP> };
+	};
+	row {
+	    top= 10;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+};
+
+xkb_geometry "macbook79" {
+
+    description= "Apple Laptop 79-key (Intl)";
+    width= 273;
+    height= 110;
+
+    shape.cornerRadius= 0;
+    shape "ESC"  { { [ 21,9] }, cornerRadius=1, { [0,1], [ 19,8] } };
+    shape "FUNC" { { [ 18,9] }, cornerRadius=1, { [2,1], [ 16,8] } };
+    shape "EJCT" { { [ 20,9] }, cornerRadius=1, { [2,1], [ 20,8] } };
+    shape "DEGR" { { [ 16,18] }, cornerRadius=1, { [0,2], [ 14,16] } };
+    shape "NORM" { { [ 18,18] }, cornerRadius=1, { [2,2], [ 16,16] } };
+    shape "BKSP" { { [ 25,18] }, cornerRadius=1, { [2,2], [ 25,16] } };
+    shape "TABK" { { [ 24,18] }, cornerRadius=1, { [0,2], [ 22,16] } };
+    shape "RTRN" { { [ 0,0], [17,0], [17,37], [5,37], [5, 18], [0,18], [0,0] },
+                   cornerRadius=1, 
+	           { [ 2,2], [15,2], [15,35], [7,35], [7, 16], [2,16] } 
+                 };
+    shape "CAPS" { { [ 29,18] }, cornerRadius=1, { [0,2], [ 27,16] } };
+    shape "LFSH" { { [ 21,18] }, cornerRadius=1, { [0,2], [ 19,16] } };
+    shape "RTSH" { { [ 39,18] }, cornerRadius=1, { [2,2], [ 39,16] } };
+    shape "APPL" { { [ 23,18] }, cornerRadius=1, { [2,2], [ 21,16] } };
+    shape "SPCE" { { [ 94,18] }, cornerRadius=1, { [2,2], [ 92,16] } };
+    shape "ARRO" { { [ 17,9] }, cornerRadius=1, { [2,1], [ 15,8] } };
+
+    shape "LED"  { cornerRadius= 1, { [  2,  2 ] } };
+
+    indicator.onColor= "green";
+    indicator.offColor= "gray";
+    indicator.shape= "LED";
+    indicator "Num Lock"   { top=4; left= 119; };
+    indicator "Caps Lock"  { top=53; left= 4; };
+
+    section.left=0;
+    row.left= 1;
+    key.shape= "FUNC";
+    key.gap= 1;
+    section "Function" {
+	top= 0;
+	row {
+	    top= 1;
+	    keys {  {<ESC>, "ESC" },
+		    <FK01>, <FK02>, <FK03>, <FK04>,
+		    <FK05>, <FK06>, <FK07>, <FK08>,
+		    <FK09>, <FK10>, <FK11>, <FK12>,
+                    {<K6C>, "EJCT" }
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    section "Alpha" {
+	top= 10;
+	row {
+	    top= 1;
+	    keys { {<TLDE>, "DEGR"},
+                   <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>, <BKSL>
+	    };
+        };
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH"},
+		   <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		   { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { {<FN>, "DEGR"}, 
+                   <LCTL>, <LALT>, 
+                   {<LWIN>, "APPL"},
+                   {<SPCE>, "SPCE" }, 
+                   {<RALT>, "APPL"},
+                   <KPEN>
+	    };
+	};
+
+    }; // End of "Alpha" section
+
+    key.shape= "ARRO";
+    section "Editing" {
+        top = 86;
+        left = 217;
+	row {
+	    top= 1;
+	    left= 19;
+	    keys { <UP> };
+	};
+	row {
+	    top= 10;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "default" geometry
+
diff --git a/xorg-server/xkbdata.src/geometry/microsoft b/xorg-server/xkbdata.src/geometry/microsoft
new file mode 100644
index 000000000..ba027224f
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/microsoft
@@ -0,0 +1,535 @@
+// $Xorg: microsoft,v 1.3 2000/08/17 19:54:35 cpqbld Exp $
+//
+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>;
+};
+
+// Approximate layout for a Microsoft Natural(R) Keyboard Elite
+// 
+// Modified from // $Xorg: microsoft,v 1.3 2000/08/17 19:54:35 cpqbld Exp $
+// by Pavel Kurashov <pavell@mail.ru> Mon Oct  8 22:08:20 NOVST 2007
+//
+// * Function, editing and navigation keys are reduced height
+// * Navigation keys are repositioned in two column
+// * Leds are enlarged for better look
+// * "BKSP"  alligned with "BKSL" and "RTRN"
+// * Ouline Edges slightly modified
+//
+xkb_geometry "elite" {
+
+    // Approximate layout for a Microsoft Natural(R) Keyboard Elite
+    description= "Microsoft Natural(r) Keyboard Elite";
+    width= 495;
+    height= 190;
+
+    shape.cornerRadius= 1;
+    shape "LDEF" { { [ 18,18] }, { [2,1], [15,15] } };
+    shape "FKEY" { { [ 18,13] }, { [2,1], [15,10] } };
+    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  ] }, { [  2, 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" {	{ [ 32, 18 ] }, { [  2, 1], [30, 15] } };
+    shape "BKSL" {	{ [ 24, 18 ] }, { [  2, 1], [22, 15] } };
+    shape "RTRN" {	{ [ 37, 18 ] }, { [  2, 1], [35, 15] } };
+    shape "RTSH" {	{ [ 43, 18 ] }, { [  2, 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= 3,
+	{ [  32,   15 ],  [140, 33],[ 220,  33 ],  [ 329,   15 ], [ 493,   15 ],
+	  [ 493, 150 ],  [ 354, 150 ],  [200, 180], [ 153, 180 ], [   7, 150 ] }
+    };
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    row.left= 1;
+    key.shape= "FKEY";
+    key.gap=  1;
+    section "LeftFunction" {
+	top= 26;
+	left= 40;
+	angle= 10;
+	row {
+	    top= 1;
+	    keys {  <ESC>, { <FK01>, 12 }, <FK02>, <FK03>, <FK04>, <FK05> };
+	};
+    }; // End of "LeftFunction" section
+
+    key.shape= "LDEF";
+    section "LeftAlpha" {
+	top= 47;
+	left= 30;
+	angle= 10;
+	row {
+	    top= 1;
+	    keys {	<TLDE>, <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= "FKEY";
+    section "RightFunction" {
+	top= 48;
+	left= 195;
+	angle= -10;
+	row {
+	    top= 1;
+	    left= 1;
+	    keys {  <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>, <FK12> };
+	};
+    }; // End of "RightFunction" section
+
+    key.shape= "RDEF";
+    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" {
+	key.shape="FKEY";
+	top= 23;
+	left= 348;
+	row {
+	    top= 0;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 22;
+	    left=20;	
+	    keys { <HOME>, <PGUP> };
+	};
+	row {
+	    top= 36;
+	    left=20;	
+	    keys {  <END>, <PGDN> };
+	};
+	row {
+	    top= 50;
+	    left=20;	
+	    keys { <DELE>, <INS> };
+	};
+	row {
+	    top= 75;
+	    left= 29;
+	    keys { <UP> };
+    	};
+	row {
+	    top= 89;
+	    left=20;	
+	    keys { <LEFT>, <RGHT> };
+	};
+	row {
+	    top= 103;
+	    left=29;	
+	    keys { <DOWN> };
+	};
+    }; // End of "Editing" section
+
+    shape "LED"  { 
+	cornerRadius= 1,
+	{ [  7,  2 ] }
+    };
+    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= 44;
+	left= 412;
+	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/xorg-server/xkbdata.src/geometry/nec b/xorg-server/xkbdata.src/geometry/nec
new file mode 100644
index 000000000..189d9ca7c
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/geometry/northgate b/xorg-server/xkbdata.src/geometry/northgate
new file mode 100644
index 000000000..cf0c6f477
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/northgate
@@ -0,0 +1,170 @@
+// $Xorg: northgate,v 1.3 2000/08/17 19:54:36 cpqbld Exp $
+//
+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/xorg-server/xkbdata.src/geometry/pc b/xorg-server/xkbdata.src/geometry/pc
new file mode 100644
index 000000000..812f8425f
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/pc
@@ -0,0 +1,1566 @@
+// $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= 180;
+
+    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=  22;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 37;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 25;
+    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= 22;
+	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= 61;
+	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= 61;
+	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= 61;
+	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= 180;
+
+    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=  22;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 37;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 25;
+    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= 22;
+	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= 61;
+	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= 61;
+	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= 61;
+	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= 180;
+
+    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=  22;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 37;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 25;
+    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= 22;
+	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= 61;
+	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= 61;
+	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= 61;
+	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= 180;
+
+    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" { { [ 50,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=  22;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 37;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 25;
+    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= 22;
+	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= 61;
+	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= 61;
+	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= 61;
+	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" {
+    include "pc(pc105)"
+
+    description= "Brazilian ABNT2";
+
+    shape "RTRN" {
+        { [0,0],[ 28,0],[28,37],[4,37],[4,18],[0,18] } ,
+        { [2,1],[ 26,1],[26,36],[5,36],[5,18],[2,18] } };
+    shape "RTSH" { { [ 31,18] }, { [2,1], [ 29,16] } };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Alpha" {
+	top= 61;
+	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>, <AB11>,
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Keypad" {
+	top= 61;
+	left= 376;
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, { <KPPT>, color="grey20" } };
+	};
+    }; // End of "Keypad" section
+
+}; // 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
+
+xkb_geometry "kr106" {
+
+    description= "Korean 106";
+    width= 470;
+    height= 180;
+
+    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" { { [ 75,18] }, { [2,1], [ 73,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=  22;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 37;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 25;
+    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= 22;
+	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= 61;
+	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>,
+		   { <K71>, "NORM", color="white" },
+		   { <SPCE>, "SPCE", color="white" },
+		   { <K72>, "NORM", color="white" },
+		   <RALT>, <RWIN>, <MENU>, <RCTL>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	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= 61;
+	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 "kr106" geometry
+
+// Based on the pc(pc105) layout. The keypad, sysreq/ScrLk/Break, and multimedia
+// keys are not shown because they are shared with other keys via the <FN> key.
+// This should not be a problem if the normal symbols are used, as the keys will
+// show through normally, they just won't show from xkbprint. For the record,
+// <FN>+<PGUP> = AudioRaise,
+// <FN>+<PGDN> = AudioLower,
+// <FN>+<END> = AudioMute,
+// <FN>+<PRSC> = Sysreq,
+// <FN>+<NMLK> = ScrollLock,
+// <FN>+<BREAK> = <PAUS>,
+// <FN>+7 = KP_7,
+// <FN>+8 = KP_8,
+// <FN>+9 = KP_9,
+// <FN>+0 = KP_MUL,
+// <FN>+U = KP_4,
+// <FN>+I = KP_5,
+// <FN>+O = KP_6,
+// <FN>+P = KP_SUB,
+// <FN>+J = KP_1,
+// <FN>+K = KP_2,
+// <FN>+L = KP_3,
+// <FN>+; = KP_ADD,
+// <FN>+M = KP_INS,
+// <FN>+. = KP_DEL,
+// <FN>+/ = KP_DIV.
+// The other FN combinations aren't passed to X, but are handled by BIOS.
+// <FN> and all keys with <FN> level mappings are marked in grey20.
+//
+// David Cameron Staples <staples@cs.mu.oz.au> 2006-05-12
+
+xkb_geometry "latitude" {
+
+    description= "Dell Latitude";
+    width= 330;
+    height= 210;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18  ,18] }, { [2,1  ], [ 16,16] } };
+    shape "FUNC" { { [ 16.2,12] }, { [2,0.5], [ 14,10] } };
+    shape "ESC"  { { [ 18  ,12] }, { [2,0.5], [ 16,10] } };
+    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  ], [ 26,16] } };
+    shape "LFSH" { { [ 42  ,18] }, { [2,1  ], [ 40,16] } };
+    shape "RTSH" { { [ 52  ,18] }, { [2,1  ], [ 50,16] } };
+    shape "SPCE" { { [ 95  ,18] }, { [2,1  ], [ 93,16] } };
+    shape "LCTL" { { [ 28  ,14] }, { [2,1  ], [ 26,12] } };
+    shape "LALT" { { [ 22  ,14] }, { [2,1  ], [ 20,12] } };
+    shape "WIN"  { { [ 18  ,14] }, { [2,1  ], [ 16,12] } };
+
+    shape "LED"  { cornerRadius= 0.5, { [  1,  3 ] } };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 37;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 138; };
+    indicator "Caps Lock"    { left= 150; };
+    indicator "Scroll Lock"  { left= 162; };
+    text.top= 33;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 140; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 152; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 164; text="Scroll\nLock"; };
+
+    text "LATITUDE"		{ left= 19; text="L A T I T U D E"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 32;
+	key.shape= "FUNC";
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    left= 163.8;
+	    keys {  { <MENU>, color="white" }, <PRSC>, <NMLK>, <PAUS>,
+	            { <INS>, 3, color="white" },
+		    { <HOME>, color="white"}, <PGUP>
+            };
+	};
+	row {
+	    top= 14;
+	    keys {  { <ESC>, "ESC" },
+		    { <FK01>, 3 },
+		    { <FK02>, color="white" }, <FK03>,
+		    { <FK04>, color="white" },
+		    { <FK05>, 3 },
+		    { <FK06>, color="white" }, <FK07>, <FK08>,
+		    { <FK09>, 3, color="white" }, <FK10>,
+		    { <FK11>, color="white" }, 
+		    { <FK12>, color="white" },
+		    { <DELE>, 3, color="white" }, <END>, <PGDN> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 60;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, 
+		   { <AE07>, color="grey20" },
+		   { <AE08>, color="grey20" },
+		   { <AE09>, color="grey20" },
+		   { <AE10>, color="grey20" }, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, 
+		   { <AD07>, color="grey20" },
+		   { <AD08>, color="grey20" },
+		   { <AD09>, color="grey20" },
+		   { <AD10>, color="grey20" },
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, 
+		   { <AC07>, color="grey20" },
+		   { <AC08>, color="grey20" },
+		   { <AC09>, color="grey20" },
+		   { <AC10>, color="grey20" },
+		   <AC11>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, 
+		    { <AB07>, color="grey20" }, <AB08>,
+		    { <AB09>, color="grey20" },
+		    { <AB10>, color="grey20" },
+		    { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "WIN";
+	    keys { { <LCTL>, "LCTL" },
+	           { <FN>, color="grey20" },
+		   <LWIN>,
+		   { <LALT>, "LALT" },
+		   { <SPCE>, "SPCE" },
+		   <RALT>,
+		   { <RCTL>, "LALT" }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 136;
+	left= 250;
+	key.shape= "FUNC";
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    left= 18.2;
+	    keys { <UP> };
+	};
+	row {
+	    top= 14;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "latitude" geometry
+
+xkb_geometry "pc104alt" {
+
+    description= "Generic 104 with L-shaped Enter and small Backspace with Backslash left to it";
+    width= 470;
+    height= 210;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 19,18] }, { [2,1], [ 17,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+//    shape "RTRN" { { [ 0,19 ], [ 0,37 ], [ 42,37 ], [ 42,0 ], [ 14,0 ], [ 14,19 ] },
+//                   { [ 2,20 ], [ 2,35 ], [ 40,35 ], [ 40,1 ], [ 16,1 ], [ 16,20 ] },
+//                   approx = { [ 17,21 ], [ 39,34 ] }
+//                 };
+    shape "RTRN" { { [ -14,19 ], [ -14,37 ], [ 28,37 ], [ 28,0 ], [ 0,0 ], [ 0,19 ] },
+                   { [ -12,20 ], [ -12,35 ], [ 26,35 ], [ 26,1 ], [ 2,1 ], [ 2,20 ] },
+                   approx = { [ 3,21 ], [ 25,34 ] }
+                 };
+    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>, <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>, { <RTRN>, -13, "RTRN", color="grey20" }
+		   <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>
+	    };
+	};
+	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
diff --git a/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.am b/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.am
new file mode 100644
index 000000000..5c76e4b4c
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.am
@@ -0,0 +1,4 @@
+geomdir = $(xkb_base)/geometry/sgi_vndr
+
+dist_geom_DATA = \
+indigo  indy  O2
diff --git a/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.in
new file mode 100644
index 000000000..294bb3914
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.in
@@ -0,0 +1,367 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = geometry/sgi_vndr
+DIST_COMMON = $(dist_geom_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(geomdir)"
+dist_geomDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_geom_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+geomdir = $(xkb_base)/geometry/sgi_vndr
+dist_geom_DATA = \
+indigo  indy  O2
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  geometry/sgi_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  geometry/sgi_vndr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_geomDATA: $(dist_geom_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(geomdir)" || $(mkdir_p) "$(DESTDIR)$(geomdir)"
+	@list='$(dist_geom_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_geomDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(geomdir)/$$f'"; \
+	  $(dist_geomDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(geomdir)/$$f"; \
+	done
+
+uninstall-dist_geomDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_geom_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(geomdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(geomdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(geomdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_geomDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_geomDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_geomDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am uninstall-dist_geomDATA \
+	uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/geometry/sgi_vndr/O2 b/xorg-server/xkbdata.src/geometry/sgi_vndr/O2
new file mode 100644
index 000000000..c321fe398
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/sgi_vndr/O2
@@ -0,0 +1,616 @@
+// $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.
+//
+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/xorg-server/xkbdata.src/geometry/sgi_vndr/indigo b/xorg-server/xkbdata.src/geometry/sgi_vndr/indigo
new file mode 100644
index 000000000..c91c5c2f3
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/sgi_vndr/indigo
@@ -0,0 +1,411 @@
+// $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.
+//
+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/xorg-server/xkbdata.src/geometry/sgi_vndr/indy b/xorg-server/xkbdata.src/geometry/sgi_vndr/indy
new file mode 100644
index 000000000..98d511fa7
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/sgi_vndr/indy
@@ -0,0 +1,599 @@
+// $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.
+//
+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/xorg-server/xkbdata.src/geometry/sony b/xorg-server/xkbdata.src/geometry/sony
new file mode 100644
index 000000000..4e69f0e9a
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/geometry/sun b/xorg-server/xkbdata.src/geometry/sun
new file mode 100644
index 000000000..633077ac7
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/sun
@@ -0,0 +1,3056 @@
+// $Xorg: sun,v 1.4 2001/02/09 02:05:51 xorgcvs Exp $
+// $XdotOrg: $
+//
+//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.
+//
+// ---------------------------------------------------------------------------
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+// ---------------------------------------------------------------------------
+//
+// $XFree86: xc/programs/xkbcomp/geometry/sun,v 1.7 2003/08/09 14:30:47 pascal 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"; };
+};
+
+xkb_geometry "type4tuv" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type4 TUV
+    // (European) keyboard with an extra key between the Shift_L
+    // and the Z keys, and two keys above the Bksp key, instead
+    // of a large delete key.
+
+    description= "Sun Type4tuv 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 "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 "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>, <BRCR>,<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 }, <LSGT>,
+		   <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 "CapsLock"	{ left= 364; };
+    indicator "Compose"	{ left= 383; };
+    indicator "ScrollLock"	{ left= 402; };
+    indicator "NumLock"	{ 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"; };
+};
+
+xkb_geometry "type4_ca" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type4
+    // Canadian and British keyboard with an extra key between
+    // the Shift_L 
+    // and the Z keys.
+
+    description= "Sun Type4_uk 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 "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 }, <LSGT>,
+                   <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 "CapsLock"        { left= 364; };
+    indicator "Compose" { left= 383; };
+    indicator "ScrollLock"      { left= 402; };
+    indicator "NumLock" { 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"; };
+};
+
+xkb_geometry "type4jp" {
+
+    // This is an approximate layout for a Japanese Sun Type4
+    // keyboard, based on the European TUV keyboard.  It has two keys
+    // above the Bksp key, instead of a large delete key, but lacks
+    // the extra key between Shift_L and Z.
+
+    description= "Sun Japanese 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 "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 "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" { { [ 97,18] }, { [2,1], [95,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 "LFSH" { { [ 41,18] }, { [2,1], [39,17] } };
+    shape "KANJ" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "EXEC" { { [ 27,18] }, { [2,1], [25,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>, <BRCR>,<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>, 
+		   <LNFD>, { <RTSH>, "RTSH" },
+		 { <KP1>, 9} , <KP2>, <KP3>, { <KPEN>, "KPAD" }
+	    };
+	};
+	row {
+	    top= 96;
+	    keys { { <HELP>, "HELP" }, { <CAPS>, 9 },
+		   <LALT>, <LMTA>, { <EXEC>, "EXEC"} , { <SPCE>, "SPCE" },
+		   { <KANJ>, "KANJ" }, <HENK>, <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 "CapsLock"	{ left= 364; };
+    indicator "Compose"	{ left= 383; };
+    indicator "ScrollLock"	{ left= 402; };
+    indicator "NumLock"	{ 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"; };
+};
+
+xkb_geometry "t5" {
+
+    // 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.
+
+    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" { { [156,18] }, { [2,1], [154,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 "t5tuv" {
+
+    // This is an approximate layout for a TUV/European 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 "RTRN" {
+        approx = { [ 0, 0], [28,37] },
+        { [ 0, 0], [28, 0], [28,37],
+          [ 5,37], [ 5,18], [ 0,18] },
+        { [ 1, 1], [26, 1], [26,36],
+          [ 7,36], [ 7,17], [ 1,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>,
+		 { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, <LSGT>, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		 { <RTSH>, "RTSH" }
+	    };
+	};
+	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" } };
+	};
+	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
+};
+
+
+xkb_geometry "t5jp" {
+
+    // This is an approximate layout for a Japanese 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 "KANJ" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "EXEC" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { 
+        approx = { [ 0, 0], [28,37] },
+        { [ 0, 0], [28, 0], [28,37],
+          [ 5,37], [ 5,18], [ 0,18] },
+        { [ 1, 1], [26, 1], [26,36],
+          [ 7,36], [ 7,17], [ 1,17] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [ 97,18] }, { [2,1], [95,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>, 
+		   { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <UNDR>,
+		 { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9 },
+		   <LALT>, <LMTA>, { <EXEC>, "EXEC" },
+		 { <SPCE>, "SPCE" }, { <KANJ>, "KANJ" }, <HENK>,
+		   <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 "t5unix" {
+
+    // 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.
+
+    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 "t5hobo" {
+
+    // 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.
+    //
+    // I modified this to look like the hobo keyboard.
+
+    width= 425;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 425, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "FKEY" { { [ 15,18] }, { [0.5,0.5], [14.5, 17.5] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,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" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [156,18] }, { [2,1], [154,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= "FKEY";
+    key.gap=  1;
+    section "Function" {
+	top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
+		   { <FK01>, 4 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 4 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 4 }, <FK10>, <FK11>, <FK12>,
+		   { <MUTE>, 4 }, <VOL->, <VOL+>, <POWR>, 
+		   { <PRSC>,  9, "NORM" }, {<SCLK>, "NORM"}, {<PAUS>, "NORM"}
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    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" }, <ALGR>
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
+		   <LALT>, <LMTA>,
+		 { <SPCE>, "SPCE" },
+		   <RMTA>, <COMP>, <NMLK>
+	    };
+	};
+    }; // 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
+};
+
+xkb_geometry "t5tuvhobo" {
+
+    // 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.
+    //
+    // I modified this to look like the hobo keyboard.
+
+    width= 425;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 425, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "FKEY" { { [ 15,18] }, { [0.5,0.5], [14.5, 17.5] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,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" { { [ 24,18] }, { [2,1], [22,17] } };
+    shape "RTSH" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [156,18] }, { [2,1], [154,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= "FKEY";
+    key.gap=  1;
+    section "Function" {
+	top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
+		   { <FK01>, 4 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 4 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 4 }, <FK10>, <FK11>, <FK12>,
+		   { <MUTE>, 4 }, <VOL->, <VOL+>, <POWR>, 
+		   { <PRSC>,  9, "NORM" }, {<SCLK>, "NORM"}, {<PAUS>, "NORM"}
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    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" }, <ALGR>
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
+		   <LALT>, <LMTA>,
+		 { <SPCE>, "SPCE" },
+		   <RMTA>, <COMP>, <NMLK>
+	    };
+	};
+    }; // 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
+};
+
+xkb_geometry "t5jphobo" {
+
+    // 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.
+
+    width= 425;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 425, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "FKEY" { { [ 15,18] }, { [0.5,0.5], [14.5, 17.5] } };
+    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 "KANJ" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "EXEC" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { 
+        approx = { [ 0, 0], [28,37] },
+        { [ 0, 0], [28, 0], [28,37],
+          [ 5,37], [ 5,18], [ 0,18] },
+        { [ 1, 1], [26, 1], [26,36],
+          [ 7,36], [ 7,17], [ 1,17] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [ 97,18] }, { [2,1], [95,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= "FKEY";
+    key.gap=  1;
+    section "Function" {
+	top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
+		   { <FK01>, 4 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 4 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 4 }, <FK10>, <FK11>, <FK12>,
+		   { <MUTE>, 4 }, <VOL->, <VOL+>, <POWR>, 
+		   { <PRSC>,  9, "NORM" }, {<SCLK>, "NORM"}, {<PAUS>, "NORM"}
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    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>, 
+		   { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <UNDR>,
+		 { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9 },
+		   <LALT>, <LMTA>, { <EXEC>, "EXEC" },
+		 { <SPCE>, "SPCE" }, { <KANJ>, "KANJ" }, <HENK>,
+		   <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
+};
+
+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"; };
+};
+
+xkb_geometry "t6" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type6
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes.
+
+    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" { { [136,18] }, { [2,1], [134,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 "RMTA" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "LMTA" { { [ 28,18] }, { [2,1], [26,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>, "LMTA" },
+		 { <SPCE>, "SPCE" },
+		 { <RMTA>, "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
+
+    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
+    shape "LED"  { cornerRadius= 2, { [  3,  6 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  1;
+	left= 218;
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 10;
+    indicator.shape= "LED";
+    indicator "CapsLock"	{ left= 243; };
+    indicator "Compose"	{ left= 281; };
+    indicator "ScrollLock"	{ left= 262; };
+    indicator "NumLock"	{ left= 224; };
+    text.top= 1;
+    text.color= "black";
+    text "CapsLockLabel"	{ left= 243; text="Caps\nLock"; };
+    text "ComposeLabel"		{ left= 281; text="Compose"; };
+    text "ScrollLockLabel"	{ left= 262; text="Scroll\nLock"; };
+    text "NumLockLabel"		{ left= 224; text="Num\nLock"; };
+
+
+};
+
+xkb_geometry "t6tuv" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type6
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes.
+
+    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 "RTRN" { 
+        approx = { [ 0, 0], [28,37] },
+        { [ 0, 0], [28, 0], [28,37],
+          [ 5,37], [ 5,18], [ 0,18] },
+        { [ 1, 1], [26, 1], [26,36],
+          [ 7,36], [ 7,17], [ 1,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" { { [137,18] }, { [2,1], [135,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "RMTA" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "LMTA" { { [ 28,18] }, { [2,1], [26,17] } };
+    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>, 
+		   { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL>
+	    };
+	};
+	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>, "LMTA" },
+		 { <SPCE>, "SPCE" },
+		 { <RMTA>, "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
+
+    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
+    shape "LED"  { cornerRadius= 2, { [  3,  6 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  1;
+	left= 218;
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 10;
+    indicator.shape= "LED";
+    indicator "CapsLock"	{ left= 243; };
+    indicator "Compose"	{ left= 281; };
+    indicator "ScrollLock"	{ left= 262; };
+    indicator "NumLock"	{ left= 224; };
+    text.top= 1;
+    text.color= "black";
+    text "CapsLockLabel"	{ left= 243; text="Caps\nLock"; };
+    text "ComposeLabel"		{ left= 281; text="Compose"; };
+    text "ScrollLockLabel"	{ left= 262; text="Scroll\nLock"; };
+    text "NumLockLabel"		{ left= 224; text="Num\nLock"; };
+
+};
+
+xkb_geometry "t6jp" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type6
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes.
+
+    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 "KANJ" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "EXEC" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { 
+        approx = { [ 0, 0], [28,37] },
+        { [ 0, 0], [28, 0], [28,37],
+          [ 5,37], [ 5,18], [ 0,18] },
+        { [ 1, 1], [26, 1], [26,36],
+          [ 7,36], [ 7,17], [ 1,17] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [ 96,18] }, { [2,1], [94,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>, 
+		   { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <UNDR>,
+		 { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9 },
+		   <LALT>, <LMTA>, { <EXEC>, "EXEC" },
+		 { <SPCE>, "SPCE" }, { <KANJ>, "KANJ" }, <HENK>,
+		   <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
+
+    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
+    shape "LED"  { cornerRadius= 2, { [  3,  6 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  1;
+	left= 218;
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 10;
+    indicator.shape= "LED";
+    indicator "CapsLock"	{ left= 243; };
+    indicator "Compose"	{ left= 281; };
+    indicator "ScrollLock"	{ left= 262; };
+    indicator "NumLock"	{ left= 224; };
+    text.top= 1;
+    text.color= "black";
+    text "CapsLockLabel"	{ left= 243; text="Caps\nLock"; };
+    text "ComposeLabel"		{ left= 281; text="Compose"; };
+    text "ScrollLockLabel"	{ left= 262; text="Scroll\nLock"; };
+    text "NumLockLabel"		{ left= 224; text="Num\nLock"; };
+
+};
+
+xkb_geometry "t6unix" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type6
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes.
+
+    width= 515;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "TABK" { { [ 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" { { [136,18] }, { [2,1], [134,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 "RMTA" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "LMTA" { { [ 28,18] }, { [2,1], [26,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", color="grey20" }
+	    };
+	};
+	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>, "LMTA"},
+		 { <SPCE>, "SPCE" },
+		   {<RMTA>, "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
+
+    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
+    shape "LED"  { cornerRadius= 2, { [  3,  6 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  1;
+	left= 218;
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 10;
+    indicator.shape= "LED";
+    indicator "CapsLock"	{ left= 243; };
+    indicator "Compose"	{ left= 281; };
+    indicator "ScrollLock"	{ left= 262; };
+    indicator "NumLock"	{ left= 224; };
+    text.top= 1;
+    text.color= "black";
+    text "CapsLockLabel"	{ left= 243; text="Caps\nLock"; };
+    text "ComposeLabel"		{ left= 281; text="Compose"; };
+    text "ScrollLockLabel"	{ left= 262; text="Scroll\nLock"; };
+    text "NumLockLabel"		{ left= 224; text="Num\nLock"; };
+};
+
+xkb_geometry "type5" {
+    include "sun(t5)"
+    description= "Sun Type5 keyboard";
+};
+
+xkb_geometry "type5jp" {
+    include "sun(t5jp)"
+    description= "Sun Type5 Japanese keyboard";
+};
+
+xkb_geometry "type5tuv" {
+    include "sun(t5tuv)"
+    description= "Sun Type5 keyboard";
+};
+
+xkb_geometry "type5euro" {
+    include "sun(t5tuv)"
+    description= "Sun Type5 keyboard";
+};
+
+xkb_geometry "type5unix" {
+    include "sun(t5unix)"
+    description= "Sun Type5 Unix keyboard";
+};
+
+xkb_geometry "type5hobo" {
+    include "sun(t5hobo)"
+    description= "Sun Type5 Hobo keyboard";
+};
+
+xkb_geometry "type5tuvhobo" {
+    include "sun(t5tuvhobo)"
+    description= "Sun Type5 Hobo keyboard";
+};
+
+xkb_geometry "type5jphobo" {
+    include "sun(t5jphobo)"
+    description= "Sun Type5 Japanese Hobo keyboard";
+};
+
+default xkb_geometry "type6" {
+    include "sun(t6)"
+    description= "Sun Type6 keyboard (US, Korea, Taiwan)";
+};
+
+xkb_geometry "type6jp" {
+    include "sun(t6jp)"
+    description= "Sun Type6 Japanese keyboard";
+};
+
+xkb_geometry "type6tuv" {
+    include "sun(t6tuv)"
+    description= "Sun Type6 TUV keyboard";
+};
+
+xkb_geometry "type6unix" {
+    include "sun(t6unix)"
+    description= "Sun Type6 Unix keyboard";
+};
+
+xkb_geometry "x86" {
+    include "pc(pc101)"
+    description= "x86 Style Keyboard";
+};
+
+xkb_geometry "MS_x86" {
+    include "pc(pc104)"
+    description= "x86 104 Key Keyboard";
+};
+
+xkb_geometry "x86tuv" {
+    include "pc(pc102)"
+    description= "x86 European Style Keyboard";
+};
diff --git a/xorg-server/xkbdata.src/geometry/thinkpad b/xorg-server/xkbdata.src/geometry/thinkpad
new file mode 100644
index 000000000..031586662
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/thinkpad
@@ -0,0 +1,471 @@
+// -*- 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
+};
+
+xkb_geometry "60" {
+    width = 290;
+    height = 140;
+    baseColor = "grey80";
+    labelColor = "white";
+
+    shape "NORM" { cornerRadius = 1, { [18,   18] }, { [2, 0], [16, 16] } };
+
+    shape "ESC"  { cornerRadius = 1, { [17,   13] }, { [1.5, 0], [15.5, 12] } };
+    shape "FN0"  { cornerRadius = 1, { [17,   11] }, { [1.5, 0], [15.5, 10] } };
+
+    shape "BKSP" { cornerRadius = 1, { [37,   18] }, { [2, 0], [35, 16] } };
+
+    shape "TABK" { cornerRadius = 1, { [27.5, 18] }, { [2, 0], [25.5, 16] } };
+    shape "BKSL" { cornerRadius = 1, { [27.5, 18] }, { [2, 0], [25.5, 16] } };
+
+    shape "CAPS" { cornerRadius = 1, { [30.5, 18] }, { [2, 0], [28.5, 16] } };
+    shape "RTRN" { cornerRadius = 1, { [43.5, 18] }, { [2, 0], [41.5, 16] } };
+
+    shape "LFSH" { cornerRadius = 1, { [40,   18] }, { [2, 0], [38, 16] } };
+    shape "RTSH" { cornerRadius = 1, { [53,   18] }, { [2, 0], [51, 16] } };
+
+    shape "LCTL" { cornerRadius = 1, { [21,   18] }, { [2, 0], [19, 16] } };
+    shape "LWIN" { cornerRadius = 1, { [15,   18] }, { [1.5, 0], [13.5, 16] } };
+
+    shape "SPCE" { cornerRadius = 1, { [97,   18] }, { [2, 0], [95, 16] } };
+
+    shape "ARR1" { cornerRadius = 1, { [17,   13] }, { [1.5, 0], [15.5, 12] } };
+    shape "ARR2" { cornerRadius = 1, { [17,   11] }, { [1.5, 0], [15.5, 10] } };
+
+    shape "VOL"  { cornerRadius = 2.5, { [5, 5] } };
+    shape "TVTG" { cornerRadius = 0.5, { [0, 1], [17, 1], [17, 4], [0, 4] } };
+
+    shape "KEYS" { cornerRadius = 2,
+                   { [0, 0], [19, 0], [19, 16], [172, 16],
+	             [172, 4], [286, 4], [286, 133], [231, 133],
+	             [231, 126], [0, 126] } };
+
+    solid "KeyPanel" {
+	shape = "KEYS";
+	left = 2;
+	top = 3;
+	color = "black";
+    };
+
+    shape "NULL0" { cornerRadius = 0.5,
+                    { [0, 26],
+		      [72, 26], [72, 14], [76, 14], [76, 26],
+		      [149, 26], [149, 14], [153, 14], [153, 26],
+		      [226, 26], [226, 2], [230, 2], [230, 26],
+		      [284, 26], [284, 27],
+		      [0, 27] } };
+
+    solid "NullPanel0" {
+	shape = "NULL0";
+	left = 3;
+	top = 6;
+	color = "grey80";
+    };
+
+    shape "NULL1" { cornerRadius = 0.5, { [0, 12], [17, 12], [17, 13], [0, 13] } };
+
+    solid "NullPanel1" {
+	shape = "NULL1";
+	left = 3;
+	top = 6;
+	color = "grey80";
+    };
+
+    shape "MEDIA" { cornerRadius = 0.5, { [0, 0], [55, 0], [55, 10], [0, 10] } };
+
+    solid "MediaPanel" {
+	shape = "MEDIA";
+	left = 25.5;
+	top = 6;
+	color = "black";
+    };
+
+    section "Volume" {
+	left = 22;
+	top = 8.5;
+	key.shape = "VOL";
+	key.gap = 6;
+	key.color = "grey20";
+
+	row {
+	    keys { <MUTE>, <VOL->, <VOL+>, {<I1F>, "TVTG", color = "blue"} };
+	};
+    };
+
+    key.gap = 1;
+    key.color = "grey60";
+
+    section "Function" {
+	left = 2;
+	top = 3;
+	key.shape = "FN0";
+	row {
+	    key.shape = "ESC";
+	    top = 1;
+	    keys {  <ESC> };
+	};
+	row {
+	    top = 5;
+	    keys { { <PRSC>, 173 }, <SCLK>, <PAUS> };
+	};
+	row {
+	    top = 17;
+	    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 = "NORM";
+	row {
+	    top = 1;
+	    keys { <FN>, { <LCTL>, "LCTL" }, { <LWIN>, "LWIN" }, <LALT>,
+		   { <SPCE>, "SPCE" }, <RALT>, <MENU>, <RCTL>
+	    };
+	};
+    }; // End of "Control" section
+
+    section "Editing" {
+	top = 7;
+	left = 233;
+        key.shape = "FN0";
+	row {
+	    top = 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top = 13;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+    }; // End of "Editing" section
+
+    section "Navigation" {
+	top = 109;
+	left = 233;
+	row {
+	    key.shape = "ARR1";
+	    top = 1;
+	    keys { <I6A>, <UP>, <I69> };
+	};
+	row {
+	    key.shape = "ARR2";
+	    top = 15;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Navigation" section
+    
+    shape "STIK" { cornerRadius = 3.5, { [7, 7] } };
+
+    solid "STIK" {
+	priority = 255;
+	color = "red";
+	shape = "STIK";
+	top = 85.5;
+	left = 125.5;
+    };
+
+    section "Alpha" {
+	left = 2;
+	top = 33;
+	key.shape = "NORM";
+	row {
+	    top = 1;
+	    keys { <TLDE>, <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", color = "blue" }
+	    };
+	};
+	row {
+	    top = 58;
+	    keys { { <LFSH>, "LFSH" },
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		   { <RTSH>, "RTSH" }
+	    };
+	};
+    }; // End of "Alpha" section
+};
diff --git a/xorg-server/xkbdata.src/geometry/winbook b/xorg-server/xkbdata.src/geometry/winbook
new file mode 100644
index 000000000..e4de47861
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/install-sh b/xorg-server/xkbdata.src/install-sh
new file mode 100644
index 000000000..4d4a9519e
--- /dev/null
+++ b/xorg-server/xkbdata.src/install-sh
@@ -0,0 +1,323 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2005-05-14.22
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 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 CONNEC-
+# TION 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 deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+chmodcmd="$chmodprog 0755"
+chowncmd=
+chgrpcmd=
+stripcmd=
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
+
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -c) shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    *)  # When -d is used, all remaining arguments are directories to create.
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
+	break;;
+  esac
+done
+
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=
+
+    if test -d "$dst"; then
+      mkdircmd=:
+      chmodcmd=
+    else
+      mkdircmd=$mkdirprog
+    fi
+  else
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
+      dst=$dst/`basename "$src"`
+    fi
+  fi
+
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+
+  # Make sure that the destination directory exists.
+
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
+    IFS=$oIFS
+
+    pathcomp=
+
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      if test ! -d "$pathcomp"; then
+        $mkdirprog "$pathcomp"
+	# mkdir can fail with a `File exist' error in case several
+	# install-sh are creating the directory concurrently.  This
+	# is OK.
+	test -d "$pathcomp" || exit
+      fi
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $mkdircmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+  else
+    dstfile=`basename "$dst"`
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+    trap '(exit $?); exit' 1 2 13 15
+
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dstdir/$dstfile"; then
+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || {
+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 (exit 1); exit 1
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	 }
+    }
+  fi || { (exit 1); exit 1; }
+done
+
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+  (exit 0); exit 0
+}
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/xorg-server/xkbdata.src/intltool-extract.in b/xorg-server/xkbdata.src/intltool-extract.in
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/xorg-server/xkbdata.src/intltool-extract.in
diff --git a/xorg-server/xkbdata.src/intltool-merge.in b/xorg-server/xkbdata.src/intltool-merge.in
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/xorg-server/xkbdata.src/intltool-merge.in
diff --git a/xorg-server/xkbdata.src/intltool-update.in b/xorg-server/xkbdata.src/intltool-update.in
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/xorg-server/xkbdata.src/intltool-update.in
diff --git a/xorg-server/xkbdata.src/keycodes/Makefile.am b/xorg-server/xkbdata.src/keycodes/Makefile.am
new file mode 100644
index 000000000..c289e1454
--- /dev/null
+++ b/xorg-server/xkbdata.src/keycodes/Makefile.am
@@ -0,0 +1,22 @@
+SUBDIRS = digital_vndr sgi_vndr
+
+keycodesdir = $(xkb_base)/keycodes
+
+dist_keycodes_DATA = \
+aliases \
+amiga \
+ataritt \
+evdev \
+fujitsu \
+hp \
+ibm \
+macintosh \
+sony \
+sun \
+xfree86 \
+xfree98 \
+README
+
+dir_data = $(dist_keycodes_DATA)
+
+include $(top_srcdir)/xkbrules.am
diff --git a/xorg-server/xkbdata.src/keycodes/Makefile.in b/xorg-server/xkbdata.src/keycodes/Makefile.in
new file mode 100644
index 000000000..552016071
--- /dev/null
+++ b/xorg-server/xkbdata.src/keycodes/Makefile.in
@@ -0,0 +1,571 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Common rules for building *.dir files in all xkb subdirectories
+# Replaces Imake's MakeXkbDir() rule
+# svu: taken from xkbdata
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+DIST_COMMON = README $(dist_dir_DATA) $(dist_keycodes_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/xkbrules.am
+subdir = keycodes
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(keycodesdir)"
+dist_dirDATA_INSTALL = $(INSTALL_DATA)
+dist_keycodesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_dir_DATA) $(dist_keycodes_DATA)
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+SUBDIRS = digital_vndr sgi_vndr
+keycodesdir = $(xkb_base)/keycodes
+dist_keycodes_DATA = \
+aliases \
+amiga \
+ataritt \
+evdev \
+fujitsu \
+hp \
+ibm \
+macintosh \
+sony \
+sun \
+xfree86 \
+xfree98 \
+README
+
+dir_data = $(dist_keycodes_DATA)
+dist_dir_DATA = $(subdir).dir
+dirdir = $(xkb_base)
+CLEANFILES = $(subdir).dir
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xkbrules.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  keycodes/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  keycodes/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_dirDATA: $(dist_dir_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)"
+	@list='$(dist_dir_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_dirDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dirdir)/$$f'"; \
+	  $(dist_dirDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dirdir)/$$f"; \
+	done
+
+uninstall-dist_dirDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_dir_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(dirdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(dirdir)/$$f"; \
+	done
+install-dist_keycodesDATA: $(dist_keycodes_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(keycodesdir)" || $(mkdir_p) "$(DESTDIR)$(keycodesdir)"
+	@list='$(dist_keycodes_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_keycodesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(keycodesdir)/$$f'"; \
+	  $(dist_keycodesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(keycodesdir)/$$f"; \
+	done
+
+uninstall-dist_keycodesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_keycodes_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(keycodesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(keycodesdir)/$$f"; \
+	done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/..
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(keycodesdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-dist_dirDATA install-dist_keycodesDATA
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-dist_dirDATA uninstall-dist_keycodesDATA \
+	uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-recursive ctags ctags-recursive \
+	distclean distclean-generic distclean-recursive distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dist_dirDATA \
+	install-dist_keycodesDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_dirDATA \
+	uninstall-dist_keycodesDATA uninstall-info-am
+
+
+$(subdir).dir: $(dir_data)
+	-rm -f $@
+	here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*'
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/keycodes/README b/xorg-server/xkbdata.src/keycodes/README
new file mode 100644
index 000000000..6363f3d55
--- /dev/null
+++ b/xorg-server/xkbdata.src/keycodes/README
@@ -0,0 +1,6 @@
+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.
diff --git a/xorg-server/xkbdata.src/keycodes/aliases b/xorg-server/xkbdata.src/keycodes/aliases
new file mode 100644
index 000000000..f398772fe
--- /dev/null
+++ b/xorg-server/xkbdata.src/keycodes/aliases
@@ -0,0 +1,99 @@
+
+// keycode aliases for phonetic keyboard maps
+
+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/xorg-server/xkbdata.src/keycodes/amiga b/xorg-server/xkbdata.src/keycodes/amiga
new file mode 100644
index 000000000..7b661a5cf
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/keycodes/ataritt b/xorg-server/xkbdata.src/keycodes/ataritt
new file mode 100644
index 000000000..3cfd503be
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.am b/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.am
new file mode 100644
index 000000000..4f4cc4fd9
--- /dev/null
+++ b/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.am
@@ -0,0 +1,4 @@
+keycodesdir = $(xkb_base)/keycodes/digital_vndr
+
+dist_keycodes_DATA = \
+lk pc
diff --git a/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.in
new file mode 100644
index 000000000..3ca867294
--- /dev/null
+++ b/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.in
@@ -0,0 +1,367 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = keycodes/digital_vndr
+DIST_COMMON = $(dist_keycodes_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(keycodesdir)"
+dist_keycodesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_keycodes_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+keycodesdir = $(xkb_base)/keycodes/digital_vndr
+dist_keycodes_DATA = \
+lk pc
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  keycodes/digital_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  keycodes/digital_vndr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_keycodesDATA: $(dist_keycodes_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(keycodesdir)" || $(mkdir_p) "$(DESTDIR)$(keycodesdir)"
+	@list='$(dist_keycodes_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_keycodesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(keycodesdir)/$$f'"; \
+	  $(dist_keycodesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(keycodesdir)/$$f"; \
+	done
+
+uninstall-dist_keycodesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_keycodes_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(keycodesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(keycodesdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(keycodesdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_keycodesDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_keycodesDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_keycodesDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_keycodesDATA uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/keycodes/digital_vndr/lk b/xorg-server/xkbdata.src/keycodes/digital_vndr/lk
new file mode 100644
index 000000000..8523b95dd
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/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_vndr/lk(lkx01)"
+    indicator 4 = "Scroll Lock";
+    indicator 3 = "Caps Lock";
+    indicator 2 = "Compose";
+    indicator 1 = "Wait";
+};
+
+xkb_keycodes "lk421" {
+    include	"digital_vndr/lk(lkx01)"
+    <LALT>	= 172;
+    <RALT>	= 178;
+    <RCMP>	= 173;
+};
+
+xkb_keycodes "lk401" {
+    include	"digital_vndr/lk(lk421)"
+    indicator 4 = "Scroll Lock";
+    indicator 3 = "Caps Lock";
+};
+
+xkb_keycodes "lk44x" {
+    include "digital_vndr/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_vndr/lk(lk44x)"
+    <BKSL>	= 247;
+    indicator 3 = "Caps Lock";
+    indicator 4 = "Scroll Lock";
+    indicator 5 = "Num Lock";
+};
+
+xkb_keycodes "lk444" {
+    include "digital_vndr/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_vndr/lk(lk421)"
+    <AB11>  = 252;
+};
+
+xkb_keycodes "lk421jj" {
+    include "digital_vndr/lk(lk421aj)"
+    <MUHE>  = 94;
+    <KANJ>  = 95;
+    <HIRA>  = 97;
+};
+
+xkb_keycodes "lk401bj" {
+    include "digital_vndr/lk(lk401)"
+    <MUHE>  = 94;
+    <KANJ>  = 95;
+    <HIRA>  = 97;
+};
+
+xkb_keycodes "lk401jj" {
+    include "digital_vndr/lk(lk401bj)"
+    <AB11>  = 252;
+};
diff --git a/xorg-server/xkbdata.src/keycodes/digital_vndr/pc b/xorg-server/xkbdata.src/keycodes/digital_vndr/pc
new file mode 100644
index 000000000..511715627
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/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_vndr/pc(pc10x)"
+    <BKSL>  = 92;
+    indicator 5 = "Num Lock";
+};
+
+
+xkb_keycodes "pc102" {
+    include "digital_vndr/pc(pc10x)"
+    <BKSL>  = 19;
+    <AC12>  = 83;
+    indicator 5 = "Num Lock";
+};
+
+xkb_keycodes "pc104" {
+    include "digital_vndr/pc(pc101)"
+    <LWIN>  = 139;
+    <RWIN>  = 140;
+    <MENU>  = 141;
+};
+
+xkb_keycodes "lk411_common" {
+    include "digital_vndr/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_vndr/pc(lk411_common)"
+    <BKSL>	= 92;
+};
+
+xkb_keycodes "lk450" {
+    include	"digital_vndr/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_vndr/pc(pc10x)"
+    <BKSL>  = 93;
+    <AC12>  = 83;
+    <AB11>  = 81;
+    <MUHE>  = 133;
+    <KANJ>  = 134;
+    <HIRA>  = 135;
+    indicator 5 = "Group 2";
+};
+
+xkb_keycodes "lk411jj" {
+    include "digital_vndr/pc(lk411_common)"
+    <AB11>  = 81;
+    <BKSL>  = 83;
+    <MUHE>  = 133;
+    <KANJ>  = 134;
+    <HIRA>  = 135;
+};
+
+
diff --git a/xorg-server/xkbdata.src/keycodes/evdev b/xorg-server/xkbdata.src/keycodes/evdev
new file mode 100644
index 000000000..673a967e6
--- /dev/null
+++ b/xorg-server/xkbdata.src/keycodes/evdev
@@ -0,0 +1,320 @@
+// translation from evdev scancodes to something resembling xfree86 keycodes.
+
+default xkb_keycodes "evdev" {
+	minimum = 8;
+	maximum = 255;
+
+        # Added for pc105 compatibility
+        <LSGT> = 94;
+
+	<TLDE> = 49;
+	<AE01> = 10;
+	<AE02> = 11;
+	<AE03> = 12;
+	<AE04> = 13;
+	<AE05> = 14;
+	<AE06> = 15;
+	<AE07> = 16;
+	<AE08> = 17;
+	<AE09> = 18;
+	<AE10> = 19;
+	<AE11> = 20;
+	<AE12> = 21;
+	<BKSP> = 22;
+
+	<TAB> = 23;
+	<AD01> = 24;
+	<AD02> = 25;
+	<AD03> = 26;
+	<AD04> = 27;
+	<AD05> = 28;
+	<AD06> = 29;
+	<AD07> = 30;
+	<AD08> = 31;
+	<AD09> = 32;
+	<AD10> = 33;
+	<AD11> = 34;
+	<AD12> = 35;
+	<BKSL> = 51;
+	<RTRN> = 36;
+
+	<CAPS> = 66;
+	<AC01> = 38;
+	<AC02> = 39;
+	<AC03> = 40;
+	<AC04> = 41;
+	<AC05> = 42;
+	<AC06> = 43;
+	<AC07> = 44;
+	<AC08> = 45;
+	<AC09> = 46;
+	<AC10> = 47;
+	<AC11> = 48;
+
+	<LFSH> = 50;
+	<AB01> = 52;
+	<AB02> = 53;
+	<AB03> = 54;
+	<AB04> = 55;
+	<AB05> = 56;
+	<AB06> = 57;
+	<AB07> = 58;
+	<AB08> = 59;
+	<AB09> = 60;
+	<AB10> = 61;
+	<RTSH> = 62;
+
+	<LALT> = 64;
+	<LCTL> = 37;
+	<SPCE> = 65;
+	<RCTL> = 105;
+	<RALT> = 108;
+	// Microsoft keyboard extra keys
+	<LWIN> = 133;
+	<RWIN> = 134;
+	<COMP> = 135;
+	alias <MENU> = <COMP>;
+
+	<ESC> = 9;
+	<FK01> = 67;
+	<FK02> = 68;
+	<FK03> = 69;
+	<FK04> = 70;
+	<FK05> = 71;
+	<FK06> = 72;
+	<FK07> = 73;
+	<FK08> = 74;
+	<FK09> = 75;
+	<FK10> = 76;
+	<FK11> = 95;
+	<FK12> = 96;
+
+	<PRSC> = 107;
+	// <SYRQ> = 107;
+	<SCLK> = 78;
+	<PAUS> = 127;
+	// <BRK> = 419;
+
+	<INS> = 118;
+	<HOME> = 110;
+	<PGUP> = 112;
+	<DELE> = 119;
+	<END> = 115;
+	<PGDN> = 117;
+
+	<UP> = 111;
+	<LEFT> = 113;
+	<DOWN> = 116;
+	<RGHT> = 114;
+
+	<NMLK> = 77;
+	<KPDV> = 106;
+	<KPMU> = 63;
+	<KPSU> = 82;
+
+	<KP7> = 79;
+	<KP8> = 80;
+	<KP9> = 81;
+	<KPAD> = 86;
+
+	<KP4> = 83;
+	<KP5> = 84;
+	<KP6> = 85;
+
+	<KP1> = 87;
+	<KP2> = 88;
+	<KP3> = 89;
+	<KPEN> = 104;
+
+	<KP0> = 90;
+	<KPDL> = 91;
+	<KPEQ> = 125;
+
+	<FK13> = 191;
+	<FK14> = 192;
+	<FK15> = 193;
+	<FK16> = 194;
+	<FK17> = 195;
+	<FK18> = 196;
+	<FK19> = 197;
+	<FK20> = 198;
+	<FK21> = 199;
+	<FK22> = 200;
+	<FK23> = 201;
+	<FK24> = 202;
+
+	// Keys that are generated on Japanese keyboards
+
+	<HZTG> =  93;	// Hankaku/Zenkakau toggle
+	<HKTG> = 101;	// Hiragana/Katakana toggle
+	<AB11> = 97;	// backslash/underscore
+	<HENK> = 100;	// Henkan
+	<MUHE> = 102;	// Muhenkan
+	<AE13> = 132;	// Yen
+	<KATA> =  98;	// Katakana
+	<HIRA> =  99;	// Hiragana
+	<JPCM> = 103;	// KPJPComma
+	//<RO>   =  97;	// Romaji
+
+	// Keys that are generated on Korean keyboards
+
+	<HNGL> = 130;	// Hangul Latin toggle
+	<HJCV> = 131;	// Hangul to Hanja conversion
+
+	// Solaris compatibility
+
+	alias <LMTA> = <LWIN>;
+	alias <RMTA> = <RWIN>;
+	<MUTE> = 121;
+	<VOL-> = 122;
+	<VOL+> = 123;
+	<POWR> = 124;
+	<STOP> = 136;
+	<AGAI> = 137;
+	<PROP> = 138;
+	<UNDO> = 139;
+	<FRNT> = 140;
+	<COPY> = 141;
+	<OPEN> = 142;
+	<PAST> = 143;
+	<FIND> = 144;
+	<CUT>  = 145;
+	<HELP> = 146;
+
+	// Extended keys that may be generated on "Internet" keyboards.
+	// evdev has standardize names for these.
+
+	<LNFD> = 109;	// #define KEY_LINEFEED            101
+	<I120> = 120;	// #define KEY_MACRO               112
+	<I126> = 126;	// #define KEY_KPPLUSMINUS         118
+	<I129> = 129;	// #define KEY_KPCOMMA             121
+	<I147> = 147;	// #define KEY_MENU                139
+	<I148> = 148;	// #define KEY_CALC                140
+	<I149> = 149;	// #define KEY_SETUP               141
+	<I150> = 150;	// #define KEY_SLEEP               142
+	<I151> = 151;	// #define KEY_WAKEUP              143
+	<I152> = 152;	// #define KEY_FILE                144
+	<I153> = 153;	// #define KEY_SENDFILE            145
+	<I154> = 154;	// #define KEY_DELETEFILE          146
+	<I155> = 155;	// #define KEY_XFER                147
+	<I156> = 156;	// #define KEY_PROG1               148
+	<I157> = 157;	// #define KEY_PROG2               149
+	<I158> = 158;	// #define KEY_WWW                 150
+	<I159> = 159;	// #define KEY_MSDOS               151
+	<I160> = 160;	// #define KEY_COFFEE              152
+	<I161> = 161;	// #define KEY_DIRECTION           153
+	<I162> = 162;	// #define KEY_CYCLEWINDOWS        154
+	<I163> = 163;	// #define KEY_MAIL                155
+	<I164> = 164;	// #define KEY_BOOKMARKS           156
+	<I165> = 165;	// #define KEY_COMPUTER            157
+	<I166> = 166;	// #define KEY_BACK                158
+	<I167> = 167;	// #define KEY_FORWARD             159
+	<I168> = 168;	// #define KEY_CLOSECD             160
+	<I169> = 169;	// #define KEY_EJECTCD             161
+	<I170> = 170;	// #define KEY_EJECTCLOSECD        162
+	<I171> = 171;	// #define KEY_NEXTSONG            163
+	<I172> = 172;	// #define KEY_PLAYPAUSE           164
+	<I173> = 173;	// #define KEY_PREVIOUSSONG        165
+	<I174> = 174;	// #define KEY_STOPCD              166
+	<I175> = 175;	// #define KEY_RECORD              167
+	<I176> = 176;	// #define KEY_REWIND              168
+	<I177> = 177;	// #define KEY_PHONE               169
+	<I178> = 178;	// #define KEY_ISO                 170
+	<I179> = 179;	// #define KEY_CONFIG              171
+	<I180> = 180;	// #define KEY_HOMEPAGE            172
+	<I181> = 181;	// #define KEY_REFRESH             173
+	<I182> = 182;	// #define KEY_EXIT                174
+	<I183> = 183;	// #define KEY_MOVE                175
+	<I184> = 184;	// #define KEY_EDIT                176
+	<I185> = 185;	// #define KEY_SCROLLUP            177
+	<I186> = 186;	// #define KEY_SCROLLDOWN          178
+	<I187> = 187;	// #define KEY_KPLEFTPAREN         179
+	<I188> = 188;	// #define KEY_KPRIGHTPAREN        180
+	<I189> = 189;	// #define KEY_NEW                 181
+	<I190> = 190;	// #define KEY_REDO                182
+	<I208> = 208;	// #define KEY_PLAYCD              200
+	<I209> = 209;	// #define KEY_PAUSECD             201
+	<I210> = 210;	// #define KEY_PROG3               202
+	<I211> = 211;	// #define KEY_PROG4               203 conflicts with AB11
+	<I213> = 213;	// #define KEY_SUSPEND             205
+	<I214> = 214;	// #define KEY_CLOSE               206
+	<I215> = 215;	// #define KEY_PLAY                207
+	<I216> = 216;	// #define KEY_FASTFORWARD         208
+	<I217> = 217;	// #define KEY_BASSBOOST           209
+	<I218> = 218;	// #define KEY_PRINT               210
+	<I219> = 219;	// #define KEY_HP                  211
+	<I220> = 220;	// #define KEY_CAMERA              212
+	<I221> = 221;	// #define KEY_SOUND               213
+	<I222> = 222;	// #define KEY_QUESTION            214
+	<I223> = 223;	// #define KEY_EMAIL               215
+	<I224> = 224;	// #define KEY_CHAT                216
+	<I225> = 225;	// #define KEY_SEARCH              217
+	<I226> = 226;	// #define KEY_CONNECT             218
+	<I227> = 227;	// #define KEY_FINANCE             219
+	<I228> = 228;	// #define KEY_SPORT               220
+	<I229> = 229;	// #define KEY_SHOP                221
+	<I230> = 230;	// #define KEY_ALTERASE            222
+	<I231> = 231;	// #define KEY_CANCEL              223
+	<I232> = 232;	// #define KEY_BRIGHTNESSDOWN      224
+	<I233> = 233;	// #define KEY_BRIGHTNESSUP        225
+	<I234> = 234;	// #define KEY_MEDIA               226
+	<I235> = 235;	// #define KEY_SWITCHVIDEOMODE     227
+	<I236> = 236;	// #define KEY_KBDILLUMTOGGLE      228
+	<I237> = 237;	// #define KEY_KBDILLUMDOWN        229
+	<I238> = 238;	// #define KEY_KBDILLUMUP          230
+	<I239> = 239;	// #define KEY_SEND                231
+	<I240> = 240;	// #define KEY_REPLY               232
+	<I241> = 241;	// #define KEY_FORWARDMAIL         233
+	<I242> = 242;	// #define KEY_SAVE                234
+	<I243> = 243;	// #define KEY_DOCUMENTS           235
+	<I244> = 244;	// #define KEY_BATTERY             236
+	<I245> = 245;	// #define KEY_BLUETOOTH           237
+	<I246> = 246;	// #define KEY_WLAN                238
+	<I247> = 247;	// (not defined in input.h)        239
+	<I248> = 248;	// #define KEY_UNKNOWN             240
+	<I249> = 249;	// #define KEY_VIDEO_NEXT          241
+	<I250> = 250;	// #define KEY_VIDEO_PREV          242
+	<I251> = 251;	// #define KEY_BRIGHTNESS_CYCLE    243
+	<I252> = 252;	// #define KEY_BRIGHTNESS_ZERO     244
+	<I253> = 253;	// #define KEY_DISPLAY_OFF         245
+
+	// Fake keycodes for virtual keys
+	<LVL3> =   92;
+	<MDSW> =   203;
+	<ALT>  =   204;
+	<META> =   205;
+	<SUPR> =   206;
+	<HYPR> =   207;
+
+	indicator 1  = "Caps Lock";
+	indicator 2  = "Num Lock";
+	indicator 3  = "Scroll Lock";
+	indicator 4  = "Compose";
+	indicator 5  = "Kana";
+	indicator 6  = "Sleep";
+	indicator 7  = "Suspend";
+	indicator 8  = "Mute";
+	indicator 9  = "Misc";
+	indicator 10 = "Mail";
+	indicator 11 = "Charging";
+
+	alias <ALGR> = <RALT>;
+};
+
+// For japanese 106 keyboard.
+xkb_keycodes "jp106" {
+    include "evdev(evdev)"
+    <HZTG> = 49;
+    <AC12> = 51;
+};
+
+// For brazilian ABNT2 keyboard.
+xkb_keycodes "abnt2" {
+    include "evdev(evdev)"
+};
+
+// PC98
+xkb_keycodes "pc98" {
+    include "evdev(evdev)"
+};
+
diff --git a/xorg-server/xkbdata.src/keycodes/fujitsu b/xorg-server/xkbdata.src/keycodes/fujitsu
new file mode 100644
index 000000000..e0e63c6b5
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/keycodes/hp b/xorg-server/xkbdata.src/keycodes/hp
new file mode 100644
index 000000000..0c98072d3
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/keycodes/ibm b/xorg-server/xkbdata.src/keycodes/ibm
new file mode 100644
index 000000000..303d4b360
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/keycodes/keycodes.dir b/xorg-server/xkbdata.src/keycodes/keycodes.dir
new file mode 100644
index 000000000..002037e6f
--- /dev/null
+++ b/xorg-server/xkbdata.src/keycodes/keycodes.dir
@@ -0,0 +1,87 @@
+-d------ -------- macintosh(macintosh)
+-------- -------- macintosh(badmap)
+-------- -------- macintosh(goodmap)
+-------- -------- macintosh(old)
+-------- -------- macintosh(hhk)
+-d------ -------- aliases(qwerty)
+-------- -------- aliases(azerty)
+-------- -------- aliases(qwertz)
+-------- -------- sony(nwp5461)
+-d------ -------- fujitsu(138)
+-d------ -------- xfree98(pc98)
+-d------ -------- evdev(evdev)
+-------- -------- evdev(jp106)
+-------- -------- evdev(abnt2)
+-------- -------- evdev(pc98)
+-d------ -------- sun(type4)
+-------- -------- sun(type5)
+-------- -------- sun(type4tuv)
+-------- -------- sun(type4_ca)
+-------- -------- sun(type4_jp)
+-------- -------- sun(type4_euro)
+-------- -------- sun(type5tuv)
+-------- -------- sun(type5_jp)
+-------- -------- sun(type5_euro)
+-------- -------- sun(type5hobo)
+-------- -------- sun(type5tuvhobo)
+-------- -------- sun(type5_jphobo)
+-------- -------- sun(type6)
+-------- -------- sun(type6tuv)
+-------- -------- sun(type6unix)
+-------- -------- sun(type6_jp)
+-------- -------- sun(type6_euro)
+-------- -------- sun(type6_usb)
+-------- -------- sun(type6tuv_usb)
+-------- -------- sun(type6_jp_usb)
+-------- -------- sun(type5_se)
+-------- -------- sun(type5c_se)
+-------- -------- sun(type4__se)
+-------- -------- sun(type4_se)
+-------- -------- sun(type4_se_swapctl)
+-d------ -------- amiga(usa1)
+-------- -------- amiga(de)
+-d------ -------- hp(hp-101)
+-------- -------- hp(hil)
+-d------ -------- sgi_vndr/indigo(pc101)
+-------- -------- sgi_vndr/indigo(pc102)
+-d------ -------- sgi_vndr/indy(universal)
+-------- -------- sgi_vndr/indy(pc101)
+-------- -------- sgi_vndr/indy(pc102)
+-------- -------- sgi_vndr/indy(pc104)
+-------- -------- sgi_vndr/indy(pc105)
+-------- -------- sgi_vndr/indy(jp106)
+h-p----- -------- sgi_vndr/indy(overlayKeypad)
+h-p----- -------- sgi_vndr/indy(shiftLock)
+-d------ -------- sgi_vndr/iris(iris)
+-------- -------- ibm(rs6k-101)
+-------- -------- ibm(rs6k-102)
+-------- -------- digital_vndr/lk(lk_common)
+-------- -------- digital_vndr/lk(lkx01)
+-------- -------- digital_vndr/lk(lk201)
+-------- -------- digital_vndr/lk(lk421)
+-------- -------- digital_vndr/lk(lk401)
+-------- -------- digital_vndr/lk(lk44x)
+-------- -------- digital_vndr/lk(lk443)
+-------- -------- digital_vndr/lk(lk444)
+-------- -------- digital_vndr/lk(lk421aj)
+-------- -------- digital_vndr/lk(lk421jj)
+-------- -------- digital_vndr/lk(lk401bj)
+-------- -------- digital_vndr/lk(lk401jj)
+-------- -------- digital_vndr/pc(pc_common)
+-------- -------- digital_vndr/pc(pc10x)
+-------- -------- digital_vndr/pc(pc101)
+-------- -------- digital_vndr/pc(pc102)
+-------- -------- digital_vndr/pc(pc104)
+-------- -------- digital_vndr/pc(lk411_common)
+-------- -------- digital_vndr/pc(lk411)
+-------- -------- digital_vndr/pc(lk450)
+-------- -------- digital_vndr/pc(pcxajaa)
+-------- -------- digital_vndr/pc(lk411jj)
+-d------ -------- ataritt(us)
+-------- -------- ataritt(de)
+-d------ -------- xfree86(xfree86)
+-------- -------- xfree86(basic)
+-------- -------- xfree86(102)
+-------- -------- xfree86(jp106)
+-------- -------- xfree86(abnt2)
+-------- -------- xfree86(thinkpadz60)
diff --git a/xorg-server/xkbdata.src/keycodes/macintosh b/xorg-server/xkbdata.src/keycodes/macintosh
new file mode 100644
index 000000000..8f5418b25
--- /dev/null
+++ b/xorg-server/xkbdata.src/keycodes/macintosh
@@ -0,0 +1,197 @@
+// $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" {
+   include "xfree86"
+
+   <FK13> = 182;
+   <FK14> = 183;
+   <FK15> = 184;
+   <KPEQ> = 157;
+   
+};
+
+xkb_keycodes "badmap" {
+    <TLDE> =  94;
+    <LSGT> =  49;
+};
+
+xkb_keycodes "goodmap" {
+    <TLDE> =  49;
+    <LSGT> =  94;
+};
+
+xkb_keycodes "old" {
+
+    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>;
+};
+
+xkb_keycodes "hhk" {
+   include "macintosh"
+
+    <AC12> = 51;
+
+    <LWIN> = 49;
+    <EISU> = 131;
+    <KANA> = 129;
+    <RWIN> = 208;
+
+    <FK13> = 111;
+    <FK14> = 78;
+    <FK15> = 110;
+};
+
diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.am b/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.am
new file mode 100644
index 000000000..f601268e2
--- /dev/null
+++ b/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.am
@@ -0,0 +1,4 @@
+keycodesdir = $(xkb_base)/keycodes/sgi_vndr
+
+dist_keycodes_DATA = \
+indigo indy iris
diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.in
new file mode 100644
index 000000000..f913b105b
--- /dev/null
+++ b/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.in
@@ -0,0 +1,367 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = keycodes/sgi_vndr
+DIST_COMMON = $(dist_keycodes_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(keycodesdir)"
+dist_keycodesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_keycodes_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+keycodesdir = $(xkb_base)/keycodes/sgi_vndr
+dist_keycodes_DATA = \
+indigo indy iris
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  keycodes/sgi_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  keycodes/sgi_vndr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_keycodesDATA: $(dist_keycodes_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(keycodesdir)" || $(mkdir_p) "$(DESTDIR)$(keycodesdir)"
+	@list='$(dist_keycodes_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_keycodesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(keycodesdir)/$$f'"; \
+	  $(dist_keycodesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(keycodesdir)/$$f"; \
+	done
+
+uninstall-dist_keycodesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_keycodes_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(keycodesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(keycodesdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(keycodesdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_keycodesDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_keycodesDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_keycodesDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_keycodesDATA uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/indigo b/xorg-server/xkbdata.src/keycodes/sgi_vndr/indigo
new file mode 100644
index 000000000..fd87e57ba
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indigo(pc101)"
+    <LSGT> = 118;
+};
diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/indy b/xorg-server/xkbdata.src/keycodes/sgi_vndr/indy
new file mode 100644
index 000000000..a777c374b
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/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_vndr/indy(pc101)"
+    maximum= 149;
+    minimum= 15;
+};
+xkb_keycodes "pc104" {
+    include "sgi_vndr/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_vndr/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_vndr/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/xorg-server/xkbdata.src/keycodes/sgi_vndr/iris b/xorg-server/xkbdata.src/keycodes/sgi_vndr/iris
new file mode 100644
index 000000000..a4118a6b4
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/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/xorg-server/xkbdata.src/keycodes/sony b/xorg-server/xkbdata.src/keycodes/sony
new file mode 100644
index 000000000..0e720b422
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/keycodes/sun b/xorg-server/xkbdata.src/keycodes/sun
new file mode 100644
index 000000000..70400a4c6
--- /dev/null
+++ b/xorg-server/xkbdata.src/keycodes/sun
@@ -0,0 +1,960 @@
+// $XdotOrg: $
+// $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.
+//
+// ---------------------------------------------------------------------------
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+// ---------------------------------------------------------------------------
+//
+// $XFree86: xc/programs/xkbcomp/keycodes/sun,v 3.6 2003/08/09 14:30:48 pascal 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 "type4tuv" {
+    include "sun(type4)"
+    <LSGT> = 131;
+    <BRCR> = 22;
+};
+
+xkb_keycodes "type4_ca" {
+    include "sun(type4)"
+    <LSGT> = 131;
+};
+
+xkb_keycodes "type4_jp" {
+    include "sun(type4)"
+    <EXEC> = 122;
+    <KANJ> = 123;
+    <HENK> = 124;
+    <BRCR> = 22;
+    alias <UNDR> = <LNFD>;
+};
+
+xkb_keycodes "type4_euro" {
+    include "sun(type4)"
+    <LSGT> = 131;
+};
+
+xkb_keycodes "type5tuv" {
+    include "sun(type5)"
+    <LSGT> = 131;
+};
+
+xkb_keycodes "type5_jp" {
+    include "sun(type5)"
+    <EXEC> = 122;
+    <KANJ> = 123;
+    <HENK> = 124;
+    <UNDR> = 118;
+};
+
+xkb_keycodes "type5_euro" {
+    include "sun(type5)"
+    <LSGT> = 131;
+};
+
+xkb_keycodes "type5hobo" {
+
+    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 "type5tuvhobo" {
+    include "sun(type5hobo)"
+    <LSGT> = 131;
+
+};
+
+xkb_keycodes "type5_jphobo" {
+    include "sun(type5hobo)"
+    <EXEC> = 122;
+    <KANJ> = 123;
+    <HENK> = 124;
+    <UNDR> = 118;
+};
+
+xkb_keycodes "type6" {
+    include "sun(type5)"
+};
+
+xkb_keycodes "type6tuv" {
+    include "sun(type5tuv)"
+};
+
+xkb_keycodes "type6unix" {
+    include "sun(type5)"
+};
+
+xkb_keycodes "type6_jp" {
+    include "sun(type5_jp)"
+};
+
+xkb_keycodes "type6_euro" {
+    include "sun(type5_euro)"
+};
+
+// Even though this is labeled as _usb, I verified these keycodes as accurate
+// on my type5 serial and type6 serial keyboards as well on linux-2.6 boxes.
+// I'm not sure where the "type5" keycodes above are coming from...
+xkb_keycodes "type6_usb" {
+    include "xfree86"
+
+    <STOP> = 232;
+    <AGAI> = 133;
+    <PROP> = 134;
+    <UNDO> = 135;
+    <FRNT> = 140;
+    <COPY> = 248;
+    <OPEN> = 191;
+    <PAST> = 192;
+    <FIND> = 122;
+    <CUT>  = 188;
+
+    <HELP> = 245;
+
+    // The blank has keycode 239 on my type6 serial kb, but 134 on
+    // my type6 usb keyboard (same as <PROP>)
+    <BLNK> = 239;
+
+    // AltGr + PrScr actually sends a different keycode
+    <SYRQ> = 92;
+
+    <MUTE> = 160;
+    <VOL-> = 174;
+    <VOL+> = 176;
+    <POWR> = 222;
+
+    indicator 4 = "Compose";
+};
+
+xkb_keycodes "type6tuv_usb" {
+    include "sun(type6_usb)"
+//    <LSGT> = 94;
+//    <BKSL> = 51;
+};
+
+xkb_keycodes "type6_jp_usb" {
+    include "sun(type6_usb)"
+    alias <UNDR> = <KPDC>;  // 123
+    alias <EXEC> = <I0B>;   // 139 
+    alias <KANJ> = <I0A>;   // 138
+    alias <HENK> = <XFER>;  // 129
+    indicator 5 = "Kana";
+};
+
+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/xorg-server/xkbdata.src/keycodes/xfree86 b/xorg-server/xkbdata.src/keycodes/xfree86
new file mode 100644
index 000000000..f140a841b
--- /dev/null
+++ b/xorg-server/xkbdata.src/keycodes/xfree86
@@ -0,0 +1,423 @@
+// $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;
+    alias <AE00> = <TLDE>;	// Some geometries use AE00
+    <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
+    <EISU> =   210;		// Alphanumeric mode on macintosh
+    <KANA> =   209;		// Kana mode on macintosh
+
+    // 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;
+    <OUTP> =   214;
+    <KITG> =   215;
+    <KIDN> =   216;
+    <KIUP> =   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;
+
+    // MacBooks generate 0x65 for the lower brightness key
+    <II65> =  101;
+
+    // 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>
+    alias <K71> = <KANA>;	// <I51>
+    alias <K72> = <EISU>;	// <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(xfree86)"
+    <KPPT> = 134;
+};
+
+// IBM ThinkPad Z60m/Z60t/Z61m/Z61t
+xkb_keycodes "thinkpadz60" {
+    include "xfree86(xfree86)"
+    <MENU> = 227;
+};
diff --git a/xorg-server/xkbdata.src/keycodes/xfree98 b/xorg-server/xkbdata.src/keycodes/xfree98
new file mode 100644
index 000000000..6d34772f9
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/keymap/Makefile.am b/xorg-server/xkbdata.src/keymap/Makefile.am
new file mode 100644
index 000000000..98da8f2b0
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/Makefile.am
@@ -0,0 +1,12 @@
+SUBDIRS = digital_vndr sgi_vndr sun_vndr
+
+keymapdir = $(xkb_base)/keymap
+
+dist_keymap_DATA = \
+amiga ataritt macintosh \
+sony xfree86 xfree98 \
+README
+
+dir_data = $(dist_keymap_DATA)
+
+include $(top_srcdir)/xkbrules.am
diff --git a/xorg-server/xkbdata.src/keymap/Makefile.in b/xorg-server/xkbdata.src/keymap/Makefile.in
new file mode 100644
index 000000000..dab44ddd0
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/Makefile.in
@@ -0,0 +1,561 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Common rules for building *.dir files in all xkb subdirectories
+# Replaces Imake's MakeXkbDir() rule
+# svu: taken from xkbdata
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+DIST_COMMON = README $(dist_dir_DATA) $(dist_keymap_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/xkbrules.am
+subdir = keymap
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(keymapdir)"
+dist_dirDATA_INSTALL = $(INSTALL_DATA)
+dist_keymapDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_dir_DATA) $(dist_keymap_DATA)
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+SUBDIRS = digital_vndr sgi_vndr sun_vndr
+keymapdir = $(xkb_base)/keymap
+dist_keymap_DATA = \
+amiga ataritt macintosh \
+sony xfree86 xfree98 \
+README
+
+dir_data = $(dist_keymap_DATA)
+dist_dir_DATA = $(subdir).dir
+dirdir = $(xkb_base)
+CLEANFILES = $(subdir).dir
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xkbrules.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  keymap/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  keymap/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_dirDATA: $(dist_dir_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)"
+	@list='$(dist_dir_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_dirDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dirdir)/$$f'"; \
+	  $(dist_dirDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dirdir)/$$f"; \
+	done
+
+uninstall-dist_dirDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_dir_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(dirdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(dirdir)/$$f"; \
+	done
+install-dist_keymapDATA: $(dist_keymap_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(keymapdir)" || $(mkdir_p) "$(DESTDIR)$(keymapdir)"
+	@list='$(dist_keymap_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_keymapDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(keymapdir)/$$f'"; \
+	  $(dist_keymapDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(keymapdir)/$$f"; \
+	done
+
+uninstall-dist_keymapDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_keymap_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(keymapdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(keymapdir)/$$f"; \
+	done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/..
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(keymapdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-dist_dirDATA install-dist_keymapDATA
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-dist_dirDATA uninstall-dist_keymapDATA \
+	uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-recursive ctags ctags-recursive \
+	distclean distclean-generic distclean-recursive distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dist_dirDATA \
+	install-dist_keymapDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_dirDATA \
+	uninstall-dist_keymapDATA uninstall-info-am
+
+
+$(subdir).dir: $(dir_data)
+	-rm -f $@
+	here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*'
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/keymap/README b/xorg-server/xkbdata.src/keymap/README
new file mode 100644
index 000000000..bec7ed4ba
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/README
@@ -0,0 +1,4 @@
+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.
diff --git a/xorg-server/xkbdata.src/keymap/amiga b/xorg-server/xkbdata.src/keymap/amiga
new file mode 100644
index 000000000..d697a986b
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/keymap/ataritt b/xorg-server/xkbdata.src/keymap/ataritt
new file mode 100644
index 000000000..b801ac291
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.am b/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.am
new file mode 100644
index 000000000..b1961e5b1
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.am
@@ -0,0 +1,4 @@
+keymapdir = $(xkb_base)/keymap/digital_vndr
+
+dist_keymap_DATA = \
+us
diff --git a/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in
new file mode 100644
index 000000000..08bf4b750
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in
@@ -0,0 +1,367 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = keymap/digital_vndr
+DIST_COMMON = $(dist_keymap_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(keymapdir)"
+dist_keymapDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_keymap_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+keymapdir = $(xkb_base)/keymap/digital_vndr
+dist_keymap_DATA = \
+us
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  keymap/digital_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  keymap/digital_vndr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_keymapDATA: $(dist_keymap_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(keymapdir)" || $(mkdir_p) "$(DESTDIR)$(keymapdir)"
+	@list='$(dist_keymap_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_keymapDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(keymapdir)/$$f'"; \
+	  $(dist_keymapDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(keymapdir)/$$f"; \
+	done
+
+uninstall-dist_keymapDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_keymap_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(keymapdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(keymapdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(keymapdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_keymapDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_keymapDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_keymapDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_keymapDATA uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/keymap/digital_vndr/us b/xorg-server/xkbdata.src/keymap/digital_vndr/us
new file mode 100644
index 000000000..7f5180e2c
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/lk(lk201)" 		};
+    xkb_types           { include "default"    	        	};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital_vndr/us(vt105)"		};
+    xkb_geometry	{ description = "Digital US LK201";
+			  include "digital_vndr/lk(lk201)"		};
+};
+
+xkb_keymap "lk401" {
+    xkb_keycodes        { include "digital_vndr/lk(lk401)" 		};
+    xkb_types           { include "default"    	        	};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital_vndr/us(vt108)"		};
+    xkb_geometry	{ description = "Digital US LK401";
+			  include "digital_vndr/lk(lk401)"		};
+};
+
+xkb_keymap "lk411" {
+    xkb_keycodes        { include "digital_vndr/pc(lk411)" 		};
+    xkb_types           { include "default"    	        	};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital_vndr/us(vt108)"		};
+    xkb_geometry	{ description = "Digital US LK411";
+			  include "digital_vndr/lk(lk401)"		};
+};
+
+xkb_keymap "lk421" {
+    xkb_keycodes        { include "digital_vndr/lk(lk421)"		};
+    xkb_types           { include "default"    	        	};
+    xkb_compatibility   { include "default"	        	};
+    xkb_symbols         { include "digital_vndr/us(unix)"		};
+    xkb_geometry	{ description = "Digital US LK421";
+			  include "digital_vndr/unix(unix)"		};
+};
+
+xkb_keymap "lk441" {
+    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};
+    xkb_types           { include "default"    	        	};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital_vndr/us(lk44x)"		};
+    xkb_geometry	{ description = "Digital US LK441";
+			  include "digital_vndr/pc(pc101)"
+			  include "digital_vndr/pc(leds_alone)"	};
+};
+
+xkb_keymap "lk443" {
+    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};
+    xkb_types           { include "default"    	        	};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital_vndr/us(lk44x)"		};
+    xkb_geometry	{ description = "Digital US LK443";
+			  include "digital_vndr/pc(pc101)"
+			  include "digital_vndr/pc(leds_alone)"	};
+};
+
+xkb_keymap "lk44x" {
+    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};
+    xkb_types           { include "default"    	        	};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital_vndr/us(lk44x)"		};
+    xkb_geometry	{ description = "Digital US LK443";
+			  include "digital_vndr/pc(pc101)"
+			  include "digital_vndr/pc(leds_alone)"	};
+};
+
+xkb_keymap "lk450" {
+    xkb_keycodes        { include "digital_vndr/pc(lk450)" 		};
+    xkb_types           { include "default"    	        	};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital_vndr/us(vt108)"		};
+    xkb_geometry	{ description = "Digital US LK450";
+			  include "digital_vndr/lk(lk450)"		};
+};
+
+xkb_keymap "pcxalaa" {
+    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
+    xkb_types           { include "default"   	 		};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital_vndr/us(pcxalaa)"		};
+    xkb_geometry	{ description = "Digital US PCXAL-AA";
+			  include "digital_vndr/pc(pc101)"
+			  include "digital_vndr/pc(leds_alone)"	};
+};
+
+xkb_keymap "pcxalfa" {
+    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
+    xkb_types           { include "default"   	 		};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital_vndr/us(pcxalfa)"		};
+    xkb_geometry	{ description = "Digital US PCXAL-FA";
+			  include "digital_vndr/pc(pc101)"
+			  include "digital_vndr/pc(leds_on_keys)"	};
+};
+
+xkb_keymap "pcxalga" {
+    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
+    xkb_types           { include "default"   	 		};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital_vndr/us(pcxalga)"		};
+    xkb_geometry	{ description = "Digital US PCXAL-GA";
+			  include "digital_vndr/pc(pc101)"
+			  include "digital_vndr/pc(leds_alone)"	};
+};
+
+xkb_keymap "pcxalka" {
+    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
+    xkb_types           { include "default"   	 		};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital_vndr/us(pcxalka)"		};
+    xkb_geometry	{ description = "Digital US PCXAL-KA";
+			  include "digital_vndr/pc(pc101)"
+			  include "digital_vndr/pc(leds_alone)"	};
+};
+
+xkb_keymap "pcxal" {
+    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
+    xkb_types           { include "default"   	 		};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital_vndr/us(pcxal)"		};
+    xkb_geometry	{ description = "Digital US PCXAL";
+			  include "digital_vndr/pc(pc101)"
+			  include "digital_vndr/pc(leds_alone)"	};
+};
+
+xkb_keymap "mnk" {
+    xkb_keycodes        { include "digital_vndr/pc(pc104)" 		};
+    xkb_types           { include "default"   	 		};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital_vndr/us(pc104)"		};
+    xkb_geometry	{ include "microsoft"			};
+};
diff --git a/xorg-server/xkbdata.src/keymap/keymap.dir b/xorg-server/xkbdata.src/keymap/keymap.dir
new file mode 100644
index 000000000..6dbb8f1b7
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/keymap.dir
@@ -0,0 +1,362 @@
+-d------ -------- macintosh(macintosh)
+-------- -------- macintosh(macintosh_old)
+-------- -------- sun_vndr/de(type4_de)
+-------- -------- sun_vndr/de(type4_de_nodeadkeys)
+-------- -------- sun_vndr/de(type4_de_openlook)
+-d------ -------- sun_vndr/de(type5_de)
+-------- -------- sun_vndr/de(type5_de_nodeadkeys)
+-------- -------- sun_vndr/de(type5_de_openlook)
+-------- -------- sun_vndr/all(Belgian6)
+-------- -------- sun_vndr/all(Belgian6_usb)
+-------- -------- sun_vndr/all(Canada4)
+-------- -------- sun_vndr/all(Canada_Fr5)
+-------- -------- sun_vndr/all(Canada_Fr5_Hobo)
+-------- -------- sun_vndr/all(Canada_Fr5_TBITS5)
+-------- -------- sun_vndr/all(Canada_Fr_x86)
+-------- -------- sun_vndr/all(Switzer_Fr4)
+-------- -------- sun_vndr/all(Switzer_Fr5)
+-------- -------- sun_vndr/all(Switzer_Fr5_Hobo)
+-------- -------- sun_vndr/all(Switzer_Fr6)
+-------- -------- sun_vndr/all(Switzer_Fr6_usb)
+-------- -------- sun_vndr/all(Switzer_Fr_x86)
+-------- -------- sun_vndr/all(Switzer_Ge4)
+-------- -------- sun_vndr/all(Switzer_Ge5)
+-------- -------- sun_vndr/all(Switzer_Ge5_Hobo)
+-------- -------- sun_vndr/all(Switzer_Ge6)
+-------- -------- sun_vndr/all(Switzer_Ge6_usb)
+-------- -------- sun_vndr/all(Switzer_Ge_x86)
+-------- -------- sun_vndr/all(Czech5)
+-------- -------- sun_vndr/all(Germany4)
+-------- -------- sun_vndr/all(Germany5)
+-------- -------- sun_vndr/all(Germany5_Hobo)
+-------- -------- sun_vndr/all(Germany6)
+-------- -------- sun_vndr/all(Germany6_usb)
+-------- -------- sun_vndr/all(Germany_x86)
+-------- -------- sun_vndr/all(Denmark4)
+-------- -------- sun_vndr/all(Denmark5)
+-------- -------- sun_vndr/all(Denmark5_Hobo)
+-------- -------- sun_vndr/all(Denmark6)
+-------- -------- sun_vndr/all(Denmark6_usb)
+-------- -------- sun_vndr/all(Denmark_x86)
+-------- -------- sun_vndr/all(SpainLatAm4)
+-------- -------- sun_vndr/all(Spain5)
+-------- -------- sun_vndr/all(Spain5_Hobo)
+-------- -------- sun_vndr/all(Spain6)
+-------- -------- sun_vndr/all(Spain6_usb)
+-------- -------- sun_vndr/all(Spain_x86)
+-------- -------- sun_vndr/all(Finnish6)
+-------- -------- sun_vndr/all(Finnish6_usb)
+-------- -------- sun_vndr/all(FranceBelg4)
+-------- -------- sun_vndr/all(France5)
+-------- -------- sun_vndr/all(France5_Hobo)
+-------- -------- sun_vndr/all(France6)
+-------- -------- sun_vndr/all(France6_usb)
+-------- -------- sun_vndr/all(France_x86)
+-------- -------- sun_vndr/all(Greece5)
+-------- -------- sun_vndr/all(Hungary5)
+-------- -------- sun_vndr/all(Italy4)
+-------- -------- sun_vndr/all(Italy5)
+-------- -------- sun_vndr/all(Italy5_Hobo)
+-------- -------- sun_vndr/all(Italy6)
+-------- -------- sun_vndr/all(Italy6_usb)
+-------- -------- sun_vndr/all(Italy_x86)
+-------- -------- sun_vndr/all(Japan4)
+-------- -------- sun_vndr/all(Japan5)
+-------- -------- sun_vndr/all(Japan5_Hobo)
+-------- -------- sun_vndr/all(Japan6)
+-------- -------- sun_vndr/all(Japan6_usb)
+-------- -------- sun_vndr/all(Japan_x86)
+-------- -------- sun_vndr/all(J3100)
+-------- -------- sun_vndr/all(Japan_Muhenkan_x86)
+-------- -------- sun_vndr/all(Korea4)
+-------- -------- sun_vndr/all(Korea5)
+-------- -------- sun_vndr/all(Korea5_Hobo)
+-------- -------- sun_vndr/all(Korea6)
+-------- -------- sun_vndr/all(Korea6_usb)
+-------- -------- sun_vndr/all(Korea_x86)
+-------- -------- sun_vndr/all(Lithuania5)
+-------- -------- sun_vndr/all(Latvia5)
+-------- -------- sun_vndr/all(MS_US101A_x86)
+-------- -------- sun_vndr/all(Netherland4)
+-------- -------- sun_vndr/all(Netherland5)
+-------- -------- sun_vndr/all(Netherland5_Hobo)
+-------- -------- sun_vndr/all(Netherland6)
+-------- -------- sun_vndr/all(Netherland6_usb)
+-------- -------- sun_vndr/all(Netherland_x86)
+-------- -------- sun_vndr/all(Norway4)
+-------- -------- sun_vndr/all(Norway5)
+-------- -------- sun_vndr/all(Norway5_Hobo)
+-------- -------- sun_vndr/all(Norway6)
+-------- -------- sun_vndr/all(Norway6_usb)
+-------- -------- sun_vndr/all(Norway_x86)
+-------- -------- sun_vndr/all(Poland5)
+-------- -------- sun_vndr/all(Portugal4)
+-------- -------- sun_vndr/all(Portugal5)
+-------- -------- sun_vndr/all(Portugal5_Hobo)
+-------- -------- sun_vndr/all(Portugal6)
+-------- -------- sun_vndr/all(Portugal6_usb)
+-------- -------- sun_vndr/all(Portugal_x86)
+-------- -------- sun_vndr/all(Russia5)
+-------- -------- sun_vndr/all(Russia6)
+-------- -------- sun_vndr/all(Russia6_usb)
+-------- -------- sun_vndr/all(SwedenFin4)
+-------- -------- sun_vndr/all(Sweden5)
+-------- -------- sun_vndr/all(Sweden5_Hobo)
+-------- -------- sun_vndr/all(Sweden6)
+-------- -------- sun_vndr/all(Sweden6_usb)
+-------- -------- sun_vndr/all(Sweden_x86)
+-------- -------- sun_vndr/all(Turkey5)
+-------- -------- sun_vndr/all(Turkey6)
+-------- -------- sun_vndr/all(Turkey6_usb)
+-------- -------- sun_vndr/all(TurkeyQ6)
+-------- -------- sun_vndr/all(TurkeyQ6_usb)
+-------- -------- sun_vndr/all(TurkeyF6)
+-------- -------- sun_vndr/all(TurkeyF6_usb)
+-------- -------- sun_vndr/all(Taiwan4)
+-------- -------- sun_vndr/all(Taiwan5)
+-------- -------- sun_vndr/all(Taiwan5_Hobo)
+-------- -------- sun_vndr/all(Taiwan6)
+-------- -------- sun_vndr/all(Taiwan6_usb)
+-------- -------- sun_vndr/all(Taiwan_x86)
+-------- -------- sun_vndr/all(UK4)
+-------- -------- sun_vndr/all(UK5)
+-------- -------- sun_vndr/all(UK5_Hobo)
+-------- -------- sun_vndr/all(UK6)
+-------- -------- sun_vndr/all(UK6_usb)
+-------- -------- sun_vndr/all(UK_x86)
+-------- -------- sun_vndr/all(US101A_PC)
+-------- -------- sun_vndr/all(US101A_Sun)
+-------- -------- sun_vndr/all(US101A_x86)
+-------- -------- sun_vndr/all(US4)
+-------- -------- sun_vndr/all(US5)
+-------- -------- sun_vndr/all(US5_Hobo)
+-------- -------- sun_vndr/all(US_UNIX5)
+-------- -------- sun_vndr/all(US_UNIX5_Hobo)
+-------- -------- sun_vndr/all(US6)
+-------- -------- sun_vndr/all(US6_usb)
+-------- -------- sun_vndr/all(US_UNIX6)
+-------- -------- sun_vndr/all(US_UNIX6_usb)
+-------- -------- sun_vndr/uk(type4_uk)
+-------- -------- sun_vndr/uk(type4_uk_openlook)
+-d------ -------- sun_vndr/uk(type5_uk)
+-------- -------- sun_vndr/uk(type5_uk_openlook)
+-------- -------- sun_vndr/fi(type4_fi)
+-------- -------- sun_vndr/fi(type4_fi_openlook)
+-d------ -------- sun_vndr/fi(type5_fi)
+-------- -------- sun_vndr/fi(type5_fi_openlook)
+-------- -------- sun_vndr/no(type4_no)
+-------- -------- sun_vndr/no(type4_no_openlook)
+-d------ -------- sun_vndr/no(type5_no)
+-------- -------- sun_vndr/no(type5_no_openlook)
+-------- -------- sun_vndr/pl(type4_pl)
+-------- -------- sun_vndr/pl(type4_pl_openlook)
+-d------ -------- sun_vndr/pl(type5_pl)
+-------- -------- sun_vndr/pl(type5_pl_openlook)
+-------- -------- sun_vndr/fr(type4_fr)
+-------- -------- sun_vndr/fr(type4_fr_openlook)
+-d------ -------- sun_vndr/fr(type5_fr)
+-------- -------- sun_vndr/fr(type5_fr_openlook)
+-d------ -------- sun_vndr/se(type5c_se_fixdollar)
+-------- -------- sun_vndr/se(type5c_se)
+-------- -------- sun_vndr/se(type5_se)
+-------- -------- sun_vndr/se(type4_se_fixdollar_swapctl)
+-------- -------- sun_vndr/se(type4_se_fixdollar)
+-------- -------- sun_vndr/se(type4_se)
+-------- -------- sun_vndr/us(type4_us)
+-------- -------- sun_vndr/us(type4_us_openlook)
+-d------ -------- sun_vndr/us(type5_us)
+-------- -------- sun_vndr/us(type5_us_openlook)
+-------- -------- sun_vndr/us(type5_unix)
+-------- -------- sun_vndr/us(type5_unix_openlook)
+-------- -------- sun_vndr/es(type4_es)
+-------- -------- sun_vndr/es(type4_es_openlook)
+-d------ -------- sun_vndr/es(type5_es)
+-------- -------- sun_vndr/es(type5_es_openlook)
+-------- -------- sun_vndr/ru(type4_ru)
+-------- -------- sun_vndr/ru(type4_ru_openlook)
+-d------ -------- sun_vndr/ru(type5_ru)
+-------- -------- sun_vndr/ru(type5_ru_openlook)
+-------- -------- sony(news5000-nwp5461)
+-d------ -------- xfree98(jp)
+-d------ -------- amiga(usa1)
+-------- -------- amiga(de)
+-d------ -------- sgi_vndr/de(indy)
+-------- -------- sgi_vndr/de(indy_nodeadkeys)
+-------- -------- sgi_vndr/de(indigo)
+-------- -------- sgi_vndr/de(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/fi(indy)
+-------- -------- sgi_vndr/fi(indy_nodeadkeys)
+-------- -------- sgi_vndr/fi(indigo)
+-------- -------- sgi_vndr/fi(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/be(indy)
+-------- -------- sgi_vndr/be(indy_nodeadkeys)
+-------- -------- sgi_vndr/be(indigo)
+-------- -------- sgi_vndr/be(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/dk(indy)
+-------- -------- sgi_vndr/dk(indy_nodeadkeys)
+-------- -------- sgi_vndr/dk(indigo)
+-------- -------- sgi_vndr/dk(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/hu(indy)
+-------- -------- sgi_vndr/hu(indy_toggle)
+-------- -------- sgi_vndr/hu(indy_shift_toggle)
+-------- -------- sgi_vndr/hu(indy_ctrl_shift_toggle)
+-------- -------- sgi_vndr/hu(indy_ctrl_alt_toggle)
+-------- -------- sgi_vndr/hu(indy_caps_toggle)
+-------- -------- sgi_vndr/hu(indigo)
+-------- -------- sgi_vndr/hu(indigo_toggle)
+-------- -------- sgi_vndr/hu(indigo_shift_toggle)
+-------- -------- sgi_vndr/hu(indigo_ctrl_shift_toggle)
+-------- -------- sgi_vndr/hu(indigo_ctrl_alt_toggle)
+-------- -------- sgi_vndr/hu(indigo_caps_toggle)
+-d------ -------- sgi_vndr/cz(indy)
+-------- -------- sgi_vndr/cz(indigo)
+-------- -------- sgi_vndr/cz(indy_qwerty)
+-------- -------- sgi_vndr/cz(indigo_qwerty)
+-d------ -------- sgi_vndr/bg(indy)
+-------- -------- sgi_vndr/bg(indigo)
+-d------ -------- sgi_vndr/sk(indy)
+-------- -------- sgi_vndr/sk(indigo)
+-------- -------- sgi_vndr/sk(indy_qwerty)
+-------- -------- sgi_vndr/sk(indigo_qwerty)
+-d------ -------- sgi_vndr/en_US(indy)
+-------- -------- sgi_vndr/en_US(indy_nodeadkeys)
+-------- -------- sgi_vndr/en_US(indy101)
+-------- -------- sgi_vndr/en_US(indy101_nodeadkeys)
+-------- -------- sgi_vndr/en_US(indy104)
+-------- -------- sgi_vndr/en_US(indy104_nodeadkeys)
+-------- -------- sgi_vndr/en_US(indigo)
+-------- -------- sgi_vndr/en_US(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/jp(indy)
+-d------ -------- sgi_vndr/no(indy)
+-------- -------- sgi_vndr/no(indy_nodeadkeys)
+-------- -------- sgi_vndr/no(indigo)
+-------- -------- sgi_vndr/no(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/pl(indy)
+-------- -------- sgi_vndr/pl(indy_nodeadkeys)
+-------- -------- sgi_vndr/pl(indigo)
+-------- -------- sgi_vndr/pl(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/gb(indy)
+-------- -------- sgi_vndr/gb(indy_nodeadkeys)
+-------- -------- sgi_vndr/gb(indigo)
+-------- -------- sgi_vndr/gb(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/ch(de_indy)
+-------- -------- sgi_vndr/ch(de_indy_nodeadkeys)
+-------- -------- sgi_vndr/ch(de_indigo)
+-------- -------- sgi_vndr/ch(de_indigo_nodeadkeys)
+-------- -------- sgi_vndr/ch(fr_indy)
+-------- -------- sgi_vndr/ch(fr_indy_nodeadkeys)
+-------- -------- sgi_vndr/ch(fr_indigo)
+-------- -------- sgi_vndr/ch(fr_indigo_nodeadkeys)
+-d------ -------- sgi_vndr/pt(indy)
+-------- -------- sgi_vndr/pt(indy_nodeadkeys)
+-------- -------- sgi_vndr/pt(indigo)
+-------- -------- sgi_vndr/pt(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/ca(indy)
+-------- -------- sgi_vndr/ca(indy_nodeadkeys)
+-------- -------- sgi_vndr/ca(indigo)
+-------- -------- sgi_vndr/ca(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/fr(indy)
+-------- -------- sgi_vndr/fr(indy_nodeadkeys)
+-------- -------- sgi_vndr/fr(indigo)
+-------- -------- sgi_vndr/fr(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/se(indy)
+-------- -------- sgi_vndr/se(indy_nodeadkeys)
+-------- -------- sgi_vndr/se(indigo)
+-------- -------- sgi_vndr/se(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/us(indy)
+-------- -------- sgi_vndr/us(indy101_euro)
+-------- -------- sgi_vndr/us(indy_compose)
+-------- -------- sgi_vndr/us(indigo)
+-------- -------- sgi_vndr/us(indigo_compose)
+-------- -------- sgi_vndr/us(indigo101_compose)
+-d------ -------- sgi_vndr/dvorak(indy)
+-------- -------- sgi_vndr/dvorak(indigo)
+-d------ -------- sgi_vndr/es(indy)
+-------- -------- sgi_vndr/es(indy_nodeadkeys)
+-------- -------- sgi_vndr/es(indigo)
+-------- -------- sgi_vndr/es(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/it(indy)
+-------- -------- sgi_vndr/it(indy_nodeadkeys)
+-------- -------- sgi_vndr/it(indigo)
+-------- -------- sgi_vndr/it(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/th(indy)
+-------- -------- sgi_vndr/th(indigo)
+-d------ -------- sgi_vndr/ru(indy)
+-------- -------- sgi_vndr/ru(indy_toggle)
+-------- -------- sgi_vndr/ru(indy_shift_toggle)
+-------- -------- sgi_vndr/ru(indy_ctrl_shift_toggle)
+-------- -------- sgi_vndr/ru(indy_ctrl_alt_toggle)
+-------- -------- sgi_vndr/ru(indy_caps_toggle)
+-------- -------- sgi_vndr/ru(indigo)
+-------- -------- sgi_vndr/ru(indigo_toggle)
+-------- -------- sgi_vndr/ru(indigo_shift_toggle)
+-------- -------- sgi_vndr/ru(indigo_ctrl_shift_toggle)
+-------- -------- sgi_vndr/ru(indigo_ctrl_alt_toggle)
+-------- -------- sgi_vndr/ru(indigo_caps_toggle)
+-------- -------- digital_vndr/us(lk201)
+-------- -------- digital_vndr/us(lk401)
+-------- -------- digital_vndr/us(lk411)
+-------- -------- digital_vndr/us(lk421)
+-------- -------- digital_vndr/us(lk441)
+-------- -------- digital_vndr/us(lk443)
+-------- -------- digital_vndr/us(lk44x)
+-------- -------- digital_vndr/us(lk450)
+-------- -------- digital_vndr/us(pcxalaa)
+-------- -------- digital_vndr/us(pcxalfa)
+-------- -------- digital_vndr/us(pcxalga)
+-------- -------- digital_vndr/us(pcxalka)
+-------- -------- digital_vndr/us(pcxal)
+-------- -------- digital_vndr/us(mnk)
+-d------ -------- ataritt(us)
+-------- -------- ataritt(de)
+-d------ -------- xfree86(us)
+-------- -------- xfree86(ar)
+-------- -------- xfree86(be)
+-------- -------- xfree86(bg)
+-------- -------- xfree86(br)
+-------- -------- xfree86(cz)
+-------- -------- xfree86(de)
+-------- -------- xfree86(ch_de)
+-------- -------- xfree86(ch_fr)
+-------- -------- xfree86(dk)
+-------- -------- xfree86(dvorak)
+-------- -------- xfree86(en_US)
+-------- -------- xfree86(es)
+-------- -------- xfree86(fr)
+-------- -------- xfree86(fr-latin9)
+-------- -------- xfree86(fr_CA)
+-------- -------- xfree86(gb)
+-------- -------- xfree86(hr)
+-------- -------- xfree86(it)
+-------- -------- xfree86(jp106)
+-------- -------- xfree86(lt)
+-------- -------- xfree86(lt_std)
+-------- -------- xfree86(lv)
+-------- -------- xfree86(mk)
+-------- -------- xfree86(mt)
+-------- -------- xfree86(no)
+-------- -------- xfree86(pl)
+-------- -------- xfree86(pt)
+-------- -------- xfree86(ro)
+-------- -------- xfree86(ro_microsoft)
+-------- -------- xfree86(ru)
+-------- -------- xfree86(se_FI)
+-------- -------- xfree86(se_SE)
+-------- -------- xfree86(sl)
+-------- -------- xfree86(sl_SI)
+-------- -------- xfree86(sk)
+-------- -------- xfree86(syr)
+-------- -------- xfree86(th)
+-------- -------- xfree86(th_tis)
+-------- -------- xfree86(th_pat)
+-------- -------- xfree86(tr)
+-------- -------- xfree86(uk)
+-------- -------- xfree86(us_flexpro)
+-------- -------- xfree86(us_intl)
+-------- -------- xfree86(us_microsoft)
+-------- -------- xfree86(uz)
+-------- -------- xfree86(cz_qwerty)
+-------- -------- xfree86(de_CH)
+-------- -------- xfree86(fr_CH)
+-------- -------- xfree86(mt_us)
+-------- -------- xfree86(sk_qwerty)
diff --git a/xorg-server/xkbdata.src/keymap/macintosh b/xorg-server/xkbdata.src/keymap/macintosh
new file mode 100644
index 000000000..de115badc
--- /dev/null
+++ b/xorg-server/xkbdata.src/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 "macintosh"				};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols		{ include "macintosh_vndr/us(extended)"		};
+    xkb_geometry	{ include "macintosh"				};
+};
+
+xkb_keymap "macintosh_old" {
+    xkb_keycodes	{ include "macintosh(old)"				};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols		{ include "macintosh_vndr/us(extended)"		};
+    xkb_geometry	{ include "macintosh"				};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.am b/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.am
new file mode 100644
index 000000000..234a336db
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.am
@@ -0,0 +1,12 @@
+keymapdir = $(xkb_base)/keymap/sgi_vndr
+
+dist_keymap_DATA = \
+be bg ca \
+ch cz de \
+dk dvorak \
+es fi \
+fr gb \
+hu it jp \
+no pl pt \
+ru se sk \
+th us
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in
new file mode 100644
index 000000000..a1fac16bd
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in
@@ -0,0 +1,375 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = keymap/sgi_vndr
+DIST_COMMON = $(dist_keymap_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(keymapdir)"
+dist_keymapDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_keymap_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+keymapdir = $(xkb_base)/keymap/sgi_vndr
+dist_keymap_DATA = \
+be bg ca \
+ch cz de \
+dk dvorak \
+es fi \
+fr gb \
+hu it jp \
+no pl pt \
+ru se sk \
+th us
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  keymap/sgi_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  keymap/sgi_vndr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_keymapDATA: $(dist_keymap_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(keymapdir)" || $(mkdir_p) "$(DESTDIR)$(keymapdir)"
+	@list='$(dist_keymap_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_keymapDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(keymapdir)/$$f'"; \
+	  $(dist_keymapDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(keymapdir)/$$f"; \
+	done
+
+uninstall-dist_keymapDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_keymap_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(keymapdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(keymapdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(keymapdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_keymapDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_keymapDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_keymapDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_keymapDATA uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/be b/xorg-server/xkbdata.src/keymap/sgi_vndr/be
new file mode 100644
index 000000000..9905f0ba6
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+be"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc_universal_nodeadkeys)+be(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+be"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc102_nodeadkeys)+be(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/bg b/xorg-server/xkbdata.src/keymap/sgi_vndr/bg
new file mode 100644
index 000000000..a3cb08a22
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols  { 
+	include "us(pc_universal)+bg+group(shifts_toggle)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols { 
+	include "us(pc102)+bg+group(shifts_toggle)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/ca b/xorg-server/xkbdata.src/keymap/sgi_vndr/ca
new file mode 100644
index 000000000..38f489657
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+ca"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc_universal_nodeadkeys)+ca(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+ca"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc102_nodeadkeys)+ca(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/ch b/xorg-server/xkbdata.src/keymap/sgi_vndr/ch
new file mode 100644
index 000000000..6970a3679
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/sgi_vndr/ch
@@ -0,0 +1,67 @@
+// $Xorg: de_CH,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+default xkb_keymap "de_indy" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+ch(de)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "de_indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc_universal_nodeadkeys)+ch(de_nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
+};
+xkb_keymap "de_indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+ch(de)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+xkb_keymap "de_indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc102_nodeadkeys)+ch(dr_nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+
+default xkb_keymap "fr_indy" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+ch(fr)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "fr_indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc_universal_nodeadkeys)+ch(fr_nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
+};
+xkb_keymap "fr_indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+ch(fr)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+xkb_keymap "fr_indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc102_nodeadkeys)+ch(fr_nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/cz b/xorg-server/xkbdata.src/keymap/sgi_vndr/cz
new file mode 100644
index 000000000..6673b615b
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/sgi_vndr/cz
@@ -0,0 +1,33 @@
+// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+//
+
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc_universal)+cz"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc102)+cz"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
+};
+
+default xkb_keymap "indy_qwerty" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc_universal)+cz(qwerty)"  };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indigo_qwerty" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc102)+cz(qwerty)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
+};
+
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/de b/xorg-server/xkbdata.src/keymap/sgi_vndr/de
new file mode 100644
index 000000000..1ad7fe7b0
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"			};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols 	{ include "en_US(pc_universal)+de"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ 
+	include "en_US(pc_universal_nodeadkeys)+de(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc102)+de"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols {
+	include "en_US(pc102_nodeadkeys)+de(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
+};
+
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/dk b/xorg-server/xkbdata.src/keymap/sgi_vndr/dk
new file mode 100644
index 000000000..832f01da7
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"			};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols 	{ include "en_US(pc_universal)+dk"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ 
+	include "en_US(pc_universal_nodeadkeys)+dk(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc102)+dk"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ 
+	include "en_US(pc102_nodeadkeys)+dk(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
+};
+
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/dvorak b/xorg-server/xkbdata.src/keymap/sgi_vndr/dvorak
new file mode 100644
index 000000000..bd594b0eb
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc_universal)+dvorak"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc101)+dvorak"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/es b/xorg-server/xkbdata.src/keymap/sgi_vndr/es
new file mode 100644
index 000000000..f1aad9a7a
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+es"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc_universal_nodeadkeys)+es(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+es"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc102_nodeadkeys)+es(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/fi b/xorg-server/xkbdata.src/keymap/sgi_vndr/fi
new file mode 100644
index 000000000..67af07eb7
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+fi"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc_universal_nodeadkeys)+fi(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+fi"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc102_nodeadkeys)+fi(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/fr b/xorg-server/xkbdata.src/keymap/sgi_vndr/fr
new file mode 100644
index 000000000..b6aea29de
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+fr"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols  { 
+	include "en_US(pc_universal_nodeadkeys)+fr(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+fr"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc102_nodeadkeys)+fr(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/gb b/xorg-server/xkbdata.src/keymap/sgi_vndr/gb
new file mode 100644
index 000000000..6fa6d6515
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+gb"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc_universal_nodeadkeys)+gb(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+gb"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc102_nodeadkeys)+gb(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/hu b/xorg-server/xkbdata.src/keymap/sgi_vndr/hu
new file mode 100644
index 000000000..3c256846e
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"			};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols 	{ include "en_US(pc_universal)+hu(basic)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
+};
+xkb_keymap "indy_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/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_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_shift_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc_universal)+hu(basic)+group(shifts_toggle)" 
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_ctrl_shift_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/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_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_ctrl_alt_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/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_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_caps_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/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_vndr/indy(pc102)"		};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc102)+hu(basic)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
+};
+xkb_keymap "indigo_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc102)+hu(basic)+group(toggle)" 
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
+};
+xkb_keymap "indigo_shift_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc102)+hu(basic)+group(shifts_toggle)" 
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
+};
+xkb_keymap "indigo_ctrl_shift_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/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_vndr/indigo(pc102)"		};
+};
+xkb_keymap "indigo_ctrl_alt_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/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_vndr/indigo(pc102)"		};
+};
+xkb_keymap "indigo_caps_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/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_vndr/indigo(pc102)"		};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/it b/xorg-server/xkbdata.src/keymap/sgi_vndr/it
new file mode 100644
index 000000000..ed92227b7
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+it"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc_universal_nodeadkeys)+it(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+it"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc102_nodeadkeys)+it(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/jp b/xorg-server/xkbdata.src/keymap/sgi_vndr/jp
new file mode 100644
index 000000000..74ed4243c
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(jp106)"			};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols 	{ include "us(pc101)+sgi_vndr/jp"			};
+    xkb_geometry	{ include "sgi_vndr/indy(jp106)"			};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/no b/xorg-server/xkbdata.src/keymap/sgi_vndr/no
new file mode 100644
index 000000000..fd32c72c0
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+no"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc_universal_nodeadkeys)+no(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+no"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc102_nodeadkeys)+no(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/pl b/xorg-server/xkbdata.src/keymap/sgi_vndr/pl
new file mode 100644
index 000000000..3641a31ad
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc_universal)+pl"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols 	{ include "us(pc_universal)+pl(nodeadkeys)" 	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc102)+pl"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc102)+pl(nodeadkeys)" };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/pt b/xorg-server/xkbdata.src/keymap/sgi_vndr/pt
new file mode 100644
index 000000000..3ec03471a
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+pt"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc_universal_nodeadkeys)+pt(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+pt"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc102_nodeadkeys)+pt(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/ru b/xorg-server/xkbdata.src/keymap/sgi_vndr/ru
new file mode 100644
index 000000000..fc514d87c
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"			};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols 	{ include "en_US(pc_universal)+ru(basic)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
+};
+xkb_keymap "indy_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/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_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_shift_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc_universal)+ru(basic)+group(shifts_toggle)" 
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_ctrl_shift_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/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_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_ctrl_alt_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/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_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_caps_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/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_vndr/indy(pc102)"		};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc102)+ru(basic)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
+};
+xkb_keymap "indigo_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc102)+ru(basic)+group(toggle)" 
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
+};
+xkb_keymap "indigo_shift_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc102)+ru(basic)+group(shifts_toggle)" 
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
+};
+xkb_keymap "indigo_ctrl_shift_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/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_vndr/indigo(pc102)"		};
+};
+xkb_keymap "indigo_ctrl_alt_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/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_vndr/indigo(pc102)"		};
+};
+xkb_keymap "indigo_caps_toggle" {
+    xkb_keycodes	{ include "sgi_vndr/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_vndr/indigo(pc102)"		};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/se b/xorg-server/xkbdata.src/keymap/sgi_vndr/se
new file mode 100644
index 000000000..910a8cc89
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+se"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc_universal_nodeadkeys)+se(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+se"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc102_nodeadkeys)+se(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
+
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/sk b/xorg-server/xkbdata.src/keymap/sgi_vndr/sk
new file mode 100644
index 000000000..09b6a2956
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/sgi_vndr/sk
@@ -0,0 +1,33 @@
+// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+//
+
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc_universal)+sk"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc102)+sk"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
+};
+
+default xkb_keymap "indy_qwerty" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc_universal)+sk(qwerty)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
+};
+xkb_keymap "indigo_qwerty" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc102)+sk(qwerty)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
+};
+
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/th b/xorg-server/xkbdata.src/keymap/sgi_vndr/th
new file mode 100644
index 000000000..aa03c8c11
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc_universal)+th+group(shifts_toggle)"
+    };
+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+th+group(shifts_toggle)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/us b/xorg-server/xkbdata.src/keymap/sgi_vndr/us
new file mode 100644
index 000000000..5850145ca
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc_universal)"		};
+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};
+};
+xkb_keymap "indy101_euro" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc_universal)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};
+};
+xkb_keymap "indy_compose" {
+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc_universal)"	};
+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc101)"		};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
+};
+xkb_keymap "indigo_compose" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc101compose)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
+};
+xkb_keymap "indigo101_compose" {
+    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc101euro)"	};
+    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sony b/xorg-server/xkbdata.src/keymap/sony
new file mode 100644
index 000000000..c4be3b1b8
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/us(nwp5461)"	};
+    xkb_geometry	{ include "sony(nwp5461)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.am b/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.am
new file mode 100644
index 000000000..551162d3e
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.am
@@ -0,0 +1,7 @@
+keymapdir = $(xkb_base)/keymap/sun_vndr
+
+dist_keymap_DATA = \
+all de es fi \
+fr no pl \
+ru se uk \
+us
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in b/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in
new file mode 100644
index 000000000..4de9e71eb
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in
@@ -0,0 +1,370 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = keymap/sun_vndr
+DIST_COMMON = $(dist_keymap_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(keymapdir)"
+dist_keymapDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_keymap_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+keymapdir = $(xkb_base)/keymap/sun_vndr
+dist_keymap_DATA = \
+all de es fi \
+fr no pl \
+ru se uk \
+us
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  keymap/sun_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  keymap/sun_vndr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_keymapDATA: $(dist_keymap_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(keymapdir)" || $(mkdir_p) "$(DESTDIR)$(keymapdir)"
+	@list='$(dist_keymap_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_keymapDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(keymapdir)/$$f'"; \
+	  $(dist_keymapDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(keymapdir)/$$f"; \
+	done
+
+uninstall-dist_keymapDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_keymap_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(keymapdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(keymapdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(keymapdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_keymapDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_keymapDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_keymapDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_keymapDATA uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/all b/xorg-server/xkbdata.src/keymap/sun_vndr/all
new file mode 100644
index 000000000..047ae7bc4
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/sun_vndr/all
@@ -0,0 +1,1092 @@
+//  x86 KEYBOARDS
+// 
+//  Generally, x86 keyboards fall into either pc101 (101-key) or pc102
+//  (102-key European) categories.  Symbol tables are typically formed by
+//  augmenting sun/us(pc101) or sun/us(pc102) with the "extra" symbols
+//  from the type5 definition.  Geometries and keycodes for many of
+//  these fall under sun(x86) or sun(x86tuv).
+// 
+//  USB KEYBOARDS
+//  
+//  Only the keycodes (scancodes) change in the Universal Serial Bus
+//  keyboard definitions.  Symbols are kept the same as in the type5
+//  case.  The USB HID spec is confusing on this point, but the
+//  scancodes described in it relate to physical keys, not symbols, as
+//  it might lead one to believe.
+//
+//  HOBO KEYBOARDS
+//
+//  Hobo keyboards are derived from type5 keyboards, which in turn,
+//  are all derived from the type5 US keyboard.  Use the
+//  appropriate set of keycodes and geometry (either type5hobo or
+//  type5tuvhobo) and select the symbol set sun/us(type5hobo) to
+//  replace sun/us(type5).  For example, Sweden5_Hobo:
+// 
+// xkb_keymap "Sweden5_Hobo" {
+//     xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+//     xkb_types		{ include "default"		};
+//     xkb_compatibility	{ include "default"		};
+//     xkb_symbols		{ include "sun/us(type5hobo)+sun/se(type5)"};
+//     xkb_geometry	{ include "sun(type5tuvhobo)"	};
+// };
+// 
+//  Doing it this way allows all the symbol changes for a particular
+//  type5 keyboard to hold for a Hobo keyboard; both keyboards, in
+//  this case, would use sun/se(type5) to augment the symbols in the
+//  US keboard definition.
+
+xkb_keymap "Belgian6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+be"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Belgian6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+be"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Canada4" {
+    xkb_keycodes	{ include "sun(type4_ca)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/ca(type4)"	};
+    xkb_geometry	{ include "sun(type4_ca)"	};
+};
+
+xkb_keymap "Canada_Fr5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/ca(type5)"};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Canada_Fr5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/ca(type5)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Canada_Fr5_TBITS5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/ca(type5tbits5)"};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Canada_Fr_x86" {
+    xkb_keycodes	{ include "sun(x86ca)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc101)+sun/ca(x86)"};
+    xkb_geometry	{ include "sun(x86ca)"		};
+};
+
+xkb_keymap "Switzer_Fr4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/sw(type4fr)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Switzer_Fr5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Switzer_Fr5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/sw(type5fr)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Switzer_Fr6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Switzer_Fr6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Switzer_Fr_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/sw(type5fr)"};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Switzer_Ge4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/sw(type4de)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Switzer_Ge5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Switzer_Ge5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/sw(type5de)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Switzer_Ge6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Switzer_Ge6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Switzer_Ge_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/sw(type5de)"};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Czech5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/cz(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+
+xkb_keymap "Germany4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/de(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Germany5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+de"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Germany5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+de"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Germany6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+de"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Germany6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+de"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Germany_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+de"};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Denmark4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/dk(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Denmark5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Denmark5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/dk(type5)"	};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Denmark6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Denmark6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Denmark_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/dk(type5)"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "SpainLatAm4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/es(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Spain5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Spain5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/es(type5)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Spain6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Spain6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Spain_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/es(type5)"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+
+xkb_keymap "Finnish6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/fi"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Finnish6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/fi"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+
+xkb_keymap "FranceBelg4" {
+    xkb_keycodes	{ include "sun(type4tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/fr(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "France5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)" };
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "France5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/fr(type5)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "France6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "France6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "France_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/fr(type5)"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Greece5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/gr(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+
+xkb_keymap "Hungary5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5basic)+sun/hu(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+
+xkb_keymap "Italy4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/it(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Italy5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Italy5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/it(type5)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Italy6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Italy6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Italy_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/it(type5)"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Japan4" {
+    xkb_keycodes	{ include "sun(type4_jp)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/jp(type4)"	};
+    xkb_geometry	{ include "sun(type4jp)"	};
+};
+
+xkb_keymap "Japan5" {
+    xkb_keycodes	{ include "sun(type5_jp)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/jp(type5)"	};
+    xkb_geometry	{ include "sun(type5jp)"	};
+};
+
+xkb_keymap "Japan5_Hobo" {
+    xkb_keycodes	{ include "sun(type5_jphobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/jp(type5hobo)"	};
+    xkb_geometry	{ include "sun(type5jphobo)"	};
+};
+
+xkb_keymap "Japan6" {
+    xkb_keycodes	{ include "sun(type6_jp)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default+japan(kana_lock)"	};
+    xkb_symbols		{ include "sun/jp(type6)"	};
+    xkb_geometry	{ include "sun(type6jp)"	};
+};
+
+xkb_keymap "Japan6_usb" {
+    xkb_keycodes	{ include "sun(type6_jp_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default+japan(kana_lock)"	};
+    xkb_symbols		{ include "sun/jp(type6)"	};
+    xkb_geometry	{ include "sun(type6jp)"	};
+};
+
+xkb_keymap "Japan_x86" {
+    xkb_keycodes	{ include "sun(x86jp)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/jp(x86)"		};
+    xkb_geometry	{ include "sun(x86jp)"		};
+};
+
+xkb_keymap "J3100" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/jp(J3100)"		};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Japan_Muhenkan_x86" {
+    xkb_keycodes	{ include "sun(x86jp)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/jp(Muhenkan_x86)"		};
+    xkb_geometry	{ include "sun(x86jp)"		};
+};
+
+xkb_keymap "Korea4" {
+    xkb_keycodes	{ include "sun(type4)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/ko(type4)"	};
+    xkb_geometry	{ include "sun(type4)"		};
+};
+
+xkb_keymap "Korea5" {
+    xkb_keycodes	{ include "sun(type5)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};
+    xkb_geometry	{ include "sun(type5)"		};
+};
+
+xkb_keymap "Korea5_Hobo" {
+    xkb_keycodes	{ include "sun(type5hobo)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/ko(type5)"};
+    xkb_geometry	{ include "sun(type5hobo)"		};
+};
+
+xkb_keymap "Korea6" {
+    xkb_keycodes	{ include "sun(type6)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};
+    xkb_geometry	{ include "sun(type6)"		};
+};
+
+xkb_keymap "Korea6_usb" {
+    xkb_keycodes	{ include "sun(type6_usb)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};
+    xkb_geometry	{ include "sun(type6)"		};
+};
+
+xkb_keymap "Korea_x86" {
+    xkb_keycodes	{ include "sun(x86ko)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc101)+sun/ko(type5)"	};
+    xkb_geometry	{ include "sun(x86ko)"		};
+};
+
+xkb_keymap "Lithuania5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5basic)+sun/lt(type5)" };
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+
+xkb_keymap "Latvia5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5basic)+sun/lv(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "MS_US101A_x86" {
+    xkb_keycodes	{ include "sun(MS_x86)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc104)"		};
+    xkb_geometry	{ include "sun(MS_x86)"		};
+};
+
+xkb_keymap "Netherland4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/nl(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Netherland5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+nl"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Netherland5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+nl"	};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Netherland6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+nl"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Netherland6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+nl"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Netherland_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+nl"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Norway4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/no(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Norway5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Norway5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/no(type5)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Norway6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Norway6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Norway_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/no(type5)"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Poland5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/pl"		};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Portugal4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/pt(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Portugal5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Portugal5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/pt(type5)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Portugal6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Portugal6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Portugal_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/pt(type5)"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+// xkb_keymap "Russia4" {
+//     xkb_keycodes	{ include "sun(type4)"		};
+//     xkb_types		{ include "default"		};
+//     xkb_compatibility	{ include "default"		};
+//     xkb_symbols		{ include "sun/ru"		};
+//     xkb_geometry	{ include "sun(type4)"		};
+// };
+
+xkb_keymap "Russia5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/ru"};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Russia6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/ru"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Russia6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/ru"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "SwedenFin4" {
+    xkb_keycodes	{ include "sun(type4tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/se(type4)"	};
+    xkb_geometry	{ include "sun(type4tuv)"	};
+};
+
+xkb_keymap "Sweden5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Sweden5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/se(type5)"};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "Sweden6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Sweden6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Sweden_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+sun/se(type5)"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "Turkey5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tr"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "Turkey6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tr"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "Turkey6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tr"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "TurkeyQ6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6Q)"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "TurkeyQ6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6Q)"};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "TurkeyF6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6F)"};
+    xkb_geometry	{ include "sun(type6)"	};
+};
+
+xkb_keymap "TurkeyF6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6F)"};
+    xkb_geometry	{ include "sun(type6)"	};
+};
+
+xkb_keymap "Taiwan4" {
+    xkb_keycodes	{ include "sun(type4)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/tw(type4)"	};
+    xkb_geometry	{ include "sun(type4)"	};
+};
+
+xkb_keymap "Taiwan5" {
+    xkb_keycodes	{ include "sun(type5)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};
+    xkb_geometry	{ include "sun(type5)"	};
+};
+
+xkb_keymap "Taiwan5_Hobo" {
+    xkb_keycodes	{ include "sun(type5hobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/tw(type5)"	};
+    xkb_geometry	{ include "sun(type5hobo)"	};
+};
+
+xkb_keymap "Taiwan6" {
+    xkb_keycodes	{ include "sun(type6)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};
+    xkb_geometry	{ include "sun(type6)"	};
+};
+
+xkb_keymap "Taiwan6_usb" {
+    xkb_keycodes	{ include "sun(type6_usb)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};
+    xkb_geometry	{ include "sun(type6)"	};
+};
+
+xkb_keymap "Taiwan_x86" {
+    xkb_keycodes	{ include "sun(x86)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "us(pc101)"	};
+    xkb_geometry	{ include "sun(x86)"		};
+};
+
+xkb_keymap "UK4" {
+    xkb_keycodes	{ include "sun(type4)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/gb(type4)"	};
+    xkb_geometry	{ include "sun(type4)"		};
+};
+
+xkb_keymap "UK5" {
+    xkb_keycodes	{ include "sun(type5tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5)+sun/gb(type5)"	};
+    xkb_geometry	{ include "sun(type5tuv)"	};
+};
+
+xkb_keymap "UK5_Hobo" {
+    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type5hobo)+sun/gb(type5)"	};
+    xkb_geometry	{ include "sun(type5tuvhobo)"	};
+};
+
+xkb_keymap "UK6" {
+    xkb_keycodes	{ include "sun(type6tuv)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type6)+sun/gb(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "UK6_usb" {
+    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(type6)+sun/gb(type5)"	};
+    xkb_geometry	{ include "sun(type6tuv)"	};
+};
+
+xkb_keymap "UK_x86" {
+    xkb_keycodes	{ include "sun(x86tuv)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc102)+gb"	};
+    xkb_geometry	{ include "sun(x86tuv)"		};
+};
+
+xkb_keymap "US101A_PC" {
+    xkb_keycodes	{ include "sun(type5x86)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc101)+sun/us(pc101currency)"};
+    xkb_geometry	{ include "sun(x86)"		};
+};
+
+xkb_keymap "US101A_Sun" {
+    xkb_keycodes	{ include "sun(type5x86)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sun/us(pc101)+sun/us(US101A_Sun)"	};
+    xkb_geometry	{ include "sun(x86)"		};
+};
+
+xkb_keymap "US101A_x86" {
+    xkb_keycodes	{ include "sun(x86)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "us(pc101)"		};
+    xkb_geometry	{ include "sun(x86)"		};
+};
+
+xkb_keymap "US4" {
+    xkb_keycodes	{ include "sun(type4)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type4)"	};
+    xkb_geometry	{ include "sun(type4)"		};
+};
+
+xkb_keymap "US5" {
+    xkb_keycodes	{ include "sun(type5)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type5)"	};
+    xkb_geometry	{ include "sun(type5)"		};
+};
+
+xkb_keymap "US5_Hobo" {
+    xkb_keycodes	{ include "sun(type5hobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type5hobo)"	};
+    xkb_geometry	{ include "sun(type5hobo)"	};
+};
+
+xkb_keymap "US_UNIX5" {
+    xkb_keycodes	{ include "sun(type5)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type5)"	};
+    xkb_geometry	{ include "sun(type5unix)"	};
+};
+
+xkb_keymap "US_UNIX5_Hobo" {
+    // Same as US5_Hobo
+    xkb_keycodes	{ include "sun(type5hobo)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type5hobo)"	};
+    xkb_geometry	{ include "sun(type5hobo)"	};
+};
+
+xkb_keymap "US6" {
+    xkb_keycodes	{ include "sun(type6)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type6)"	};
+    xkb_geometry	{ include "sun(type6)"		};
+};
+
+xkb_keymap "US6_usb" {
+    xkb_keycodes	{ include "sun(type6_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type6)"	};
+    xkb_geometry	{ include "sun(type6)"		};
+};
+
+xkb_keymap "US_UNIX6" {
+    xkb_keycodes	{ include "sun(type6)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type6)"	};
+    xkb_geometry	{ include "sun(type6unix)"	};
+};
+
+xkb_keymap "US_UNIX6_usb" {
+    xkb_keycodes	{ include "sun(type6_usb)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(type6)"	};
+    xkb_geometry	{ include "sun(type6unix)"	};
+};
+
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/de b/xorg-server/xkbdata.src/keymap/sun_vndr/de
new file mode 100644
index 000000000..4c1ded3fc
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/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_vndr/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_vndr/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_vndr/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_vndr/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_vndr/us(sun5ol)+iso9995-3+de"	};
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/es b/xorg-server/xkbdata.src/keymap/sun_vndr/es
new file mode 100644
index 000000000..2de81c011
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/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_vndr/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_vndr/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_vndr/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_vndr/us(sun5ol)+iso9995-3+es"	};
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/fi b/xorg-server/xkbdata.src/keymap/sun_vndr/fi
new file mode 100644
index 000000000..296ef66c4
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/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_vndr/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_vndr/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_vndr/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_vndr/us(sun5ol)+iso9995-3+fi"	};
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/fr b/xorg-server/xkbdata.src/keymap/sun_vndr/fr
new file mode 100644
index 000000000..9301ce031
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/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_vndr/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_vndr/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_vndr/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_vndr/us(sun5ol)+iso9995-3+fr"	};
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/no b/xorg-server/xkbdata.src/keymap/sun_vndr/no
new file mode 100644
index 000000000..45669237e
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/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_vndr/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_vndr/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_vndr/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_vndr/us(sun5ol)+iso9995-3+no"	};
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/pl b/xorg-server/xkbdata.src/keymap/sun_vndr/pl
new file mode 100644
index 000000000..904ffb2d7
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/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_vndr/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_vndr/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_vndr/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_vndr/us(sun5ol)+iso9995-3+pl"	};
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/ru b/xorg-server/xkbdata.src/keymap/sun_vndr/ru
new file mode 100644
index 000000000..fc7d75b1e
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/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_vndr/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_vndr/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_vndr/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_vndr/us(sun5ol)+iso9995-3+ru"	};
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/se b/xorg-server/xkbdata.src/keymap/sun_vndr/se
new file mode 100644
index 000000000..fad7009e4
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/sun_vndr/se
@@ -0,0 +1,56 @@
+// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/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_vndr/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_vndr/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_vndr/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_vndr/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_vndr/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_vndr/se(sun4)"
+    };
+    xkb_geometry	{ include "sun(type4_se)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/uk b/xorg-server/xkbdata.src/keymap/sun_vndr/uk
new file mode 100644
index 000000000..e1fb4970b
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/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_vndr/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_vndr/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_vndr/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_vndr/us(sun5ol)+iso9995-3+uk"	};
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/us b/xorg-server/xkbdata.src/keymap/sun_vndr/us
new file mode 100644
index 000000000..397482f84
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/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_vndr/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_vndr/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_vndr/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_vndr/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_vndr/us(sun5ol)"	};
+    xkb_geometry	{ include "sun(type5unix)"	};
+};
diff --git a/xorg-server/xkbdata.src/keymap/xfree86 b/xorg-server/xkbdata.src/keymap/xfree86
new file mode 100644
index 000000000..aa70c9792
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/xfree86
@@ -0,0 +1,377 @@
+// $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 "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 "ch_de"	{
+    xkb_keycodes	{ include "xfree86"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+ch(de)"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "ch_fr"	{
+    xkb_keycodes	{ include "xfree86"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+ch(fr)"	};
+    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 "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 "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"			};
+};
+// 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)"		};
+};
+
+# svu: compatibility keymaps, based on variants
+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_CH"	{
+    xkb_keycodes	{ include "xfree86"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+ch(de)"	};
+    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)+ch(fr)"	};
+    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 "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"			};
+};
diff --git a/xorg-server/xkbdata.src/keymap/xfree98 b/xorg-server/xkbdata.src/keymap/xfree98
new file mode 100644
index 000000000..b344eedbc
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/jp(pc98)"	};
+    xkb_geometry	{ include "nec(pc98)"		};
+};
diff --git a/xorg-server/xkbdata.src/missing b/xorg-server/xkbdata.src/missing
new file mode 100644
index 000000000..894e786e1
--- /dev/null
+++ b/xorg-server/xkbdata.src/missing
@@ -0,0 +1,360 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2005-06-08.21
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+#   Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case "$1" in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
+  ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+  lex|yacc)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
+    fi
+    ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+  aclocal*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case "$f" in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison|yacc)
+    echo 1>&2 "\
+WARNING: \`$1' $msg.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f y.tab.h ]; then
+	echo >y.tab.h
+    fi
+    if [ ! -f y.tab.c ]; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f lex.yy.c ]; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
+  makeinfo)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
+    touch $file
+    ;;
+
+  tar)
+    shift
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case "$firstarg" in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case "$firstarg" in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/xorg-server/xkbdata.src/po/ChangeLog b/xorg-server/xkbdata.src/po/ChangeLog
new file mode 100644
index 000000000..da39e3df6
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/ChangeLog
@@ -0,0 +1,260 @@
+2008-09-30  svu
+
+	* *.po: sync with TP
+
+2008-05-27  svu
+
+	* *.po: sync with TP
+
+2008-01-29  svu
+
+	* *.po: sync with TP
+
+2007-10-02  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.in.in: New file, from gettext-0.16.1.
+
+2007-09-25  svu
+
+	* *.po: sync with TP
+
+2007-09-11  Maxim V. Dziumanenko <dziumanenko@gmail.com>
+
+	* uk.po: updated Ukrainian translation, lost and found
+
+2007-09-11  Nilgün Belma Bugüner <nilgun@buguner.name.tr>
+
+	* tr.po: updated Turkish translation, lost and found
+
+2007-09-11  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: updated Swedish translation, lost and found
+
+2007-09-11  Zdenko Podobný <zdpo@mailbox.sk>
+
+	* sk.po: updated Slovak translation, lost and found
+
+2007-09-11  Simos Xenitellis <simos74@gmx.net>
+
+	* el.po: updated Greek translation, lost and found
+
+2007-09-11  Tino Meinen <a.t.meinen@chello.nl>
+
+	* nl.po: updated Dutch translation, lost and found
+
+2007-03-12  Changwoo Ryu <cwryu@debian.org>
+
+	* ko.po: added Korean translation
+
+2007-02-25  Tommi Vainikainen <Tommi.Vainikainen@iki.fi>
+
+	* fi.po: updated Finnish translation
+
+2007-02-01  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: updated Swedish translation
+
+2007-01-12  Andriy Rysin <arysin@myrealbox.com>
+
+	* uk.po: updated Ukrainian translation
+
+2006-12-28  Maxim V. Dziumanenko <dziumanenko@gmail.com>
+
+	* uk.po: updated Ukrainian translation
+
+2005-11-28 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+
+	* ru.po: updated Russian translation
+
+2005-10-17 Matej Urban�i� <matej.urban@gmail.com> 
+
+	* sl.po: updated Slovenian translation
+
+2006-10-13  Gabor Kelemen <kelemeng@gnome.hu>
+
+	* hu.po: updated Hungarian translation
+
+2006-10-07  Sergey E Kvyato <kvantos@plotinka.ru>
+
+	* ru.po: updated Russian translation
+
+2006-10-03  Denis Barbier <barbier@linuxfr.org>
+
+	* fr.po: updated French translation
+
+2006-10-03  Nilgün Belma Bugüner <nilgun@buguner.name.tr>
+
+	* tr.po: updated Turkish translation
+
+2006-10-02  Gabor Kelemen <kelemeng@gnome.hu>
+
+	* hu.po: updated Hungarian translation
+
+2006-09-24  Vladimer Sichinava <vlsichinava@gmail.com>
+
+	* ka.po: added Georgian translation
+
+2006-09-24  Denis Barbier <barbier@linuxfr.org>
+
+	* fr.po: updated French translation
+
+2006-09-09  svu
+
+	* ru.po: updated Ukrainian translation
+
+2006-08-31  Andriy Rysin <arysin@myrealbox.com>
+
+	* uk.po: updated Ukrainian translation
+
+2006-06-29  Francisco Javier F. Serrador <serrador@cvs.gnome.org>
+
+	* es.po: updated Spanish translation
+
+2006-04-09  Francisco Javier F. Serrador <serrador@cvs.gnome.org>
+
+	* es.po: added Spanish translation
+
+2006-04-05  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: updated Swedish translation
+
+2006-04-01  Maxim V. Dziumanenko <mvd@mylinux.com.ua>
+
+	* uk.po: updated Ukrainian translation
+
+2006-03-17  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: updated Swedish translation
+
+2006-03-12  Gabor Kelemen <kelemeng@gnome.hu>
+
+	* hu.po: updated Hungarian translation
+
+2006-03-09  Denis Barbier <barbier@linuxfr.org>
+
+	* fr.po: updated French translation
+
+2006-03-04  Данило Шеган <danilo@gnome.org> 
+
+	* sr.po: updated Serbian translation
+
+2006-02-27  Luca Ferretti <elle.uca@infinito.it>
+
+	* it.po: updated Italian translation
+
+2006-01-21  Taco Witte <tcwitte@cs.uu.nl>
+
+	* nl.po: updated Dutch translation
+
+2005-12-31  svu
+
+	* ru.po: updated Russian translation
+
+2005-12-31  jeroen-91@home.nl
+
+	* nl.po: updated Dutch translation
+
+2005-12-01  svu
+
+	* ru.po: updated Russian translation
+
+2005-10-13   Denis Barbier <barbier@linuxfr.org>
+
+	* fr.po: updated French translation
+
+2005-10-02  svu
+
+	* ru.po: updated Russian translation
+
+2005-09-30 Matej Urban�i� <matej.urban@gmail.com> 
+
+	* sl.po: adding Slovenian translation
+
+2005-09-13  Wei-Lun Chao <chaoweilun@pcmail.com.tw>
+
+	* zh_TW.po: adding Chinise (traditional) translation
+
+2005-09-13  Tommi Vainikainen <Tommi.Vainikainen@iki.fi>
+
+	* fi.po: adding Finnish translation
+
+2005-09-05  Alexander Shopov <ash@contact.bg>
+
+	* bg.po: updated Bulgarian translation
+
+2005-09-04  svu
+
+	* ru.po: updated Russian translation
+
+2005-08-25  Danilo Segan <dsegan@gmx.net>
+
+	* sr.po: updated Serbian translation
+
+2005-08-23  svu
+
+	* ru.po: updated Russian translation
+
+2005-08-17  nilgun@buguner.name.tr
+
+	* tr.po: updated Turkish translation
+
+2005-08-01  svu
+
+	* ru.po: updated Russian translation
+
+2005-07-31  svu
+
+	* ru.po: updated Russian translation
+
+2005-07-24  svu
+
+	* ru.po: updated Russian translation
+
+2005-05-28  teppi8.gmail.com
+
+	* vi.po: new Vietnamese translation
+
+2005-04-09  chris@protactin.co.uk
+
+	* en_GB.po: new British translation
+
+2005-04-06  Steve Murphy <murf@e-tools.com>
+
+	* rw.po: updated Kinyarwanda translation
+
+2005-01-31  Taco Witte <tcwitte@cs.uu.nl>
+
+	* nl.po: updated Dutch translation
+
+2005-01-26  svu
+
+	* ru.po: updated Russian translation
+
+2005-01-24  svu
+
+	* ru.po: updated Russian translation
+
+2005-01-16  svu
+
+	* ru.po: updated Russian translation
+
+2004-12-22  svu
+
+	* ru.po: updated Russian translation
+
+2004-12-21  Simos Xenitellis <simos74@gmx.net>
+
+	* el.po: adding Greek translation
+
+2004-10-26  Elros Cyriatan <cyriatan@fastmail.fm>
+
+	* nl.po: updated Dutch translation
+
+2004-10-26  svu
+
+	* ru.po: updated Russian translation
+
+2004-10-12  svu
+
+	* ru.po: updated Russian translation
+
diff --git a/xorg-server/xkbdata.src/po/Makefile.in.in b/xorg-server/xkbdata.src/po/Makefile.in.in
new file mode 100644
index 000000000..57ef267b3
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/Makefile.in.in
@@ -0,0 +1,217 @@
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
+#
+# This file may be copied and used freely without restrictions.  It may
+# be used in projects which are not available under a GNU Public License,
+# but which still want to provide support for the GNU gettext functionality.
+#
+# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
+#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
+#
+# - Modified by jacob berkman <jacob@ximian.com> to install
+#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+#
+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
+#
+# We have the following line for use by intltoolize:
+# INTLTOOL_MAKEFILE
+
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = @datadir@
+datarootdir = @datarootdir@
+libdir = @libdir@
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+subdir = po
+install_sh = @install_sh@
+# Automake >= 1.8 provides @mkdir_p@.
+# Until it can be supposed, use the safe fallback:
+mkdir_p = $(install_sh) -d
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = @XGETTEXT@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+
+ALL_LINGUAS = @ALL_LINGUAS@
+
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
+
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
+
+POTFILES = \
+# This comment gets stripped out
+
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+
+.SUFFIXES:
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
+
+.po.pox:
+	$(MAKE) $(GETTEXT_PACKAGE).pot
+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+
+.po.mo:
+	$(MSGFMT) -o $@ $<
+
+.po.gmo:
+	file=`echo $* | sed 's,.*/,,'`.gmo \
+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+
+.po.cat:
+	sed -f ../intl/po2msg.sed < $< > $*.msg \
+	  && rm -f $@ && gencat $@ $*.msg
+
+
+all: all-@USE_NLS@
+
+all-yes: $(CATALOGS)
+all-no:
+
+$(GETTEXT_PACKAGE).pot: $(POTFILES)
+	$(GENPOT)
+
+install: install-data
+install-data: install-data-@USE_NLS@
+install-data-no: all
+install-data-yes: all
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $$dir; \
+	  if test -r $$lang.gmo; then \
+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
+	  else \
+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $(srcdir)/$$lang.gmo as" \
+		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
+	  fi; \
+	  if test -r $$lang.gmo.m; then \
+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	  else \
+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
+		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	    else \
+	      true; \
+	    fi; \
+	  fi; \
+	done
+
+# Empty stubs to satisfy archaic automake needs
+dvi info tags TAGS ID:
+
+# Define this as empty until I found a useful application.
+install-exec installcheck:
+
+uninstall:
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	done
+
+check: all $(GETTEXT_PACKAGE).pot
+	rm -f missing notexist
+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+	if [ -r missing -o -r notexist ]; then \
+	  exit 1; \
+	fi
+
+mostlyclean:
+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+	rm -f .intltool-merge-cache
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES stamp-it
+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f Makefile.in.in
+
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	extra_dists="$(EXTRA_DISTFILES)"; \
+	for file in $$extra_dists; do \
+	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
+	done; \
+	for file in $$dists; do \
+	  test -f $$file || file="$(srcdir)/$$file"; \
+	  ln $$file $(distdir) 2> /dev/null \
+	    || cp -p $$file $(distdir); \
+	done
+
+update-po: Makefile
+	$(MAKE) $(GETTEXT_PACKAGE).pot
+	tmpdir=`pwd`; \
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  echo "$$lang:"; \
+	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
+	  if $$result; then \
+	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	      rm -f $$tmpdir/$$lang.new.po; \
+            else \
+	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	        :; \
+	      else \
+	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	        rm -f $$tmpdir/$$lang.new.po; \
+	        exit 1; \
+	      fi; \
+	    fi; \
+	  else \
+	    echo "msgmerge for $$lang.gmo failed!"; \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  fi; \
+	done
+
+Makefile POTFILES: stamp-it
+	@if test ! -f $@; then \
+	  rm -f stamp-it; \
+	  $(MAKE) stamp-it; \
+	fi
+
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
+	       $(SHELL) ./config.status
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/po/Makevars b/xorg-server/xkbdata.src/po/Makevars
new file mode 100644
index 000000000..03f092c96
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/Makevars
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = XFree86
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = svu@users.sourceforge.net
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/xorg-server/xkbdata.src/po/POTFILES.in b/xorg-server/xkbdata.src/po/POTFILES.in
new file mode 100644
index 000000000..a3868ab0b
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/POTFILES.in
@@ -0,0 +1,2 @@
+rules/base.xml.in
+rules/evdev.xml.in
diff --git a/xorg-server/xkbdata.src/po/af.po b/xorg-server/xkbdata.src/po/af.po
new file mode 100644
index 000000000..e2c453d11
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/af.po
@@ -0,0 +1,1464 @@
+# xfree86_xkb_xml
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# Petri Jooste <rkwjpj@puk.ac.za>, 2004.
+#
+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"
+"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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: xfree86.xml.in.h:1
+msgid "\"Typewriter\""
+msgstr "\"Tikmasjien\""
+
+#: xfree86.xml.in.h:2
+msgid "A Tamil typewrite-style keymap; TAB encoding"
+msgstr "'n Tamil tikmasjienstyl sleutelbinding; TAB-enkodering"
+
+#: xfree86.xml.in.h:3
+msgid "A Tamil typewrite-style keymap; TSCII encoding"
+msgstr "'n Tamil tikmasjienstyl sleutelbinding; TSCII-enkodering"
+
+#: xfree86.xml.in.h:4
+msgid "A Tamil typewrite-style keymap; Unicode encoding"
+msgstr "'n Tamil tikmasjienstyl sleutelbinding; Unicode-enkodering"
+
+#: xfree86.xml.in.h:5
+msgid "ACPI Standard"
+msgstr "ACPI Standaard"
+
+#: xfree86.xml.in.h:6
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: xfree86.xml.in.h:7
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr "Tree op as Shift met sluit-aksie. Shift kanseleer Caps."
+
+#: xfree86.xml.in.h:8
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "Tree op as Shift met sluiting.  Shift kanseleer nie Caps nie."
+
+#: xfree86.xml.in.h:9
+msgid "Add the standard behavior to Menu key."
+msgstr "Voeg by die standaardgedrag by die Kieslyssleutel."
+
+#: xfree86.xml.in.h:10
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: xfree86.xml.in.h:11
+msgid "Alb"
+msgstr "Alb"
+
+#: xfree86.xml.in.h:12
+msgid "Albanian"
+msgstr "Albanies"
+
+#: xfree86.xml.in.h:13
+msgid "Alt and Meta on the Alt keys (default)."
+msgstr "Alt en Meta op die Alt sleutels (verstek)."
+
+#: xfree86.xml.in.h:14
+msgid "Alt+Control changes group"
+msgstr "Alt+Kontrole verander groep"
+
+#: xfree86.xml.in.h:15
+msgid "Alt+Shift changes group"
+msgstr "Alt+Shift verander groep"
+
+#: xfree86.xml.in.h:16
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win-sleutel gedrag"
+
+#: xfree86.xml.in.h:17
+msgid "Alternate"
+msgstr "Alterneer"
+
+#: xfree86.xml.in.h:18
+msgid "Arabic"
+msgstr "Arabies"
+
+#: xfree86.xml.in.h:19
+msgid "Arb"
+msgstr "Arb"
+
+#: xfree86.xml.in.h:20
+msgid "Arm"
+msgstr "Arm"
+
+#: xfree86.xml.in.h:21
+msgid "Armenian"
+msgstr "Armeens"
+
+#: xfree86.xml.in.h:22
+msgid "Aze"
+msgstr "Aze"
+
+#: xfree86.xml.in.h:23
+msgid "Azerbaijani"
+msgstr "Azerbaijaans"
+
+#: xfree86.xml.in.h:24
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: xfree86.xml.in.h:25
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: xfree86.xml.in.h:26
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: xfree86.xml.in.h:27
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: xfree86.xml.in.h:28
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: xfree86.xml.in.h:29
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: xfree86.xml.in.h:30
+msgid "Basic"
+msgstr "Basies"
+
+#: xfree86.xml.in.h:31
+msgid "Bel"
+msgstr "Bel"
+
+#: xfree86.xml.in.h:32
+msgid "Belarusian"
+msgstr "Belarussies"
+
+#: xfree86.xml.in.h:33
+msgid "Belgian"
+msgstr "Belgies"
+
+#: xfree86.xml.in.h:34
+msgid "Ben"
+msgstr "Ben"
+
+#: xfree86.xml.in.h:35
+msgid "Bengali"
+msgstr "Bengaals"
+
+#: xfree86.xml.in.h:36
+msgid "Bgr"
+msgstr "Bgr"
+
+#: xfree86.xml.in.h:37
+msgid "Bih"
+msgstr "Bih"
+
+#: xfree86.xml.in.h:38
+msgid "Blr"
+msgstr "Blr"
+
+#: xfree86.xml.in.h:39
+msgid "Bosnian"
+msgstr "Bosnies"
+
+#: xfree86.xml.in.h:40
+msgid "Both Alt keys together change group"
+msgstr "Beide Alt-sleutels tesame verander groep"
+
+#: xfree86.xml.in.h:41
+msgid "Both Ctrl keys together change group"
+msgstr "Beide Ctrl-sleutels tesame verander groep"
+
+#: xfree86.xml.in.h:42
+msgid "Both Shift keys together change group"
+msgstr "Beide Shift-sleutels tesame verander groep"
+
+#: xfree86.xml.in.h:43
+msgid "Both Win-keys switch group while pressed"
+msgstr "Beide Win-sleutels wissel groep terwyl gedruk"
+
+#: xfree86.xml.in.h:44
+msgid "Bra"
+msgstr "Bra"
+
+#: xfree86.xml.in.h:45
+msgid "Brazilian"
+msgstr "Braziliaans"
+
+#: xfree86.xml.in.h:46
+msgid "Brazilian ABNT2"
+msgstr "Braziliaans ABNT2"
+
+#: xfree86.xml.in.h:47
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internetsleutelbord"
+
+#: xfree86.xml.in.h:48
+msgid "Bulgarian"
+msgstr "Bulgaars"
+
+#: xfree86.xml.in.h:49
+msgid "Burmese"
+msgstr "Burmees"
+
+#: xfree86.xml.in.h:50
+msgid "Can"
+msgstr "Kan"
+
+#: xfree86.xml.in.h:51
+msgid "Canadian"
+msgstr "Kanadees"
+
+#: xfree86.xml.in.h:52
+msgid "Caps Lock key changes group"
+msgstr "CapsLock-sleutel verander groep"
+
+#: xfree86.xml.in.h:53
+msgid "CapsLock key behavior"
+msgstr "CapsLock-sleutelgedrag"
+
+#: xfree86.xml.in.h:54
+msgid "Caps_Lock LED shows alternative group"
+msgstr "Caps_Lock LED vertoon alternatiewe groep"
+
+#: xfree86.xml.in.h:55
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: xfree86.xml.in.h:56
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternatief)"
+
+#: xfree86.xml.in.h:57
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internetsleutelbord"
+
+#: xfree86.xml.in.h:58
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: xfree86.xml.in.h:59
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: xfree86.xml.in.h:60
+msgid "CloGaelach Laptop"
+msgstr "CloGaelach Skootrekenaar"
+
+#: xfree86.xml.in.h:61
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: xfree86.xml.in.h:62
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 sleutels)"
+
+#: xfree86.xml.in.h:63
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 sleutels)"
+
+#: xfree86.xml.in.h:64
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 sleutels)"
+
+#: xfree86.xml.in.h:65
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: xfree86.xml.in.h:66
+msgid "Control Key Position"
+msgstr "Kontrolesleutel posisie"
+
+#: xfree86.xml.in.h:67
+msgid "Control key at bottom left"
+msgstr "Kontrolesleutel links onder"
+
+#: xfree86.xml.in.h:68
+msgid "Control key at left of 'A'"
+msgstr "Kontrolesleutel links van 'A'"
+
+#: xfree86.xml.in.h:69
+msgid "Control+Shift changes group"
+msgstr "Ctrl+Shift verander groep"
+
+#: xfree86.xml.in.h:70
+msgid "Croatian"
+msgstr "Kroaties"
+
+#: xfree86.xml.in.h:71
+msgid "Cyrillic"
+msgstr "Kirrillies"
+
+#: xfree86.xml.in.h:72
+msgid "Cze"
+msgstr "Cze"
+
+#: xfree86.xml.in.h:73
+msgid "Czech"
+msgstr "Tsjeggies"
+
+#: xfree86.xml.in.h:74
+msgid "Czech (qwerty)"
+msgstr "Tsjeggies (qwerty)"
+
+#: xfree86.xml.in.h:75
+msgid "Danish"
+msgstr "Deens"
+
+#: xfree86.xml.in.h:76
+msgid "Dead acute"
+msgstr "Dooie akuutaksent"
+
+#: xfree86.xml.in.h:77
+msgid "Dead grave acute"
+msgstr "Dooie gravisaksent"
+
+#: xfree86.xml.in.h:78
+msgid "Dell"
+msgstr "Dell"
+
+#: xfree86.xml.in.h:79
+msgid "Dell 101-key PC"
+msgstr "Dell 101-key PC"
+
+#: xfree86.xml.in.h:80
+msgid "Deu"
+msgstr "Deu"
+
+#: xfree86.xml.in.h:81
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: xfree86.xml.in.h:82
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 series"
+
+#: xfree86.xml.in.h:83
+msgid "Dnk"
+msgstr "Dnk"
+
+#: xfree86.xml.in.h:84
+msgid "Dutch"
+msgstr "Nederlands"
+
+#: xfree86.xml.in.h:85
+msgid "Dvo"
+msgstr "Dvo"
+
+#: xfree86.xml.in.h:86
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: xfree86.xml.in.h:87
+msgid "Eliminate dead keys"
+msgstr "Elimineer dooie sleutels"
+
+#: xfree86.xml.in.h:88
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: xfree86.xml.in.h:89
+msgid "Esp"
+msgstr "Esp"
+
+#: xfree86.xml.in.h:90
+msgid "Est"
+msgstr "Est"
+
+#: xfree86.xml.in.h:91
+msgid "Estonian"
+msgstr "Estoniaans"
+
+#: xfree86.xml.in.h:92
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: xfree86.xml.in.h:93
+msgid "Extended"
+msgstr "Uitgebreide"
+
+#: xfree86.xml.in.h:94
+msgid "Fao"
+msgstr "Fao"
+
+#: xfree86.xml.in.h:95
+msgid "Faroese"
+msgstr "Faroees"
+
+#: xfree86.xml.in.h:96
+msgid "Farsi"
+msgstr "Farsi"
+
+#: xfree86.xml.in.h:97
+msgid "Fin"
+msgstr "Fin"
+
+#: xfree86.xml.in.h:98
+msgid "Finnish"
+msgstr "Fins"
+
+#: xfree86.xml.in.h:99
+msgid "Fra"
+msgstr "Fra"
+
+#: xfree86.xml.in.h:100
+msgid "French"
+msgstr "Frans"
+
+#: xfree86.xml.in.h:101
+msgid "French (alternative)"
+msgstr "Frans (alternatief)"
+
+#: xfree86.xml.in.h:102
+msgid "French Canadian"
+msgstr "Franse Kanadees"
+
+#: xfree86.xml.in.h:103
+msgid "GBr"
+msgstr "GBr"
+
+#: xfree86.xml.in.h:104
+msgid "Generic 101-key PC"
+msgstr "Generies 101-sleutel PC"
+
+#: xfree86.xml.in.h:105
+msgid "Generic 102-key (Intl) PC"
+msgstr "Generies 102-sleutel (Intl) PC"
+
+#: xfree86.xml.in.h:106
+msgid "Generic 104-key PC"
+msgstr "Generies 104-sleutel PC"
+
+#: xfree86.xml.in.h:107
+msgid "Generic 105-key (Intl) PC"
+msgstr "Generies 105-sleutel (Intl) PC"
+
+#: xfree86.xml.in.h:108
+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
+msgid "Geo"
+msgstr "Geo"
+
+#: xfree86.xml.in.h:110
+msgid "Georgian (latin)"
+msgstr "Georgies (latyns)"
+
+#: xfree86.xml.in.h:111
+msgid "Georgian (russian)"
+msgstr "Georgies (russies)"
+
+#: xfree86.xml.in.h:112
+msgid "German"
+msgstr "Duits"
+
+#: xfree86.xml.in.h:113
+msgid "Grc"
+msgstr "Grc"
+
+#: xfree86.xml.in.h:114
+msgid "Greek"
+msgstr "Grieks"
+
+#: xfree86.xml.in.h:115
+msgid "Group Shift/Lock behavior"
+msgstr "Groep Shift/Lock gedrag"
+
+#: xfree86.xml.in.h:116
+msgid "Guj"
+msgstr "Guj"
+
+#: xfree86.xml.in.h:117
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: xfree86.xml.in.h:118
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: xfree86.xml.in.h:119
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: xfree86.xml.in.h:120
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: xfree86.xml.in.h:121
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: xfree86.xml.in.h:122
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: xfree86.xml.in.h:123
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: xfree86.xml.in.h:124
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: xfree86.xml.in.h:125
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: xfree86.xml.in.h:126
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: xfree86.xml.in.h:127
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: xfree86.xml.in.h:128
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#: xfree86.xml.in.h:129
+msgid "Hin"
+msgstr "Hin"
+
+#: xfree86.xml.in.h:130
+msgid "Hindi"
+msgstr "Hindi"
+
+#: xfree86.xml.in.h:131
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: xfree86.xml.in.h:132
+msgid "Hrv"
+msgstr "Hrv"
+
+#: xfree86.xml.in.h:133
+msgid "Hun"
+msgstr "Hun"
+
+#: xfree86.xml.in.h:134
+msgid "Hungarian"
+msgstr "Hongaars"
+
+#: xfree86.xml.in.h:135
+msgid "Hungarian (qwerty)"
+msgstr "Hongaars (qwerty)"
+
+#: xfree86.xml.in.h:136
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hiper is verbind aan die Win-sleutels."
+
+#: xfree86.xml.in.h:137
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: xfree86.xml.in.h:138
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: xfree86.xml.in.h:139
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (alternate option)"
+
+#: xfree86.xml.in.h:140
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: xfree86.xml.in.h:141
+msgid "INSCRIPT layout"
+msgstr "INSCRIPT-uitleg"
+
+#: xfree86.xml.in.h:142
+msgid "IS434"
+msgstr "IS434"
+
+#: xfree86.xml.in.h:143
+msgid "IS434 laptop"
+msgstr "IS434 laptop"
+
+#: xfree86.xml.in.h:144
+msgid "ISO Alternate"
+msgstr "ISO Alternatief"
+
+#: xfree86.xml.in.h:145
+msgid "Icelandic"
+msgstr "Yslandies"
+
+#: xfree86.xml.in.h:146
+msgid "Iku"
+msgstr "Iku"
+
+#: xfree86.xml.in.h:147
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: xfree86.xml.in.h:148
+msgid "Irish"
+msgstr "Iers"
+
+#: xfree86.xml.in.h:149
+msgid "Irl"
+msgstr "Irl"
+
+#: xfree86.xml.in.h:150
+msgid "Irn"
+msgstr "Irn"
+
+#: xfree86.xml.in.h:151
+msgid "Isl"
+msgstr "Isl"
+
+#: xfree86.xml.in.h:152
+msgid "Isr"
+msgstr "Isr"
+
+#: xfree86.xml.in.h:153
+msgid "Israeli"
+msgstr "Israelies"
+
+#: xfree86.xml.in.h:154
+msgid "Ita"
+msgstr "Ita"
+
+#: xfree86.xml.in.h:155
+msgid "Italian"
+msgstr "Italiaans"
+
+#: xfree86.xml.in.h:156
+msgid "Japanese"
+msgstr "Japanees"
+
+#: xfree86.xml.in.h:157
+msgid "Japanese 106-key"
+msgstr "Japanees 106-sleutel"
+
+#: xfree86.xml.in.h:158
+msgid "Jpn"
+msgstr "Jpn"
+
+#: xfree86.xml.in.h:159
+msgid "Kan"
+msgstr "Kan"
+
+#: xfree86.xml.in.h:160
+msgid "Kannada"
+msgstr "Kannada"
+
+#: xfree86.xml.in.h:161
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: xfree86.xml.in.h:162
+msgid "LAm"
+msgstr "LAm"
+
+#: xfree86.xml.in.h:163
+msgid "Laptop"
+msgstr "Skootrekenaar"
+
+#: xfree86.xml.in.h:164
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+
+#: xfree86.xml.in.h:165
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+
+#: xfree86.xml.in.h:166
+msgid "Laptop/notebook Dell Inspiron 8xxx"
+msgstr "Laptop/notebook Dell Inspiron 8xxx"
+
+#: xfree86.xml.in.h:167
+msgid "Latin"
+msgstr "Latyns"
+
+#: xfree86.xml.in.h:168
+msgid "Latin America"
+msgstr "Latyns Amerika"
+
+#: xfree86.xml.in.h:169
+msgid "Latvian"
+msgstr "Latvies"
+
+#: xfree86.xml.in.h:170
+msgid "Left Alt key changes group"
+msgstr "Linkerkant Alt-sleutel verander groep"
+
+#: xfree86.xml.in.h:171
+msgid "Left Ctrl key changes group"
+msgstr "Linkerkant Ctrl-sleutel verander groep"
+
+#: xfree86.xml.in.h:172
+msgid "Left Shift key changes group"
+msgstr "Linkerkant Shift-sleutel verander groep"
+
+#: xfree86.xml.in.h:173
+msgid "Left Win-key changes group"
+msgstr "Linkerkant Win-sleutel verander groep"
+
+#: xfree86.xml.in.h:174
+msgid "Left Win-key switches group while pressed"
+msgstr "Linkerkant Win-sleutel wissel groep terwyl gedruk"
+
+#: xfree86.xml.in.h:175
+msgid "Lithuanian azerty standard"
+msgstr "Lithuaniese azerty standaard"
+
+#: xfree86.xml.in.h:176
+msgid "Lithuanian qwerty \"numeric\""
+msgstr "Lithuanian qwerty \"numeries\""
+
+#: xfree86.xml.in.h:177
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: xfree86.xml.in.h:178
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: xfree86.xml.in.h:179
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: xfree86.xml.in.h:180
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: xfree86.xml.in.h:181
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (alternatiewe opsie)"
+
+#: xfree86.xml.in.h:182
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (alternatiewe opsie2)"
+
+#: xfree86.xml.in.h:183
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: xfree86.xml.in.h:184
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: xfree86.xml.in.h:185
+msgid "Logitech Deluxe Access Keyboard"
+msgstr "Logitech Deluxe Access Keyboard"
+
+#: xfree86.xml.in.h:186
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: xfree86.xml.in.h:187
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: xfree86.xml.in.h:188
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: xfree86.xml.in.h:189
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+
+#: xfree86.xml.in.h:190
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr "Logitech iTouch keyboard Internet Navigator"
+
+#: xfree86.xml.in.h:191
+msgid "Ltu"
+msgstr "Ltu"
+
+#: xfree86.xml.in.h:192
+msgid "Lva"
+msgstr "Lva"
+
+#: xfree86.xml.in.h:193
+msgid "Macedonian"
+msgstr "Masedonies"
+
+#: xfree86.xml.in.h:194
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: xfree86.xml.in.h:195
+msgid "Macintosh Old"
+msgstr "Macintosh (oud)"
+
+#: xfree86.xml.in.h:196
+msgid "Make CapsLock an additional Control"
+msgstr "Maak CapsLock 'n adisionele Kontrole"
+
+#: xfree86.xml.in.h:197
+msgid "Mal"
+msgstr "Mal"
+
+#: xfree86.xml.in.h:198
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: xfree86.xml.in.h:199
+msgid "Maltese"
+msgstr "Maltees"
+
+#: xfree86.xml.in.h:200
+msgid "Maltese (US layout)"
+msgstr "Maltese (VSA-uitleg)"
+
+#: xfree86.xml.in.h:201
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: xfree86.xml.in.h:202
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: xfree86.xml.in.h:203
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: xfree86.xml.in.h:204
+msgid "Menu is Compose"
+msgstr "Kieslys-sleutel is Komponeer"
+
+#: xfree86.xml.in.h:205
+msgid "Menu key changes group"
+msgstr "Kieslyssleutel verander groep"
+
+#: xfree86.xml.in.h:206
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta is verbind aan die Win-sleutels."
+
+#: xfree86.xml.in.h:207
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta is verbind aan die linkerkantste Win-sleutel."
+
+#: xfree86.xml.in.h:208
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internetsleutelbord"
+
+#: xfree86.xml.in.h:209
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Sweeds"
+
+#: xfree86.xml.in.h:210
+msgid "Microsoft Natural"
+msgstr "Microsoft Natuurlik"
+
+#: xfree86.xml.in.h:211
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: xfree86.xml.in.h:212
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: xfree86.xml.in.h:213
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office sleutelbord"
+
+#: xfree86.xml.in.h:214
+msgid "Miscellaneous compatibility options"
+msgstr "Verskeie versoenbaarheid-opsies"
+
+#: xfree86.xml.in.h:215
+msgid "Mkd"
+msgstr "Mkd"
+
+#: xfree86.xml.in.h:216
+msgid "Mlt"
+msgstr "Mlt"
+
+#: xfree86.xml.in.h:217
+msgid "Mmr"
+msgstr "Mmr"
+
+#: xfree86.xml.in.h:218
+msgid "Mng"
+msgstr "Mng"
+
+#: xfree86.xml.in.h:219
+msgid "Mongolian"
+msgstr "Mongolees"
+
+#: xfree86.xml.in.h:220
+msgid "Nld"
+msgstr "Nld"
+
+#: xfree86.xml.in.h:221
+msgid "Nor"
+msgstr "Nor"
+
+#: xfree86.xml.in.h:222
+msgid "Northern Saami (Finland)"
+msgstr "Noordelike Saami (Finland)"
+
+#: xfree86.xml.in.h:223
+msgid "Northern Saami (Norway)"
+msgstr "Noordelike Saami (Noorweë)"
+
+#: xfree86.xml.in.h:224
+msgid "Northern Saami (Sweden)"
+msgstr "Noordelike Saami (Swede)"
+
+#: xfree86.xml.in.h:225
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: xfree86.xml.in.h:226
+msgid "Norwegian"
+msgstr "Noorweegs"
+
+#: xfree86.xml.in.h:227
+msgid "Num_Lock LED shows alternative group"
+msgstr "Num_Lock LED vertoon alternatiewe groep"
+
+#: xfree86.xml.in.h:228
+msgid "Ogh"
+msgstr "Ogh"
+
+#: xfree86.xml.in.h:229
+msgid "Ogham"
+msgstr "Ogham"
+
+#: xfree86.xml.in.h:230
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/Internet keyboard"
+
+#: xfree86.xml.in.h:231
+msgid "Ori"
+msgstr "Ori"
+
+#: xfree86.xml.in.h:232
+msgid "Oriya"
+msgstr "Oriya"
+
+#: xfree86.xml.in.h:233
+msgid "PC-98xx Series"
+msgstr "PC-98xx Reeks"
+
+#: xfree86.xml.in.h:234
+msgid "PC104"
+msgstr "PC104"
+
+#: xfree86.xml.in.h:235
+msgid "Pan"
+msgstr "Pan"
+
+#: xfree86.xml.in.h:236
+msgid "Phonetic"
+msgstr "Foneties"
+
+#: xfree86.xml.in.h:237
+msgid "Pol"
+msgstr "Pol"
+
+#: xfree86.xml.in.h:238
+msgid "Polish"
+msgstr "Pools"
+
+#: xfree86.xml.in.h:239
+msgid "Polish (qwertz)"
+msgstr "Pools (qwertz)"
+
+#: xfree86.xml.in.h:240
+msgid "Polytonic"
+msgstr "Polytonic"
+
+#: xfree86.xml.in.h:241
+msgid "Portuguese"
+msgstr "Portugees"
+
+#: xfree86.xml.in.h:242
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: xfree86.xml.in.h:243
+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
+msgid "Press Menu key to choose 3rd level"
+msgstr "Druk Kieslys-sleutel om die 3de vlak te kies"
+
+#: xfree86.xml.in.h:245
+msgid "Press Right Control to choose 3rd level"
+msgstr "Druk Regterkantste Ctrl-sleutel om die 3de vlak te kies"
+
+#: xfree86.xml.in.h:246
+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
+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
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: xfree86.xml.in.h:249
+msgid "Prt"
+msgstr "Prt"
+
+#: xfree86.xml.in.h:250
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: xfree86.xml.in.h:251
+msgid "R-Alt switches group while pressed"
+msgstr "R-Alt wissel die groep terwyl gedruk"
+
+#: xfree86.xml.in.h:252
+msgid "Right Alt is Compose"
+msgstr "Regterkant Alt is Komponeer"
+
+#: xfree86.xml.in.h:253
+msgid "Right Alt key changes group"
+msgstr "Regterkant Alt-sleutel verander groep"
+
+#: xfree86.xml.in.h:254
+msgid "Right Control key works as Right Alt"
+msgstr "Regterkant Ctrl-sleutel werk soos Regterkant Alt"
+
+#: xfree86.xml.in.h:255
+msgid "Right Ctrl key changes group"
+msgstr "Regterkant Ctrl-sleutel verander groep"
+
+#: xfree86.xml.in.h:256
+msgid "Right Shift key changes group"
+msgstr "Regterkant Shift-sleutel verander groep"
+
+#: xfree86.xml.in.h:257
+msgid "Right Win-key changes group"
+msgstr "Regterkant Win-sleutel verander groep"
+
+#: xfree86.xml.in.h:258
+msgid "Right Win-key is Compose"
+msgstr "Regterkant Win-sleutel is Komponeer"
+
+#: xfree86.xml.in.h:259
+msgid "Right Win-key switches group while pressed"
+msgstr "Regterkant Win-sleutel skakel groep terwyl gedruk"
+
+#: xfree86.xml.in.h:260
+msgid "Romanian"
+msgstr "Romeens"
+
+#: xfree86.xml.in.h:261
+msgid "Rou"
+msgstr "Rou"
+
+#: xfree86.xml.in.h:262
+msgid "Rus"
+msgstr "Rus"
+
+#: xfree86.xml.in.h:263
+msgid "Russian"
+msgstr "Russies"
+
+#: xfree86.xml.in.h:264
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: xfree86.xml.in.h:265
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: xfree86.xml.in.h:266
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: xfree86.xml.in.h:267
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: xfree86.xml.in.h:268
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: xfree86.xml.in.h:269
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: xfree86.xml.in.h:270
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: xfree86.xml.in.h:271
+msgid "Sapmi"
+msgstr "Sapmi"
+
+#: xfree86.xml.in.h:272
+msgid "Scg"
+msgstr "Scg"
+
+#: xfree86.xml.in.h:273
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "Scroll_Lock LED wys alternatiewe groep"
+
+#: xfree86.xml.in.h:274
+msgid "Serbian"
+msgstr "Serbies"
+
+#: xfree86.xml.in.h:275
+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
+msgid "Slovak"
+msgstr "Slovaaks"
+
+#: xfree86.xml.in.h:277
+msgid "Slovak (qwerty)"
+msgstr "Slovaaks (qwerty)"
+
+#: xfree86.xml.in.h:278
+msgid "Slovenian"
+msgstr "Sloveens"
+
+#: xfree86.xml.in.h:279
+msgid "Sme"
+msgstr "Sme"
+
+#: xfree86.xml.in.h:280
+msgid "Spanish"
+msgstr "Spaans"
+
+#: xfree86.xml.in.h:281
+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."
+
+#: xfree86.xml.in.h:282
+msgid "Standard"
+msgstr "Standaard"
+
+#: xfree86.xml.in.h:283
+msgid "Sun dead keys"
+msgstr "Sun (dooie sleutels)"
+
+#: xfree86.xml.in.h:284
+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
+msgid "Svk"
+msgstr "Svk"
+
+#: xfree86.xml.in.h:287
+msgid "Svn"
+msgstr "Svn"
+
+#: xfree86.xml.in.h:288
+msgid "Swap Control and Caps Lock"
+msgstr "Ruil Ctrl en CapsLock om"
+
+#: xfree86.xml.in.h:289
+msgid "Swe"
+msgstr "Swe"
+
+#: xfree86.xml.in.h:290
+msgid "Swedish"
+msgstr "Sweeds"
+
+#: xfree86.xml.in.h:291
+msgid "Swiss French"
+msgstr "Switserse Frans"
+
+#: xfree86.xml.in.h:292
+msgid "Swiss German"
+msgstr "Switserse Duits"
+
+#: xfree86.xml.in.h:293
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: xfree86.xml.in.h:294
+msgid "Syr"
+msgstr "Syr"
+
+#: xfree86.xml.in.h:295
+msgid "Syriac"
+msgstr "Siries"
+
+#: xfree86.xml.in.h:296
+msgid "Tajik"
+msgstr "Tajikees"
+
+#: xfree86.xml.in.h:297
+msgid "Tamil"
+msgstr "Tamilees"
+
+#: xfree86.xml.in.h:298
+msgid "Tel"
+msgstr "Tel"
+
+#: xfree86.xml.in.h:299
+msgid "Telugu"
+msgstr "Telugu"
+
+#: xfree86.xml.in.h:300
+msgid "Tha"
+msgstr "Tha"
+
+#: xfree86.xml.in.h:301
+msgid "Thai (Kedmanee)"
+msgstr "Thai (Kedmanee)"
+
+#: xfree86.xml.in.h:302
+msgid "Thai (Pattachote)"
+msgstr "Thai (Pattachote)"
+
+#: xfree86.xml.in.h:303
+msgid "Thai (TIS-820.2538)"
+msgstr "Thai (TIS-820.2538)"
+
+#: xfree86.xml.in.h:304
+msgid "Third level choosers"
+msgstr "Derdevlak kiesers"
+
+#: xfree86.xml.in.h:305
+msgid "Tjk"
+msgstr "Tjk"
+
+#: xfree86.xml.in.h:306
+msgid "Tml"
+msgstr "Tml"
+
+#: xfree86.xml.in.h:307
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: xfree86.xml.in.h:308
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: xfree86.xml.in.h:309
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: xfree86.xml.in.h:310
+msgid "Tur"
+msgstr "Tur"
+
+#: xfree86.xml.in.h:311
+msgid "Turkish"
+msgstr "Turks"
+
+#: xfree86.xml.in.h:312
+msgid "Turkish (F)"
+msgstr "Turks (F)"
+
+#: xfree86.xml.in.h:313
+msgid "Turkish Alt-Q Layout"
+msgstr "Turks Alt-Q-uitleg"
+
+#: xfree86.xml.in.h:314
+msgid "U.S. English"
+msgstr "VSA Engels"
+
+#: xfree86.xml.in.h:315
+msgid "U.S. English w/ ISO9995-3"
+msgstr "VSA Engels met ISO9995-3"
+
+#: xfree86.xml.in.h:316
+msgid "U.S. English w/ dead keys"
+msgstr "VSA Engels met dooie sleutels"
+
+#: xfree86.xml.in.h:317
+msgid "US"
+msgstr "VSA"
+
+#: xfree86.xml.in.h:318
+msgid "US keyboard with Romanian letters"
+msgstr "VSA sleutelbord met Romeense letters"
+
+#: xfree86.xml.in.h:319
+msgid "USA"
+msgstr "VSA"
+
+#: xfree86.xml.in.h:320
+msgid "Ukr"
+msgstr "Ukr"
+
+#: xfree86.xml.in.h:321
+msgid "Ukrainian"
+msgstr "Ukraïnies"
+
+#: xfree86.xml.in.h:322
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: xfree86.xml.in.h:323
+msgid "United Kingdom"
+msgstr "Vereenigde Koninkryk"
+
+#: xfree86.xml.in.h:324
+msgid "Use keyboard LED to show alternative group"
+msgstr "Gebruik sleutelbord LED om alternatiewe groep te wys"
+
+#: xfree86.xml.in.h:325
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr "Gebruik interne bokas. Shift kanseleer Caps."
+
+#: xfree86.xml.in.h:326
+msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+msgstr "Gebruik interne bokas.  Shift kanseleer nie Caps nie."
+
+#: xfree86.xml.in.h:327
+msgid "Uzb"
+msgstr "Uzb"
+
+#: xfree86.xml.in.h:328
+msgid "Uzbek"
+msgstr "Uzbek"
+
+#: xfree86.xml.in.h:329
+msgid "Vietnamese"
+msgstr "Viëtnamees"
+
+#: xfree86.xml.in.h:330
+msgid "Vnm"
+msgstr "Vnm"
+
+#: xfree86.xml.in.h:331
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: xfree86.xml.in.h:332
+msgid "Winkeys"
+msgstr "Winkeys"
+
+#: xfree86.xml.in.h:333
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internetsleutelbord"
+
+#: xfree86.xml.in.h:334
+msgid "Yug"
+msgstr "Yug"
+
+#: xfree86.xml.in.h:335
+msgid "Yugoslavian"
+msgstr "Joegoslaafs"
+
+#: xfree86.xml.in.h:336
+msgid "abnt2"
+msgstr "abnt2"
+
+#: xfree86.xml.in.h:337
+msgid "azerty"
+msgstr "azerty"
+
+#: xfree86.xml.in.h:338
+msgid "azerty/digits"
+msgstr "azerty/syfers"
+
+#: xfree86.xml.in.h:339
+msgid "bksl"
+msgstr "bksl"
+
+#: xfree86.xml.in.h:340
+msgid "digits"
+msgstr "syfers"
+
+#: xfree86.xml.in.h:341
+msgid "l2/101/qwerty/comma"
+msgstr "l2/101/qwerty/komma"
+
+#: xfree86.xml.in.h:342
+msgid "l2/101/qwerty/dot"
+msgstr "l2/101/qwerty/dot"
+
+#: xfree86.xml.in.h:343
+msgid "l2/101/qwertz/comma"
+msgstr "l2/101/qwertz/komma"
+
+#: xfree86.xml.in.h:344
+msgid "l2/101/qwertz/dot"
+msgstr "l2/101/qwertz/dot"
+
+#: xfree86.xml.in.h:345
+msgid "l2/102/qwerty/comma"
+msgstr "l2/102/qwerty/komma"
+
+#: xfree86.xml.in.h:346
+msgid "l2/102/qwerty/dot"
+msgstr "l2/102/qwerty/dot"
+
+#: xfree86.xml.in.h:347
+msgid "l2/102/qwertz/comma"
+msgstr "l2/102/qwertz/komma"
+
+#: xfree86.xml.in.h:348
+msgid "l2/102/qwertz/dot"
+msgstr "l2/102/qwertz/dot"
+
+#: xfree86.xml.in.h:349
+msgid "laptop"
+msgstr "skootrekenaar"
+
+#: xfree86.xml.in.h:350
+msgid "lyx"
+msgstr "lyx"
+
+#: xfree86.xml.in.h:351
+msgid "qwerty"
+msgstr "qwerty"
+
+#: xfree86.xml.in.h:352
+msgid "qwerty/digits"
+msgstr "qwerty/syfers"
+
+#: xfree86.xml.in.h:353
+msgid "sefi"
+msgstr "sefi"
+
+#: xfree86.xml.in.h:354
+msgid "si1452"
+msgstr "si1452"
+
+#: xfree86.xml.in.h:355
+msgid "uni/101/qwerty/comma"
+msgstr "uni/101/qwerty/komma"
+
+#: xfree86.xml.in.h:356
+msgid "uni/101/qwerty/dot"
+msgstr "uni/101/qwerty/dot"
+
+#: xfree86.xml.in.h:357
+msgid "uni/101/qwertz/comma"
+msgstr "uni/101/qwertz/komma"
+
+#: xfree86.xml.in.h:358
+msgid "uni/101/qwertz/dot"
+msgstr "uni/101/qwertz/dot"
+
+#: xfree86.xml.in.h:359
+msgid "uni/102/qwerty/comma"
+msgstr "uni/102/qwerty/komma"
+
+#: xfree86.xml.in.h:360
+msgid "uni/102/qwerty/dot"
+msgstr "uni/102/qwerty/dot"
+
+#: xfree86.xml.in.h:361
+msgid "uni/102/qwertz/comma"
+msgstr "uni/102/qwertz/comma"
+
+#: xfree86.xml.in.h:362
+msgid "uni/102/qwertz/dot"
+msgstr "uni/102/qwertz/dot"
diff --git a/xorg-server/xkbdata.src/po/az.po b/xorg-server/xkbdata.src/po/az.po
new file mode 100644
index 000000000..d15d1bf64
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/az.po
@@ -0,0 +1,1465 @@
+# Translation of 'xfree86+xkb+xml' messages to Azerbaijani.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is put in the public domain.
+# Mətin �mirov <metin@karegen.com>, 2004.
+#
+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"
+"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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0.2\n"
+
+#: xfree86.xml.in.h:1
+msgid "\"Typewriter\""
+msgstr "\"Yazı Makinası\""
+
+#: xfree86.xml.in.h:2
+msgid "A Tamil typewrite-style keymap; TAB encoding"
+msgstr "Tamil yazı makinası tərzində düzülüş TAB kodlaması"
+
+#: xfree86.xml.in.h:3
+msgid "A Tamil typewrite-style keymap; TSCII encoding"
+msgstr "Tamil yazı makinası tərzində düzülüş TSCII kodlaması"
+
+#: xfree86.xml.in.h:4
+msgid "A Tamil typewrite-style keymap; Unicode encoding"
+msgstr "Tamil yazı makinası tərzində düzülüş Yunikod kodlaması"
+
+#: xfree86.xml.in.h:5
+msgid "ACPI Standard"
+msgstr "ACPI Standartı"
+
+#: xfree86.xml.in.h:6
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: xfree86.xml.in.h:7
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr "Qıfıllı Shift kimi davranır. Shift Caps-i ləğv edir."
+
+#: xfree86.xml.in.h:8
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "Qıfıllı Shift kimi davranır. Shift Caps-i ləğv etmir."
+
+#: xfree86.xml.in.h:9
+msgid "Add the standard behavior to Menu key."
+msgstr "Menyu düyməsinə standart davranış əlavə et."
+
+#: xfree86.xml.in.h:10
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: xfree86.xml.in.h:11
+msgid "Alb"
+msgstr "Alb"
+
+#: xfree86.xml.in.h:12
+msgid "Albanian"
+msgstr "Albanca"
+
+#: xfree86.xml.in.h:13
+msgid "Alt and Meta on the Alt keys (default)."
+msgstr "Alt düymələri üstündə Alt və Meta (ön qurğulu)."
+
+#: xfree86.xml.in.h:14
+msgid "Alt+Control changes group"
+msgstr "Alt+Control düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:15
+msgid "Alt+Shift changes group"
+msgstr "Alt+Shift düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:16
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win düyməsinin davranışları"
+
+#: xfree86.xml.in.h:17
+msgid "Alternate"
+msgstr "�vəz Et"
+
+#: xfree86.xml.in.h:18
+msgid "Arabic"
+msgstr "�rəbcə"
+
+#: xfree86.xml.in.h:19
+msgid "Arb"
+msgstr "�rb"
+
+#: xfree86.xml.in.h:20
+msgid "Arm"
+msgstr "Erm"
+
+#: xfree86.xml.in.h:21
+msgid "Armenian"
+msgstr "Ermənicə"
+
+#: xfree86.xml.in.h:22
+msgid "Aze"
+msgstr "AzÉ™"
+
+#: xfree86.xml.in.h:23
+msgid "Azerbaijani"
+msgstr "Azərbaycanca"
+
+#: xfree86.xml.in.h:24
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: xfree86.xml.in.h:25
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: xfree86.xml.in.h:26
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: xfree86.xml.in.h:27
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: xfree86.xml.in.h:28
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: xfree86.xml.in.h:29
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: xfree86.xml.in.h:30
+msgid "Basic"
+msgstr "�sas"
+
+#: xfree86.xml.in.h:31
+msgid "Bel"
+msgstr "Bel"
+
+#: xfree86.xml.in.h:32
+msgid "Belarusian"
+msgstr "Belarusca"
+
+#: xfree86.xml.in.h:33
+msgid "Belgian"
+msgstr "Belçikaca"
+
+#: xfree86.xml.in.h:34
+msgid "Ben"
+msgstr "Ben"
+
+#: xfree86.xml.in.h:35
+msgid "Bengali"
+msgstr "Benqalca"
+
+#: xfree86.xml.in.h:36
+msgid "Bgr"
+msgstr "Bgr"
+
+#: xfree86.xml.in.h:37
+msgid "Bih"
+msgstr "Bih"
+
+#: xfree86.xml.in.h:38
+msgid "Blr"
+msgstr "Blr"
+
+#: xfree86.xml.in.h:39
+msgid "Bosnian"
+msgstr "Bosniyaca"
+
+#: xfree86.xml.in.h:40
+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
+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
+msgid "Both Shift keys together change group"
+msgstr "Hər iki Shift düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:43
+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
+msgid "Bra"
+msgstr "Bra"
+
+#: xfree86.xml.in.h:45
+msgid "Brazilian"
+msgstr "Brazilya düzülüşü"
+
+#: xfree86.xml.in.h:46
+msgid "Brazilian ABNT2"
+msgstr "Brazilya düzülüşü ABNT2"
+
+#: xfree86.xml.in.h:47
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: xfree86.xml.in.h:48
+msgid "Bulgarian"
+msgstr "Bolqarca"
+
+#: xfree86.xml.in.h:49
+msgid "Burmese"
+msgstr "Burmaca"
+
+#: xfree86.xml.in.h:50
+msgid "Can"
+msgstr "Kan"
+
+#: xfree86.xml.in.h:51
+msgid "Canadian"
+msgstr "Kanada düzülüşü"
+
+#: xfree86.xml.in.h:52
+msgid "Caps Lock key changes group"
+msgstr "Caps Lock düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:53
+msgid "CapsLock key behavior"
+msgstr "CapsLock düyməsinin davranışı"
+
+#: xfree86.xml.in.h:54
+msgid "Caps_Lock LED shows alternative group"
+msgstr "Caps_Lock LED-ləri alternativ qrupları göstərir"
+
+#: xfree86.xml.in.h:55
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: xfree86.xml.in.h:56
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternate option)"
+
+#: xfree86.xml.in.h:57
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: xfree86.xml.in.h:58
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: xfree86.xml.in.h:59
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: xfree86.xml.in.h:60
+msgid "CloGaelach Laptop"
+msgstr "CloGaelach Laptop"
+
+#: xfree86.xml.in.h:61
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: xfree86.xml.in.h:62
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 düymə)"
+
+#: xfree86.xml.in.h:63
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 düymə)"
+
+#: xfree86.xml.in.h:64
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 düymə)"
+
+#: xfree86.xml.in.h:65
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: xfree86.xml.in.h:66
+msgid "Control Key Position"
+msgstr "Control Düyməsinin Yeri"
+
+#: xfree86.xml.in.h:67
+msgid "Control key at bottom left"
+msgstr "Control düyməsi sol altda"
+
+#: xfree86.xml.in.h:68
+msgid "Control key at left of 'A'"
+msgstr "Control düyməsi 'A' hərfinin solunda"
+
+#: xfree86.xml.in.h:69
+msgid "Control+Shift changes group"
+msgstr "Control+Shift düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:70
+msgid "Croatian"
+msgstr "Xorvatca"
+
+#: xfree86.xml.in.h:71
+msgid "Cyrillic"
+msgstr "Kiril"
+
+#: xfree86.xml.in.h:72
+msgid "Cze"
+msgstr "Çex"
+
+#: xfree86.xml.in.h:73
+msgid "Czech"
+msgstr "Çexcə"
+
+#: xfree86.xml.in.h:74
+msgid "Czech (qwerty)"
+msgstr "Çexcə (qwerty)"
+
+#: xfree86.xml.in.h:75
+msgid "Danish"
+msgstr "Danimarkaca"
+
+#: xfree86.xml.in.h:76
+msgid "Dead acute"
+msgstr "Dead acute"
+
+#: xfree86.xml.in.h:77
+msgid "Dead grave acute"
+msgstr "Dead grave acute"
+
+#: xfree86.xml.in.h:78
+msgid "Dell"
+msgstr "Dell"
+
+#: xfree86.xml.in.h:79
+msgid "Dell 101-key PC"
+msgstr "Dell 101-key PC"
+
+#: xfree86.xml.in.h:80
+msgid "Deu"
+msgstr "Deu"
+
+#: xfree86.xml.in.h:81
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: xfree86.xml.in.h:82
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 seryaları"
+
+#: xfree86.xml.in.h:83
+msgid "Dnk"
+msgstr "Dnk"
+
+#: xfree86.xml.in.h:84
+msgid "Dutch"
+msgstr "Niderlandca"
+
+#: xfree86.xml.in.h:85
+msgid "Dvo"
+msgstr "Dvo"
+
+#: xfree86.xml.in.h:86
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: xfree86.xml.in.h:87
+msgid "Eliminate dead keys"
+msgstr "Ölü düymələri sayma"
+
+#: xfree86.xml.in.h:88
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: xfree86.xml.in.h:89
+msgid "Esp"
+msgstr "Ä°sp"
+
+#: xfree86.xml.in.h:90
+msgid "Est"
+msgstr "Est"
+
+#: xfree86.xml.in.h:91
+msgid "Estonian"
+msgstr "Estonca"
+
+#: xfree86.xml.in.h:92
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: xfree86.xml.in.h:93
+msgid "Extended"
+msgstr "Uzadılmış"
+
+#: xfree86.xml.in.h:94
+msgid "Fao"
+msgstr "Fao"
+
+#: xfree86.xml.in.h:95
+msgid "Faroese"
+msgstr "FaroescÉ™"
+
+#: xfree86.xml.in.h:96
+msgid "Farsi"
+msgstr "Farsca"
+
+#: xfree86.xml.in.h:97
+msgid "Fin"
+msgstr "Fin"
+
+#: xfree86.xml.in.h:98
+msgid "Finnish"
+msgstr "FincÉ™"
+
+#: xfree86.xml.in.h:99
+msgid "Fra"
+msgstr "Fra"
+
+#: xfree86.xml.in.h:100
+msgid "French"
+msgstr "Fransızca"
+
+#: xfree86.xml.in.h:101
+msgid "French (alternative)"
+msgstr "Fransızca (alternativ)"
+
+#: xfree86.xml.in.h:102
+msgid "French Canadian"
+msgstr "Kanada Fransızcası"
+
+#: xfree86.xml.in.h:103
+msgid "GBr"
+msgstr "GBr"
+
+#: xfree86.xml.in.h:104
+msgid "Generic 101-key PC"
+msgstr "Generic 101-key PC"
+
+#: xfree86.xml.in.h:105
+msgid "Generic 102-key (Intl) PC"
+msgstr "Generic 102-key (Intl) PC"
+
+#: xfree86.xml.in.h:106
+msgid "Generic 104-key PC"
+msgstr "Generic 104-key PC"
+
+#: xfree86.xml.in.h:107
+msgid "Generic 105-key (Intl) PC"
+msgstr "Generic 105-key (Intl) PC"
+
+#: xfree86.xml.in.h:108
+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
+msgid "Geo"
+msgstr "Gür"
+
+#: xfree86.xml.in.h:110
+msgid "Georgian (latin)"
+msgstr "Gürcücə (latın)"
+
+#: xfree86.xml.in.h:111
+msgid "Georgian (russian)"
+msgstr "Gürcücə (kiril)"
+
+#: xfree86.xml.in.h:112
+msgid "German"
+msgstr "Almaca"
+
+#: xfree86.xml.in.h:113
+msgid "Grc"
+msgstr "Yun"
+
+#: xfree86.xml.in.h:114
+msgid "Greek"
+msgstr "Yunanca"
+
+#: xfree86.xml.in.h:115
+msgid "Group Shift/Lock behavior"
+msgstr "Shift/Lock Qrupu Davranışı"
+
+#: xfree86.xml.in.h:116
+msgid "Guj"
+msgstr "Guj"
+
+#: xfree86.xml.in.h:117
+msgid "Gujarati"
+msgstr "GujaraticÉ™"
+
+#: xfree86.xml.in.h:118
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: xfree86.xml.in.h:119
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: xfree86.xml.in.h:120
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: xfree86.xml.in.h:121
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: xfree86.xml.in.h:122
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: xfree86.xml.in.h:123
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: xfree86.xml.in.h:124
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: xfree86.xml.in.h:125
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: xfree86.xml.in.h:126
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: xfree86.xml.in.h:127
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: xfree86.xml.in.h:128
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#: xfree86.xml.in.h:129
+msgid "Hin"
+msgstr "Hin"
+
+#: xfree86.xml.in.h:130
+msgid "Hindi"
+msgstr "Hindi"
+
+#: xfree86.xml.in.h:131
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: xfree86.xml.in.h:132
+msgid "Hrv"
+msgstr "Xrv"
+
+#: xfree86.xml.in.h:133
+msgid "Hun"
+msgstr "Mac"
+
+#: xfree86.xml.in.h:134
+msgid "Hungarian"
+msgstr "Macarca"
+
+#: xfree86.xml.in.h:135
+msgid "Hungarian (qwerty)"
+msgstr "Macarca (qwerty)"
+
+#: xfree86.xml.in.h:136
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper Win düymələrinə xəritələnib."
+
+#: xfree86.xml.in.h:137
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: xfree86.xml.in.h:138
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: xfree86.xml.in.h:139
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (alternate option)"
+
+#: xfree86.xml.in.h:140
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: xfree86.xml.in.h:141
+msgid "INSCRIPT layout"
+msgstr "INSCRIPT düzülüşü"
+
+#: xfree86.xml.in.h:142
+msgid "IS434"
+msgstr "IS434"
+
+#: xfree86.xml.in.h:143
+msgid "IS434 laptop"
+msgstr "IS434 laptop"
+
+#: xfree86.xml.in.h:144
+msgid "ISO Alternate"
+msgstr "ISO Alternate"
+
+#: xfree86.xml.in.h:145
+msgid "Icelandic"
+msgstr "Icelandic"
+
+#: xfree86.xml.in.h:146
+msgid "Iku"
+msgstr "Ä°ku"
+
+#: xfree86.xml.in.h:147
+msgid "Inuktitut"
+msgstr "Ä°nuktitut"
+
+#: xfree86.xml.in.h:148
+msgid "Irish"
+msgstr "Ä°rlandca"
+
+#: xfree86.xml.in.h:149
+msgid "Irl"
+msgstr "Ä°rl"
+
+#: xfree86.xml.in.h:150
+msgid "Irn"
+msgstr "Ä°rn"
+
+#: xfree86.xml.in.h:151
+msgid "Isl"
+msgstr "Ä°sl"
+
+#: xfree86.xml.in.h:152
+msgid "Isr"
+msgstr "Ä°sr"
+
+#: xfree86.xml.in.h:153
+msgid "Israeli"
+msgstr "Yəhudicə"
+
+#: xfree86.xml.in.h:154
+msgid "Ita"
+msgstr "Ä°ta"
+
+#: xfree86.xml.in.h:155
+msgid "Italian"
+msgstr "Ä°talyanca"
+
+#: xfree86.xml.in.h:156
+msgid "Japanese"
+msgstr "Yaponca"
+
+#: xfree86.xml.in.h:157
+msgid "Japanese 106-key"
+msgstr "Yaponca 106-düymə"
+
+#: xfree86.xml.in.h:158
+msgid "Jpn"
+msgstr "Ypn"
+
+#: xfree86.xml.in.h:159
+msgid "Kan"
+msgstr "Kan"
+
+#: xfree86.xml.in.h:160
+msgid "Kannada"
+msgstr "Kannada"
+
+#: xfree86.xml.in.h:161
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: xfree86.xml.in.h:162
+msgid "LAm"
+msgstr "LAm"
+
+#: xfree86.xml.in.h:163
+msgid "Laptop"
+msgstr "Laptop"
+
+#: xfree86.xml.in.h:164
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq (məs. Armada) Laptop Klaviaturası"
+
+#: xfree86.xml.in.h:165
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq (məs. Presario) İnternet Klaviaturası"
+
+#: xfree86.xml.in.h:166
+msgid "Laptop/notebook Dell Inspiron 8xxx"
+msgstr "Laptop/notebook Dell Inspiron 8xxx"
+
+#: xfree86.xml.in.h:167
+msgid "Latin"
+msgstr "Latın"
+
+#: xfree86.xml.in.h:168
+msgid "Latin America"
+msgstr "Latın Amerika"
+
+#: xfree86.xml.in.h:169
+msgid "Latvian"
+msgstr "Latışca"
+
+#: xfree86.xml.in.h:170
+msgid "Left Alt key changes group"
+msgstr "Sol Alt düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:171
+msgid "Left Ctrl key changes group"
+msgstr "Sol Ctrl düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:172
+msgid "Left Shift key changes group"
+msgstr "Sol Shift düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:173
+msgid "Left Win-key changes group"
+msgstr "Sol Win düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:174
+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
+msgid "Lithuanian azerty standard"
+msgstr "Litovca azerty standart"
+
+#: xfree86.xml.in.h:176
+msgid "Lithuanian qwerty \"numeric\""
+msgstr "Litovca qwerty \"numeric\""
+
+#: xfree86.xml.in.h:177
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: xfree86.xml.in.h:178
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: xfree86.xml.in.h:179
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: xfree86.xml.in.h:180
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: xfree86.xml.in.h:181
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (alternate option)"
+
+#: xfree86.xml.in.h:182
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (alternate option2)"
+
+#: xfree86.xml.in.h:183
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: xfree86.xml.in.h:184
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: xfree86.xml.in.h:185
+msgid "Logitech Deluxe Access Keyboard"
+msgstr "Logitech Deluxe Access Keyboard"
+
+#: xfree86.xml.in.h:186
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: xfree86.xml.in.h:187
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: xfree86.xml.in.h:188
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: xfree86.xml.in.h:189
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+
+#: xfree86.xml.in.h:190
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr "Logitech iTouch keyboard Internet Navigator"
+
+#: xfree86.xml.in.h:191
+msgid "Ltu"
+msgstr "Ltu"
+
+#: xfree86.xml.in.h:192
+msgid "Lva"
+msgstr "Lva"
+
+#: xfree86.xml.in.h:193
+msgid "Macedonian"
+msgstr "Makedonca"
+
+#: xfree86.xml.in.h:194
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: xfree86.xml.in.h:195
+msgid "Macintosh Old"
+msgstr "Macintosh Old"
+
+#: xfree86.xml.in.h:196
+msgid "Make CapsLock an additional Control"
+msgstr "CapsLock düyməsini əlavə idarə olaraq tə'yin et"
+
+#: xfree86.xml.in.h:197
+msgid "Mal"
+msgstr "Mal"
+
+#: xfree86.xml.in.h:198
+msgid "Malayalam"
+msgstr "Malayalamca"
+
+#: xfree86.xml.in.h:199
+msgid "Maltese"
+msgstr "Maltaca"
+
+#: xfree86.xml.in.h:200
+msgid "Maltese (US layout)"
+msgstr "Maltaca (ABŞ düzülüşü)"
+
+#: xfree86.xml.in.h:201
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: xfree86.xml.in.h:202
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: xfree86.xml.in.h:203
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: xfree86.xml.in.h:204
+msgid "Menu is Compose"
+msgstr "Menyu yazma düyməsidir"
+
+#: xfree86.xml.in.h:205
+msgid "Menu key changes group"
+msgstr "Menü düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:206
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta Win düymələrinə xəritələnib."
+
+#: xfree86.xml.in.h:207
+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
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: xfree86.xml.in.h:209
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Swedish"
+
+#: xfree86.xml.in.h:210
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: xfree86.xml.in.h:211
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: xfree86.xml.in.h:212
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: xfree86.xml.in.h:213
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: xfree86.xml.in.h:214
+msgid "Miscellaneous compatibility options"
+msgstr "Müxtəlif yetişmə qabiliyyəti seçimləri"
+
+#: xfree86.xml.in.h:215
+msgid "Mkd"
+msgstr "Mkd"
+
+#: xfree86.xml.in.h:216
+msgid "Mlt"
+msgstr "Mlt"
+
+#: xfree86.xml.in.h:217
+msgid "Mmr"
+msgstr "Mmr"
+
+#: xfree86.xml.in.h:218
+msgid "Mng"
+msgstr "Mng"
+
+#: xfree86.xml.in.h:219
+msgid "Mongolian"
+msgstr "Monqolca"
+
+#: xfree86.xml.in.h:220
+msgid "Nld"
+msgstr "Nld"
+
+#: xfree86.xml.in.h:221
+msgid "Nor"
+msgstr "Nor"
+
+#: xfree86.xml.in.h:222
+msgid "Northern Saami (Finland)"
+msgstr "Åžimali Saami (Finlandiya)"
+
+#: xfree86.xml.in.h:223
+msgid "Northern Saami (Norway)"
+msgstr "Şimali Saami (Norveç)"
+
+#: xfree86.xml.in.h:224
+msgid "Northern Saami (Sweden)"
+msgstr "Şimali Saami (İsveç)"
+
+#: xfree86.xml.in.h:225
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: xfree86.xml.in.h:226
+msgid "Norwegian"
+msgstr "Norveçcə"
+
+#: xfree86.xml.in.h:227
+msgid "Num_Lock LED shows alternative group"
+msgstr "Num_Lock LED-ləri alternativ qrupları göstərir"
+
+#: xfree86.xml.in.h:228
+msgid "Ogh"
+msgstr "Ogh"
+
+#: xfree86.xml.in.h:229
+msgid "Ogham"
+msgstr "Ogham"
+
+#: xfree86.xml.in.h:230
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/Internet keyboard"
+
+#: xfree86.xml.in.h:231
+msgid "Ori"
+msgstr "Ori"
+
+#: xfree86.xml.in.h:232
+msgid "Oriya"
+msgstr "Oriya"
+
+#: xfree86.xml.in.h:233
+msgid "PC-98xx Series"
+msgstr "PC-98xx Seriyaları"
+
+#: xfree86.xml.in.h:234
+msgid "PC104"
+msgstr "PC104"
+
+#: xfree86.xml.in.h:235
+msgid "Pan"
+msgstr "Pan"
+
+#: xfree86.xml.in.h:236
+msgid "Phonetic"
+msgstr "Fonetik"
+
+#: xfree86.xml.in.h:237
+msgid "Pol"
+msgstr "Pol"
+
+#: xfree86.xml.in.h:238
+msgid "Polish"
+msgstr "Polyakca"
+
+#: xfree86.xml.in.h:239
+msgid "Polish (qwertz)"
+msgstr "Polyakca (qwertz)"
+
+#: xfree86.xml.in.h:240
+msgid "Polytonic"
+msgstr "Politonik"
+
+#: xfree86.xml.in.h:241
+msgid "Portuguese"
+msgstr "Portuqalca"
+
+#: xfree86.xml.in.h:242
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: xfree86.xml.in.h:243
+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
+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
+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
+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
+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
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: xfree86.xml.in.h:249
+msgid "Prt"
+msgstr "Prt"
+
+#: xfree86.xml.in.h:250
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: xfree86.xml.in.h:251
+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
+msgid "Right Alt is Compose"
+msgstr "Sağ Alt düyməsi yazma düyməsidir"
+
+#: xfree86.xml.in.h:253
+msgid "Right Alt key changes group"
+msgstr "Sağ Alt düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:254
+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
+msgid "Right Ctrl key changes group"
+msgstr "Sağ Ctrl düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:256
+msgid "Right Shift key changes group"
+msgstr "Sağ Shift düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:257
+msgid "Right Win-key changes group"
+msgstr "Sağ Win düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:258
+msgid "Right Win-key is Compose"
+msgstr "Sağ Win düyməsi yazma düyməsidir"
+
+#: xfree86.xml.in.h:259
+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
+msgid "Romanian"
+msgstr "Rumınca"
+
+#: xfree86.xml.in.h:261
+msgid "Rou"
+msgstr "Rou"
+
+#: xfree86.xml.in.h:262
+msgid "Rus"
+msgstr "Rus"
+
+#: xfree86.xml.in.h:263
+msgid "Russian"
+msgstr "Rusca"
+
+#: xfree86.xml.in.h:264
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: xfree86.xml.in.h:265
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: xfree86.xml.in.h:266
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: xfree86.xml.in.h:267
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: xfree86.xml.in.h:268
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: xfree86.xml.in.h:269
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: xfree86.xml.in.h:270
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: xfree86.xml.in.h:271
+msgid "Sapmi"
+msgstr "Sapmi"
+
+#: xfree86.xml.in.h:272
+msgid "Scg"
+msgstr "Scg"
+
+#: xfree86.xml.in.h:273
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "Scroll_Lock LED-ləri alternativ qrupları göstərir"
+
+#: xfree86.xml.in.h:274
+msgid "Serbian"
+msgstr "ServcÉ™"
+
+#: xfree86.xml.in.h:275
+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
+msgid "Slovak"
+msgstr "Slovakca"
+
+#: xfree86.xml.in.h:277
+msgid "Slovak (qwerty)"
+msgstr "Slovakca (qwerty)"
+
+#: xfree86.xml.in.h:278
+msgid "Slovenian"
+msgstr "SlovencÉ™"
+
+#: xfree86.xml.in.h:279
+msgid "Sme"
+msgstr "Sme"
+
+#: xfree86.xml.in.h:280
+msgid "Spanish"
+msgstr "Ä°spanca"
+
+#: xfree86.xml.in.h:281
+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."
+
+#: xfree86.xml.in.h:282
+msgid "Standard"
+msgstr "Standart"
+
+#: xfree86.xml.in.h:283
+msgid "Sun dead keys"
+msgstr "Sun ölü düymələr"
+
+#: xfree86.xml.in.h:284
+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
+msgid "Svk"
+msgstr "Svk"
+
+#: xfree86.xml.in.h:287
+msgid "Svn"
+msgstr "Svn"
+
+#: xfree86.xml.in.h:288
+msgid "Swap Control and Caps Lock"
+msgstr "Control və Caps Lock arasında dəyiş"
+
+#: xfree86.xml.in.h:289
+msgid "Swe"
+msgstr "Swe"
+
+#: xfree86.xml.in.h:290
+msgid "Swedish"
+msgstr "İsveçcə"
+
+#: xfree86.xml.in.h:291
+msgid "Swiss French"
+msgstr "İsveçrə Fransızcası"
+
+#: xfree86.xml.in.h:292
+msgid "Swiss German"
+msgstr "İsveçrə Almancası"
+
+#: xfree86.xml.in.h:293
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: xfree86.xml.in.h:294
+msgid "Syr"
+msgstr "Syr"
+
+#: xfree86.xml.in.h:295
+msgid "Syriac"
+msgstr "Syriac"
+
+#: xfree86.xml.in.h:296
+msgid "Tajik"
+msgstr "TacikcÉ™"
+
+#: xfree86.xml.in.h:297
+msgid "Tamil"
+msgstr "TamilcÉ™"
+
+#: xfree86.xml.in.h:298
+msgid "Tel"
+msgstr "Tel"
+
+#: xfree86.xml.in.h:299
+msgid "Telugu"
+msgstr "Telugu"
+
+#: xfree86.xml.in.h:300
+msgid "Tha"
+msgstr "Tay"
+
+#: xfree86.xml.in.h:301
+msgid "Thai (Kedmanee)"
+msgstr "Tayca (Kedmanee)"
+
+#: xfree86.xml.in.h:302
+msgid "Thai (Pattachote)"
+msgstr "Tayca (Pattachote)"
+
+#: xfree86.xml.in.h:303
+msgid "Thai (TIS-820.2538)"
+msgstr "Tayca (TIS-820.2538)"
+
+#: xfree86.xml.in.h:304
+msgid "Third level choosers"
+msgstr "Üçüncü səviyyə seçicilər"
+
+#: xfree86.xml.in.h:305
+msgid "Tjk"
+msgstr "Tac"
+
+#: xfree86.xml.in.h:306
+msgid "Tml"
+msgstr "Tml"
+
+#: xfree86.xml.in.h:307
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: xfree86.xml.in.h:308
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: xfree86.xml.in.h:309
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: xfree86.xml.in.h:310
+msgid "Tur"
+msgstr "Tür"
+
+#: xfree86.xml.in.h:311
+msgid "Turkish"
+msgstr "Türkcə"
+
+#: xfree86.xml.in.h:312
+msgid "Turkish (F)"
+msgstr "Türkcə (F)"
+
+#: xfree86.xml.in.h:313
+msgid "Turkish Alt-Q Layout"
+msgstr "Türkcə Alt-Q Düzülüşü"
+
+#: xfree86.xml.in.h:314
+msgid "U.S. English"
+msgstr "A.B.Ş. İngiliscəsi"
+
+#: xfree86.xml.in.h:315
+msgid "U.S. English w/ ISO9995-3"
+msgstr "A.B.Ş. İngiliscəsi və/ ISO9995-3"
+
+#: xfree86.xml.in.h:316
+msgid "U.S. English w/ dead keys"
+msgstr "A.B.Ş. İngiliscəsi və/ ölü düymələr"
+
+#: xfree86.xml.in.h:317
+msgid "US"
+msgstr "ABÅž"
+
+#: xfree86.xml.in.h:318
+msgid "US keyboard with Romanian letters"
+msgstr "Roman hərfli ABŞ klaviaturası"
+
+#: xfree86.xml.in.h:319
+msgid "USA"
+msgstr "ABÅž"
+
+#: xfree86.xml.in.h:320
+msgid "Ukr"
+msgstr "Ukr"
+
+#: xfree86.xml.in.h:321
+msgid "Ukrainian"
+msgstr "Ukraynaca"
+
+#: xfree86.xml.in.h:322
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: xfree86.xml.in.h:323
+msgid "United Kingdom"
+msgstr "Birləşik Krallıq"
+
+#: xfree86.xml.in.h:324
+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
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr "Daxili kapitalizasiya işlədir. Shift Caps-i ləğv edir."
+
+#: xfree86.xml.in.h:326
+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
+msgid "Uzb"
+msgstr "Özb"
+
+#: xfree86.xml.in.h:328
+msgid "Uzbek"
+msgstr "Özbəkcə"
+
+#: xfree86.xml.in.h:329
+msgid "Vietnamese"
+msgstr "Vyetnamca"
+
+#: xfree86.xml.in.h:330
+msgid "Vnm"
+msgstr "Vye"
+
+#: xfree86.xml.in.h:331
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: xfree86.xml.in.h:332
+msgid "Winkeys"
+msgstr "Winkeys"
+
+#: xfree86.xml.in.h:333
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: xfree86.xml.in.h:334
+msgid "Yug"
+msgstr "Yug"
+
+#: xfree86.xml.in.h:335
+msgid "Yugoslavian"
+msgstr "Yugoslavca"
+
+#: xfree86.xml.in.h:336
+msgid "abnt2"
+msgstr "abnt2"
+
+#: xfree86.xml.in.h:337
+msgid "azerty"
+msgstr "azerty"
+
+#: xfree86.xml.in.h:338
+msgid "azerty/digits"
+msgstr "azerty/ədədlər"
+
+#: xfree86.xml.in.h:339
+msgid "bksl"
+msgstr "bksl"
+
+#: xfree86.xml.in.h:340
+msgid "digits"
+msgstr "ədədlər"
+
+#: xfree86.xml.in.h:341
+msgid "l2/101/qwerty/comma"
+msgstr "l2/101/qwerty/vergül"
+
+#: xfree86.xml.in.h:342
+msgid "l2/101/qwerty/dot"
+msgstr "l2/101/qwerty/nöqtə"
+
+#: xfree86.xml.in.h:343
+msgid "l2/101/qwertz/comma"
+msgstr "l2/101/qwertz/vergül"
+
+#: xfree86.xml.in.h:344
+msgid "l2/101/qwertz/dot"
+msgstr "2/101/qwertz/nöqtə"
+
+#: xfree86.xml.in.h:345
+msgid "l2/102/qwerty/comma"
+msgstr "l2/102/qwerty/vergül"
+
+#: xfree86.xml.in.h:346
+msgid "l2/102/qwerty/dot"
+msgstr "l2/102/qwerty/nöqtə"
+
+#: xfree86.xml.in.h:347
+msgid "l2/102/qwertz/comma"
+msgstr "l2/102/qwertz/vergül"
+
+#: xfree86.xml.in.h:348
+msgid "l2/102/qwertz/dot"
+msgstr "l2/102/qwertz/nöqtə"
+
+#: xfree86.xml.in.h:349
+msgid "laptop"
+msgstr "laptop"
+
+#: xfree86.xml.in.h:350
+msgid "lyx"
+msgstr "lyx"
+
+#: xfree86.xml.in.h:351
+msgid "qwerty"
+msgstr "qwerty"
+
+#: xfree86.xml.in.h:352
+msgid "qwerty/digits"
+msgstr "qwerty/ədədlər"
+
+#: xfree86.xml.in.h:353
+msgid "sefi"
+msgstr "sefi"
+
+#: xfree86.xml.in.h:354
+msgid "si1452"
+msgstr "si1452"
+
+#: xfree86.xml.in.h:355
+msgid "uni/101/qwerty/comma"
+msgstr "uni/101/qwerty/vergül"
+
+#: xfree86.xml.in.h:356
+msgid "uni/101/qwerty/dot"
+msgstr "uni/101/qwerty/nöqtə"
+
+#: xfree86.xml.in.h:357
+msgid "uni/101/qwertz/comma"
+msgstr "uni/101/qwertz/vergül"
+
+#: xfree86.xml.in.h:358
+msgid "uni/101/qwertz/dot"
+msgstr "uni/101/qwertz/nöqtə"
+
+#: xfree86.xml.in.h:359
+msgid "uni/102/qwerty/comma"
+msgstr "uni/102/qwerty/vergül"
+
+#: xfree86.xml.in.h:360
+msgid "uni/102/qwerty/dot"
+msgstr "uni/102/qwerty/nöqtə"
+
+#: xfree86.xml.in.h:361
+msgid "uni/102/qwertz/comma"
+msgstr "uni/102/qwertz/vergül"
+
+#: xfree86.xml.in.h:362
+msgid "uni/102/qwertz/dot"
+msgstr "uni/102/qwertz/nöqtə"
diff --git a/xorg-server/xkbdata.src/po/bg.po b/xorg-server/xkbdata.src/po/bg.po
new file mode 100644
index 000000000..c0f67c0f6
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/bg.po
@@ -0,0 +1,2622 @@
+# Bulgarian translation of xkeyboard-config.
+# Copyright (C) 2002, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+# Alexander Shopov <ash@contact.bg>, 2002, 2005, 2006, 2007, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config-1.4-pre1\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2008-09-15 23:52+0100\n"
+"PO-Revision-Date: 2008-09-19 22:12+0300\n"
+"Last-Translator: Alexander Shopov <ash@contact.bg>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: ../rules/base.xml.in.h:1 ../rules/evdev.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2 ../rules/evdev.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(о�тар�ла) алтернативна"
+
+#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(о�тар�ла) алтернативна, � „мъртви клавиши“ на Sun"
+
+#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(о�тар�ла) алтернативна, без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
+msgid "101/104 key Compatible"
+msgstr "Съвме�тима �ъ� 101/104 клавиша"
+
+#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/запета�/� „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/запета�/без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/точка/� „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/точка/без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/запета�/� „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/запета�/без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/точка/� „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/точка/без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/запета�/� „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/запета�/без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/точка/� „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/точка/без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/запета�/� „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/запета�/без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/точка/� „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/точка/без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:23 ../rules/evdev.xml.in.h:23
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23 (безжична)"
+
+#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
+msgid "ACPI Standard"
+msgstr "Стандартна ACPI"
+
+#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
+msgid "ATM/phone-style hexadecimal keypad"
+msgstr "Цифрова клавиатура — ше�тнай�етична/банкомат/телефон"
+
+#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
+msgid "Acer Laptop"
+msgstr "Acer, за мобилен компютър"
+
+#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
+msgid "Add the EuroSign to the 2 key."
+msgstr "€ е при „2“"
+
+#: ../rules/base.xml.in.h:32 ../rules/evdev.xml.in.h:32
+msgid "Add the EuroSign to the 4 key."
+msgstr "€ е при „4“"
+
+#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "€ е при „5“"
+
+#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "€ е при „E“"
+
+#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "Добав�не на �тандартното поведение на Menu"
+
+#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Добав�не на знака „€“ към н�кои клавиши"
+
+#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38 ../rules/evdev.xml.in.h:38
+msgid "Afg"
+msgstr "�фг"
+
+#: ../rules/base.xml.in.h:39 ../rules/evdev.xml.in.h:39
+msgid "Afghanistan"
+msgstr "афгани�тан�ка"
+
+#: ../rules/base.xml.in.h:40 ../rules/evdev.xml.in.h:40
+msgid "Akan"
+msgstr "акан"
+
+#: ../rules/base.xml.in.h:41 ../rules/evdev.xml.in.h:41
+msgid "Alb"
+msgstr "�лб"
+
+#: ../rules/base.xml.in.h:42 ../rules/evdev.xml.in.h:42
+msgid "Albania"
+msgstr "албан�ка"
+
+#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt-овете отговар�т на Meta и на Alt"
+
+#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Де�ни�т Win е Alt, а Menu — Super"
+
+#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Заедно Alt+CapsLock �мен�т подредбата"
+
+#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Заедно Alt+Ctrl �мен�т подредбата"
+
+#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Заедно Alt+Shift �мен�т подредбата"
+
+#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Поведение на Alt/Win"
+
+#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
+msgid "Alternative"
+msgstr "алтернативна"
+
+#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "алтернативна източна"
+
+#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "алтернативна фонетична"
+
+#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "алтернативна, международна (бившата us_intl)"
+
+#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "алтернативна, � „мъртви клавиши“ на Sun"
+
+#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "алтернативна, без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "алтернативна, �амо латиница-9"
+
+#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
+msgid "And"
+msgstr "�нд"
+
+#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
+msgid "Andorra"
+msgstr "андор�ка"
+
+#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "вариант � апо�троф (')"
+
+#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Apple, за мобилен компютър"
+
+#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+msgid "Ara"
+msgstr "�ра"
+
+#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
+msgid "Arabic"
+msgstr "араб�ка"
+
+#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
+msgid "Arm"
+msgstr "�рм"
+
+#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
+msgid "Armenia"
+msgstr "армен�ка"
+
+#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "а�тур�ки вариант � Ḥ и Ḷ (� точки отдолу)"
+
+#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
+msgid "Asus Laptop"
+msgstr "Asus, за мобилен компютър"
+
+#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
+msgid "Aze"
+msgstr "�зъ"
+
+#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
+msgid "Azerbaijan"
+msgstr "азърбейджан�ка"
+
+#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet Keyboard (безжична, за Интернет)"
+
+#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia (за мултимеди�)"
+
+#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
+
+#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
+msgid "Baltic+"
+msgstr "Baltic+"
+
+#: ../rules/base.xml.in.h:80 ../rules/evdev.xml.in.h:80
+msgid "Ban"
+msgstr "Бан"
+
+#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
+msgid "Bangladesh"
+msgstr "бангладеш�ка"
+
+#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
+msgid "Bel"
+msgstr "Бел"
+
+#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
+msgid "Belarus"
+msgstr "белару�ка"
+
+#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
+msgid "Belgium"
+msgstr "белгий�ка"
+
+#: ../rules/base.xml.in.h:85 ../rules/evdev.xml.in.h:85
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
+msgid "Bengali"
+msgstr "бенгал�ка"
+
+#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
+msgid "Bengali Probhat"
+msgstr "бенгал�ка — пробхат"
+
+#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ергономична, по Дворак"
+
+#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ергономична, по Дворак, �амо латиница-9"
+
+#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+msgid "Bgr"
+msgstr "Бъл"
+
+#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+msgid "Bhu"
+msgstr "Бут"
+
+#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
+msgid "Bhutan"
+msgstr "бутан�ка"
+
+#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
+msgid "Biblical Hebrew (Tiro)"
+msgstr "библей�ки иврит (Тиро)"
+
+#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
+msgid "Bih"
+msgstr "БиХ"
+
+#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
+msgid "Blr"
+msgstr "Бел"
+
+#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
+msgid "Bosnia and Herzegovina"
+msgstr "бо�нен�ка"
+
+#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
+msgid "Both Alt keys together change layout."
+msgstr "Двата Alt-а заедно �мен�т подредбата"
+
+#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
+msgid "Both Ctrl keys together change layout."
+msgstr "Двата Ctrl-а заедно �мен�т подредбата"
+
+#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
+msgid "Both Shift keys together change layout."
+msgstr "Двата Shift-а заедно �мен�т подредбата"
+
+#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
+msgid "Both Win-keys switch layout while pressed."
+msgstr "Двата Win-а заедно �мен�т подредбата докато �а нати�нати"
+
+#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
+msgid "Bra"
+msgstr "Бра"
+
+#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
+msgid "Braille"
+msgstr "брайл"
+
+#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+msgid "Brazil"
+msgstr "бразил�ка"
+
+#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
+msgid "Brazilian ABNT2"
+msgstr "Бразил�ка ABNT2"
+
+#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+msgid "Brl"
+msgstr "Брй"
+
+#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard (за Интернет)"
+
+#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
+msgid "Bulgaria"
+msgstr "българ�ка"
+
+#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
+msgid "Cambodia"
+msgstr "камбоджан�ка"
+
+#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+msgid "Can"
+msgstr "Кан"
+
+#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
+msgid "Canada"
+msgstr "канад�ка"
+
+#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
+msgid "Caps Lock is Compose."
+msgstr "CapsLock функционира като Compose"
+
+#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
+msgid "CapsLock LED shows alternative layout."
+msgstr "Светодиодът на CapsLock указва �м�на на подредбата"
+
+#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "CapsLock работи като Shift �ъ� заключване. Shift отмен� временно CapsLock"
+
+#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "CapsLock работи като Shift �ъ� заключване. Shift не вли�е на CapsLock"
+
+#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
+msgid "CapsLock just locks the Shift modifier."
+msgstr "CapsLock �амо заключва �ъ�то�нието Shift"
+
+#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
+msgid "CapsLock key behavior"
+msgstr "Поведение на CapsLock"
+
+#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
+msgid "CapsLock key changes layout."
+msgstr "CapsLock �мен� подредбата"
+
+#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
+msgid "CapsLock switch to first layout, Shift+CapsLock switch to last layout."
+msgstr "CapsLock �мен� към първата подредба, Shift+CapsLock — към по�ледната"
+
+#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "CapsLock �мен� �ъ�то�нието Shift за в�ички клавиши"
+
+#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "CapsLock �мен� �ъ�то�нието Shift �амо на буквените клавиши"
+
+#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "CapsLock използва вътрешна пром�на на реги�търа. Shift временно отмен� CapsLock"
+
+#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "CapsLock използва вътрешна пром�на на реги�търа. Shift не вли�е на CapsLock"
+
+#: ../rules/base.xml.in.h:126 ../rules/evdev.xml.in.h:126
+msgid "Catalan variant with middle-dot L"
+msgstr "каталун�ки вариант � Ŀ (� точка в �редата)"
+
+#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
+msgid "Cedilla"
+msgstr "�едий"
+
+#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+msgid "Che"
+msgstr "Чех"
+
+#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+msgid "Cherokee"
+msgstr "черок�ка"
+
+#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (алтернативен вариант)"
+
+#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard (за Интернет)"
+
+#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
+msgid "China"
+msgstr "Кит"
+
+#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+msgid "Chuvash"
+msgstr "чувашка"
+
+#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
+msgid "Chuvash Latin"
+msgstr "чувашка, латиница"
+
+#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
+msgid "Classic"
+msgstr "кла�иче�ка"
+
+#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
+msgid "Classic Dvorak"
+msgstr "кла�иче�ка, Дворак"
+
+#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+msgid "Colemak"
+msgstr "коулмак"
+
+#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard (за ле�ен до�тъп)"
+
+#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (за Интернет, 13 допълнителни клавиша)"
+
+#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (за Интернет, 18 допълнителни клавиша)"
+
+#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (за Интернет, 7 допълнителни клавиша)"
+
+#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
+msgid "Compose key position"
+msgstr "Положение на Compose"
+
+#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
+msgid "Congo, Democratic Republic of the"
+msgstr "конгоан�ка (ДРК)"
+
+#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "И двата Win-а функционират като Control (както и клавишите Ctrl)"
+
+#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
+msgid "Croatia"
+msgstr "хърват�ка"
+
+#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
+msgid "Ctrl key at bottom left"
+msgstr "Ctrl е долу вл�во"
+
+#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
+msgid "Ctrl key at left of 'A'"
+msgstr "Ctrl е вл�во от „A“"
+
+#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
+msgid "Ctrl key position"
+msgstr "Положение на Ctrl"
+
+#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
+msgid "Ctrl+Shift change layout."
+msgstr "Заедно Ctrl+Shift �мен�т подредбата"
+
+#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
+msgid "Cyrillic"
+msgstr "кирил�ка"
+
+#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
+msgid "Cyrillic with guillemets"
+msgstr "кирил�ка � френ�ки кавички"
+
+#: ../rules/base.xml.in.h:161 ../rules/evdev.xml.in.h:161
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "кирил�ка � разменени „З“ и „Ж“"
+
+#: ../rules/base.xml.in.h:162 ../rules/evdev.xml.in.h:162
+msgid "Cze"
+msgstr "Чеч"
+
+#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
+msgid "Czechia"
+msgstr "чечен�ка"
+
+#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
+msgid "DRC"
+msgstr "Кнг"
+
+#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
+msgid "Dan"
+msgstr "Дат"
+
+#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
+msgid "Dead acute"
+msgstr "„мъртво ударение“"
+
+#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
+msgid "Dead grave acute"
+msgstr "„мъртво, тежко ударение“"
+
+#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
+msgid "Default numeric keypad keys."
+msgstr "Стандартни клавиши на цифровата клавиатура"
+
+#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
+msgid "Dell 101-key PC"
+msgstr "Клавиатура на Dell �ъ� 101 клавиша за PC"
+
+#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx (за мобилен компютър)"
+
+#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Laptop/notebook Precision M series (за мобилен компютър)"
+
+#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
+msgid "Dell Latitude series laptop"
+msgstr "За прено�им компютър Dell Latitude"
+
+#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB Multimedia Keybard (за мултимеди�)"
+
+#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
+msgid "Denmark"
+msgstr "дат�ка"
+
+#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
+msgid "Deu"
+msgstr "�ем"
+
+#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard (безжична)"
+
+#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801/9802 series"
+
+#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+msgid "Dvorak"
+msgstr "Дворак"
+
+#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+msgid "Dvorak (UK Punctuation)"
+msgstr "Дворак, (пунктуаци� на Обединеното крал�тво)"
+
+#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+msgid "Dvorak international"
+msgstr "Дворак, международна"
+
+#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Дворак, пол�ки кавички на клавиша „1/!“"
+
+#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Дворак, пол�ки кавички на клавиша за кавички"
+
+#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
+msgid "Eastern"
+msgstr "източна"
+
+#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
+msgid "Eliminate dead keys"
+msgstr "без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
+msgid "Epo"
+msgstr "Е�п"
+
+#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
+msgid "Ergonomic"
+msgstr "ергономична"
+
+#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
+msgid "Esp"
+msgstr "И�п"
+
+#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
+msgid "Esperanto"
+msgstr "е�перант�ка"
+
+#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+msgid "Est"
+msgstr "Е�т"
+
+#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
+msgid "Estonia"
+msgstr "е�тон�ка"
+
+#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
+msgid "Eth"
+msgstr "Ети"
+
+#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+msgid "Ethiopia"
+msgstr "етиоп�ка"
+
+#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
+msgid "Evdev-managed keyboard"
+msgstr "Клавиатура управл�вана от Evdev"
+
+#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
+msgid "Ewe"
+msgstr "еве"
+
+#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
+msgid "Extended"
+msgstr "разширена"
+
+#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
+msgid "Extended Backslash"
+msgstr "удължен Backslash"
+
+#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
+msgid "F-letter (F) variant"
+msgstr "вариант � буква F (F)"
+
+#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
+msgid "Fao"
+msgstr "Фар"
+
+#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
+msgid "Faroe Islands"
+msgstr "фарьор�ка"
+
+#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
+msgid "Fin"
+msgstr "Фин"
+
+#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
+msgid "Finland"
+msgstr "финланд�ка"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
+msgid "Four-level key with abstract separators"
+msgstr "Клавиш на четири нива � аб�трактни разделители"
+
+#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
+msgid "Four-level key with comma"
+msgstr "Клавиш на четири нива � де�етична запета�"
+
+#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
+msgid "Four-level key with dot"
+msgstr "Клавиш на четири нива � де�етична точка"
+
+#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+msgid "Four-level key with momayyez"
+msgstr "Клавиш на четири нива � араб�ка де�етична запета�"
+
+#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
+msgid "Fra"
+msgstr "Фре"
+
+#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
+msgid "France"
+msgstr "френ�ка"
+
+#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
+msgid "French"
+msgstr "френ�ка"
+
+#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
+msgid "French (Macintosh)"
+msgstr "френ�ка (за Macintosh)"
+
+#: ../rules/base.xml.in.h:219 ../rules/evdev.xml.in.h:219
+msgid "French (legacy)"
+msgstr "френ�ка (о�тар�ла)"
+
+#: ../rules/base.xml.in.h:220 ../rules/evdev.xml.in.h:220
+msgid "French Dvorak"
+msgstr "френ�ка Дворак"
+
+#: ../rules/base.xml.in.h:221 ../rules/evdev.xml.in.h:221
+msgid "French, Sun dead keys"
+msgstr "френ�ка, � „мъртвите клавиши“ на Sun"
+
+#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
+msgid "French, eliminate dead keys"
+msgstr "френ�ка, без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
+msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
+msgstr "Fujitsu-Siemens Computers AMILO A1667G laptop (за мобилен компютър)"
+
+#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
+msgid "Fula"
+msgstr "фула"
+
+#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
+msgid "GBr"
+msgstr "ВБр"
+
+#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
+msgid "Ga"
+msgstr "га"
+
+#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
+msgid "Generic 101-key PC"
+msgstr "Стандартна клавиатура за PC �ъ� 101 клавиша"
+
+#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
+msgid "Generic 102-key (Intl) PC"
+msgstr "Стандартна клавиатура за PC �ъ� 102 клавиша (международна)"
+
+#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
+msgid "Generic 104-key PC"
+msgstr "Стандартна клавиатура за PC �ъ� 104 клавиша"
+
+#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
+msgid "Generic 105-key (Intl) PC"
+msgstr "Стандартна клавиатура за PC �ъ� 105 клавиша (международна)"
+
+#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M/Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
+msgid "Geo"
+msgstr "Гру"
+
+#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
+msgid "Georgia"
+msgstr "грузин�ка"
+
+#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
+msgid "Georgian"
+msgstr "грузин�ка"
+
+#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
+msgid "Georgian AZERTY Tskapo"
+msgstr "грузин�ка, цкапо azerty"
+
+#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
+msgid "German (Macintosh)"
+msgstr "нем�ка (за Macintosh)"
+
+#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
+msgid "German, Sun dead keys"
+msgstr "нем�ка, � „мъртви клавиши“ на Sun"
+
+#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
+msgid "German, eliminate dead keys"
+msgstr "нем�ка, без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
+msgid "Germany"
+msgstr "нем�ка"
+
+#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
+msgid "Gha"
+msgstr "Ган"
+
+#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
+msgid "Ghana"
+msgstr "ганий�ка"
+
+#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
+msgid "Gre"
+msgstr "Гръ"
+
+#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
+msgid "Greece"
+msgstr "гръцка"
+
+#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
+msgid "Group toggle on multiply/divide key"
+msgstr "�мен�не на �ъ�то�нието при нати�кането на умножение/деление"
+
+#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
+msgid "Gui"
+msgstr "гвй"
+
+#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
+msgid "Guinea"
+msgstr "гвиней�ка"
+
+#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
+msgid "Gujarati"
+msgstr "гуджарати"
+
+#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
+msgid "Gurmukhi"
+msgstr "гурмуки"
+
+#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
+msgid "Gurmukhi Jhelum"
+msgstr "гурмуки джелум"
+
+#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking Keyboard (за ве�ело хакер�тване)"
+
+#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking Keyboard for Mac (за ве�ело хакер�тване)"
+
+#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
+msgid "Hausa"
+msgstr "хау�ка"
+
+#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard (за Интернет)"
+
+#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
+msgid "Hewlett-Packard Internet Keyboard 5181"
+msgstr "Hewlett-Packard Internet Keyboard 5181 (за Интернет)"
+
+#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
+msgid "Hewlett-Packard Internet Keyboard 5185"
+msgstr "Hewlett-Packard Internet Keyboard 5185 (за Интернет)"
+
+#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard (за мултимеди�)"
+
+#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Keyboard (за Интернет)"
+
+#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
+msgid "Hindi Bolnagri"
+msgstr "фонетична Болнагри за хинди"
+
+#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
+msgid "Homophonic"
+msgstr "фонетична"
+
+#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
+msgid "Hrv"
+msgstr "Хър"
+
+#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
+msgid "Hun"
+msgstr "Унг"
+
+#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
+msgid "Hungary"
+msgstr "унгар�ка"
+
+#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
+msgid "Hyper is mapped to the Win-keys."
+msgstr "И двата Win-а функционират като Hyper"
+
+#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (алтернативна)"
+
+#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
+
+#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl (международна)"
+
+#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+msgid "ISO Alternate"
+msgstr "ISO (алтернативна)"
+
+#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
+msgid "Iceland"
+msgstr "и�ланд�ка"
+
+#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
+msgid "Igbo"
+msgstr "игбо"
+
+#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
+msgid "Ind"
+msgstr "Инд"
+
+#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+msgid "India"
+msgstr "индий�ка"
+
+#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
+msgid "International (AltGr dead keys)"
+msgstr "международна, � „мъртви клавиши“ чрез AltGr"
+
+#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
+msgid "International (with dead keys)"
+msgstr "международна, � „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+msgid "Inuktitut"
+msgstr "е�кимо�ка"
+
+#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+msgid "Iran"
+msgstr "иран�ка"
+
+#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
+msgid "Iraq"
+msgstr "ирак�ка"
+
+#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
+msgid "Ireland"
+msgstr "ирланд�ка"
+
+#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
+msgid "Irl"
+msgstr "Ирл"
+
+#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+msgid "Irn"
+msgstr "Ирн"
+
+#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
+msgid "Irq"
+msgstr "Ирк"
+
+#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
+msgid "Isl"
+msgstr "И�л"
+
+#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
+msgid "Isr"
+msgstr "Изр"
+
+#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
+msgid "Israel"
+msgstr "израел�ка"
+
+#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
+msgid "Ita"
+msgstr "Ита"
+
+#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
+msgid "Italy"
+msgstr "италиан�ка"
+
+#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
+msgid "Japan"
+msgstr "�пон�ка"
+
+#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
+msgid "Japan (PC-98xx Series)"
+msgstr "�пон�ка, �ерии PC-98xx"
+
+#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
+msgid "Japanese 106-key"
+msgstr "Япон�ка �ъ� 106 клавиша"
+
+#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
+msgid "Japanese keyboard options"
+msgstr "�а�тройки за �пон�ка клавиатура"
+
+#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
+msgid "Jpn"
+msgstr "Япо"
+
+#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
+msgid "Kana"
+msgstr "�пон�ка �ричкова (кана)"
+
+#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
+msgid "Kana Lock key is locking"
+msgstr "Клавишът Lock на кана заключва"
+
+#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
+msgid "Kannada"
+msgstr "канаре�ка"
+
+#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
+msgid "Kashubian"
+msgstr "кашуб�ка"
+
+#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
+msgid "Kaz"
+msgstr "Каз"
+
+#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
+msgid "Kazakh with Russian"
+msgstr "казах�ка � ру�ки букви"
+
+#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
+msgid "Kazakhstan"
+msgstr "казах�ка"
+
+#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
+msgid "Keypad"
+msgstr "цифрова клавиатура"
+
+#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
+msgid "Keypad with unicode additions (arrows and math operators)"
+msgstr "Цифрова клавиатура � допълнени�та от Уникод (�трелки и математиче�ки операции)"
+
+#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
+msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Цифрова клавиатура � допълнени�та от Уникод (�трелки и математиче�ки операции). Операциите �а на �тандартното ниво"
+
+#: ../rules/base.xml.in.h:320 ../rules/evdev.xml.in.h:320
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
+msgid "Khm"
+msgstr "Кам"
+
+#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
+msgid "Kir"
+msgstr "Кир"
+
+#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
+msgid "Komi"
+msgstr "ком�ка"
+
+#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
+msgid "Kor"
+msgstr "Кор"
+
+#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
+msgid "Korea, Republic of"
+msgstr "корей�ка (Република Коре�)"
+
+#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
+msgid "Korean 106-key"
+msgstr "Корей�ка �ъ� 106 клавиша"
+
+#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
+msgid "Ktunaxa"
+msgstr "ктунак�а"
+
+#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+msgid "Kurdish, (F)"
+msgstr "кюрд�ка, (Ф)"
+
+#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+msgid "Kurdish, Arabic-Latin"
+msgstr "кюрд�ка, араб�ки и латин�ки букви"
+
+#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+msgid "Kurdish, Latin Alt-Q"
+msgstr "кюрд�ка, латин�ка Alt-Q"
+
+#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
+msgid "Kurdish, Latin Q"
+msgstr "кюрдк�а, латин�ко Q"
+
+#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
+msgid "Kyrgyzstan"
+msgstr "кирги�тан�ка"
+
+#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
+msgid "LAm"
+msgstr "Л�м"
+
+#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
+msgid "LCtrl+LShift change layout."
+msgstr "Заедно левите Ctrl+Shift �мен�т подредбата"
+
+#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
+msgid "LEKP"
+msgstr "LEKP"
+
+#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
+msgid "LEKPa"
+msgstr "LEKPa"
+
+#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
+msgid "Lao"
+msgstr "Лао"
+
+#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
+msgid "Laos"
+msgstr "лао�ка"
+
+#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq Laptop Keyboard (за мобилен компютър, напр. Armada)"
+
+#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq Internet Keyboard (за мобилен компютър, напр. Presario, и Интернет)"
+
+#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Laptop/notebook eMachines m68xx (за мобилен компютър)"
+
+#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
+msgid "Latin"
+msgstr "латин�ка"
+
+#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
+msgid "Latin American"
+msgstr "латиноамерикан�ка"
+
+#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
+msgid "Latin Unicode"
+msgstr "латин�ка за Уникод"
+
+#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
+msgid "Latin Unicode qwerty"
+msgstr "латин�ка за Уникод (qwerty)"
+
+#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
+msgid "Latin qwerty"
+msgstr "латин�ка (qwerty)"
+
+#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
+msgid "Latin unicode"
+msgstr "латин�ка за Уникод"
+
+#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
+msgid "Latin unicode qwerty"
+msgstr "латин�ка за Уникод, qwerty"
+
+#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
+msgid "Latin with guillemets"
+msgstr "латин�ка � френ�ки кавички"
+
+#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
+msgid "Latvia"
+msgstr "латвий�ка"
+
+#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
+msgid "Lav"
+msgstr "Лат"
+
+#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
+msgid "Layout switching"
+msgstr "См�на на подредбата"
+
+#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
+msgid "Left Alt is swapped with left Win-key."
+msgstr "Леви�т Alt е разменен � леви� Win"
+
+#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
+msgid "Left Alt key changes layout."
+msgstr "Де�ни�т Alt �мен� подредбата"
+
+#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
+msgid "Left Alt key switches layout while pressed."
+msgstr "Леви�т Alt �мен� подредбата докато е нати�нат"
+
+#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
+msgid "Left Ctrl key changes layout."
+msgstr "Леви�т Ctrl �мен� подредбата"
+
+#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
+msgid "Left Shift key changes layout."
+msgstr "Леви�т Shift �мен� подредбата"
+
+#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
+msgid "Left Win-key changes layout."
+msgstr "Леви�т Win �мен� подредбата"
+
+#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
+msgid "Left Win-key is Compose."
+msgstr "Леви�т Win функционира като Compose"
+
+#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
+msgid "Left Win-key switches layout while pressed."
+msgstr "Леви�т Win �мен� подредбата докато е нати�нат"
+
+#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
+msgid "Left hand"
+msgstr "за левичари"
+
+#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
+msgid "Left handed Dvorak"
+msgstr "Дворак за левичари"
+
+#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+msgid "Legacy"
+msgstr "о�тар�ла"
+
+#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
+msgid "Legacy Wang 724 keypad"
+msgstr "О�тар�ла цифрова клавиатура — Wang 724"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+msgid "Legacy key with comma"
+msgstr "О�тар�л клавиш � де�етична запета�"
+
+#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+msgid "Legacy key with dot"
+msgstr "О�тар�л клавиш � де�етична точка"
+
+#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
+msgid "Legacy keypad"
+msgstr "О�тар�ла цифрова клавиатура"
+
+#: ../rules/base.xml.in.h:369 ../rules/evdev.xml.in.h:369
+msgid "Less-than/Greater-than is Compose."
+msgstr "⋚ функционира като Compose"
+
+#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+msgid "Lithuania"
+msgstr "литов�ка"
+
+#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop (безжична)"
+
+#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (алтернативен вариант)"
+
+#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:375 ../rules/evdev.xml.in.h:375
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300 (безжична)"
+
+#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator (безжична)"
+
+#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical (оптична)"
+
+#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (безжична, алтернативен вариант 2)"
+
+#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch (безжична)"
+
+#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator (безжична)"
+
+#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15, допълнителни клавиши чрез G15daemon"
+
+#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech Generic Keyboard (�тандартна)"
+
+#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Keyboard (за Интернет)"
+
+#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard (за Интернет)"
+
+#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard (за Интернет)"
+
+#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite Keyboard"
+
+#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard (безжична, за мултимеди�)"
+
+#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Keyboard"
+
+#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6) (безжична)"
+
+#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (за Интернет)"
+
+#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB) (за Интернет)"
+
+#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
+msgid "Ltu"
+msgstr "Лит"
+
+#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
+msgid "MNE"
+msgstr "Чгр"
+
+#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (международна)"
+
+#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
+msgid "Macedonia"
+msgstr "македон�ка"
+
+#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
+msgid "Macintosh Old"
+msgstr "Macintosh Old (�тар вариант)"
+
+#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, � „мъртви клавиши“ на Sun"
+
+#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
+msgid "Make CapsLock an additional Ctrl."
+msgstr "CapsLock функционира като допълнителен Ctrl"
+
+#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
+msgid "Mal"
+msgstr "Млд"
+
+#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
+msgid "Malayalam"
+msgstr "мала�лам�ка"
+
+#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
+msgid "Malayalam Lalitha"
+msgstr "мала�лам�ка лалита"
+
+#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
+msgid "Maldives"
+msgstr "малдив�ка"
+
+#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
+msgid "Malta"
+msgstr "малтий�ка"
+
+#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
+msgid "Maltese keyboard with US layout"
+msgstr "малтий�ка � американ�ка подредба"
+
+#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
+msgid "Mao"
+msgstr "Мао"
+
+#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
+msgid "Maori"
+msgstr "маор�ка"
+
+#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard (за ле�ен до�тъп)"
+
+#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
+msgid "Menu is Compose."
+msgstr "Menu функционира като Compose"
+
+#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
+msgid "Menu key changes layout."
+msgstr "Menu �мен� подредбата"
+
+#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
+msgid "Meta is mapped to the Win-keys."
+msgstr "И двата Win-а функционират като Meta"
+
+#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
+msgid "Meta is mapped to the left Win-key."
+msgstr "Леви�т Win функционира като Meta"
+
+#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard (за Интернет)"
+
+#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Swedish (за Интернет, швед�ка)"
+
+#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
+
+#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro/Microsoft Internet Keyboard Pro (за Интернет)"
+
+#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB/Microsoft Internet Keyboard Pro (за Интернет)"
+
+#: ../rules/base.xml.in.h:428 ../rules/evdev.xml.in.h:428
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard (за офи�а)"
+
+#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A (безжична, за мултимеди�)"
+
+#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+msgid "Miscellaneous compatibility options"
+msgstr "Разни на�тройки за �ъвме�тимо�т"
+
+#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+msgid "Mkd"
+msgstr "Мак"
+
+#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+msgid "Mlt"
+msgstr "Мал"
+
+#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+msgid "Mmr"
+msgstr "Миа"
+
+#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
+msgid "Mng"
+msgstr "Мон"
+
+#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
+msgid "Mongolia"
+msgstr "монгол�ка"
+
+#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
+msgid "Montenegro"
+msgstr "черногор�ка"
+
+#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
+msgid "Morocco"
+msgstr "марокан�ка"
+
+#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
+msgid "Multilingual"
+msgstr "многоезична"
+
+#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
+msgid "Multilingual, first part"
+msgstr "многоезична, първа ча�т"
+
+#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
+msgid "Multilingual, second part"
+msgstr "многоезична, втора ча�т"
+
+#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+msgid "Myanmar"
+msgstr "мианмар�ка"
+
+#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
+msgid "NICOLA-F style Backspace"
+msgstr "Backspace на м��тото определено от подредбата NICOLA-F"
+
+#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
+msgid "Neostyle"
+msgstr "ново�тилна"
+
+#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
+msgid "Nep"
+msgstr "�еп"
+
+#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
+msgid "Nepal"
+msgstr "непал�ка"
+
+#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
+msgid "Netherlands"
+msgstr "холанд�ка"
+
+#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
+msgid "Nig"
+msgstr "�иг"
+
+#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
+msgid "Nigeria"
+msgstr "нигерий�ка"
+
+#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
+msgid "Nld"
+msgstr "Хол"
+
+#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
+msgid "Nor"
+msgstr "�ор"
+
+#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
+msgid "Northern Saami"
+msgstr "�еверно�ам�ка (�орвеги�)"
+
+#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
+msgid "Northern Saami, eliminate dead keys"
+msgstr "�еверно�ам�ка, без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
+msgid "Norway"
+msgstr "норвежка"
+
+#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
+msgid "NumLock LED shows alternative layout."
+msgstr "Свeтодиодът на NumLock указва �м�на на подредбата"
+
+#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
+msgid "Numeric keypad delete key behaviour"
+msgstr "Поведение на клавиша за триене на цифровата клавиатура"
+
+#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
+msgid "Numeric keypad keys work as with Mac."
+msgstr "Цифровата клавиатура функционира като в Macintosh"
+
+#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
+msgid "Numeric keypad layout selection"
+msgstr "Избор на подредбата на цифровата клавиатура"
+
+#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
+msgid "OLPC"
+msgstr "OLPC"
+
+#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
+msgid "OLPC Dari"
+msgstr "дарий�ка за OLPC (фар�и)"
+
+#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
+msgid "OLPC Pashto"
+msgstr "пащун�ка за OLPC"
+
+#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
+msgid "OLPC Southern Uzbek"
+msgstr "южно узбек�ка за OLPC"
+
+#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
+msgid "Ogham"
+msgstr "огам�ка"
+
+#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
+msgid "Ogham IS434"
+msgstr "огам�ка IS434"
+
+#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
+msgid "Oriya"
+msgstr "орий�ка"
+
+#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet keyboard (за Интернет)"
+
+#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+msgid "Ossetian"
+msgstr "о�етин�ка"
+
+#: ../rules/base.xml.in.h:469 ../rules/evdev.xml.in.h:469
+msgid "Ossetian, Winkeys"
+msgstr "о�етин�ка, клавиши Win"
+
+#: ../rules/base.xml.in.h:470 ../rules/evdev.xml.in.h:470
+msgid "Ossetian, legacy"
+msgstr "о�етин�ка, о�тар�ла"
+
+#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+msgid "PC-98xx Series"
+msgstr "Серии PC-98xx"
+
+#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+msgid "Pak"
+msgstr "Пак"
+
+#: ../rules/base.xml.in.h:473 ../rules/evdev.xml.in.h:473
+msgid "Pakistan"
+msgstr "паки�тан�ка"
+
+#: ../rules/base.xml.in.h:474 ../rules/evdev.xml.in.h:474
+msgid "Pashto"
+msgstr "пащун�ка"
+
+#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
+msgid "Pattachote"
+msgstr "патачот�ка"
+
+#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
+msgid "Phonetic"
+msgstr "фонетична"
+
+#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
+msgid "Pol"
+msgstr "Пол"
+
+#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
+msgid "Poland"
+msgstr "пол�ка"
+
+#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
+msgid "Polytonic"
+msgstr "политонална"
+
+#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+msgid "Portugal"
+msgstr "португал�ка"
+
+#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Леви�т Alt избира третото ниво"
+
+#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Леви�т Win избира третото ниво"
+
+#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
+msgid "Press Menu key to choose 3rd level."
+msgstr "Menu избира третото ниво"
+
+#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "Де�ни�т Alt избира третото ниво, Shift+де�ни�т Alt функционират като клавиша Multi"
+
+#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Де�ни�т Alt избира третото ниво"
+
+#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Де�ни�т Ctrl избира третото ниво"
+
+#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Де�ни�т Win избира третото ниво"
+
+#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "В�еки от двата Alt-а избира третото ниво"
+
+#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "В�еки от двата Win-а избира третото ниво"
+
+#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
+msgid "Pro"
+msgstr "про"
+
+#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
+msgid "Pro Keypad"
+msgstr "цифрова клавиатура про"
+
+#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
+msgid "Probhat"
+msgstr "пробхат�ка"
+
+#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
+msgid "Programmer Dvorak"
+msgstr "Дворак за програми�ти"
+
+#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+msgid "Prt"
+msgstr "Пор"
+
+#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
+msgid "R-Alt switches layout while pressed."
+msgstr "Де�ни�т Alt �мен� подредбата докато е нати�нат"
+
+#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
+msgid "Right Alt is Compose."
+msgstr "Де�ни�т Alt функционира като Compose"
+
+#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
+msgid "Right Alt key changes layout."
+msgstr "Де�ни�т Alt �мен� подредбата"
+
+#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
+msgid "Right Alt key never chooses 3rd level."
+msgstr "Де�ни�т Alt никога не избира третото ниво"
+
+#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
+msgid "Right Ctrl is Compose."
+msgstr "Де�ни�т Ctrl функционира като Compose"
+
+#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
+msgid "Right Ctrl key changes layout."
+msgstr "Де�ни�т Ctrl �мен� подредбата"
+
+#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "Де�ни�т Ctrl �мен� подредбата докато е нати�нат"
+
+#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Де�ни�т Ctrl функционира като де�ен Alt"
+
+#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
+msgid "Right Shift key changes layout."
+msgstr "Де�ни�т Shift �мен� подредбата"
+
+#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
+msgid "Right Win-key changes layout."
+msgstr "Де�ни�т Win �мен� подредбата"
+
+#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
+msgid "Right Win-key is Compose."
+msgstr "Де�ни�т Win функционира като Compose"
+
+#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
+msgid "Right Win-key switches layout while pressed."
+msgstr "Де�ни�т Win �мен� подредбата докато е нати�нат"
+
+#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+msgid "Right hand"
+msgstr "за де�ничари"
+
+#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
+msgid "Right handed Dvorak"
+msgstr "Дворак за де�ничари"
+
+#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
+msgid "Romania"
+msgstr "румън�ка"
+
+#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
+msgid "Romanian keyboard with German letters"
+msgstr "румън�ка клавиатура � нем�ки букви"
+
+#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "румън�ка клавиатура � нем�ки букви, без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+msgid "Rou"
+msgstr "Рум"
+
+#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+msgid "Rus"
+msgstr "Ру�"
+
+#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+msgid "Russia"
+msgstr "ру�ка"
+
+#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+msgid "Russian"
+msgstr "ру�ка"
+
+#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+msgid "Russian phonetic"
+msgstr "ру�ка фонетична"
+
+#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+msgid "Russian phonetic Dvorak"
+msgstr "ру�ка фонетична, Дворак"
+
+#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "ру�ка фонетична, без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+msgid "Russian with Kazakh"
+msgstr "ру�ка � казах�ки букви"
+
+#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard (безжична, за мултимеди�)"
+
+#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
+msgid "SRB"
+msgstr "Срб"
+
+#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500 (ергономична)"
+
+#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
+msgid "ScrollLock LED shows alternative layout."
+msgstr "Светодиодът на ScrollLock указва �м�на на подредбата"
+
+#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
+msgid "Secwepemctsin"
+msgstr "шъкуъпмъктчин"
+
+#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
+msgid "Serbia"
+msgstr "�ръб�ка"
+
+#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
+msgid "Shift cancels CapsLock."
+msgstr "Shift отмен� CapsLock"
+
+#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "Shift функционира � цифровата клавиатура както в MS Windows"
+
+#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
+msgid "Shift+CapsLock changes layout."
+msgstr "Заедно Shift+CapsLock �мен�т подредбата"
+
+#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
+msgid "Simple"
+msgstr "Обикновена"
+
+#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
+msgid "Slovakia"
+msgstr "�ловашка"
+
+#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
+msgid "Slovenia"
+msgstr "�ловен�ка"
+
+#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
+msgid "South Africa"
+msgstr "южноафрикан�ка"
+
+#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
+msgid "Southern Uzbek"
+msgstr "южно узбек�ка"
+
+#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Интервал без раздел�не на четвърто ниво и те�ен интервал без раздел�не на ше�то ниво"
+
+#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift"
+msgstr "Интервал без раздел�не на четвърто ниво и те�ен интервал без раздел�не на ше�то ниво (� Ctrl+Shift)"
+
+#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr "Интервал без раздел�не на четвърто ниво"
+
+#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
+msgid "Space key outputs non-breakable space character at second level."
+msgstr "Интервал без раздел�не на второ ниво"
+
+#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr "Интервал без раздел�не на трето ниво и нищо на четвърто ниво"
+
+#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Интервал без раздел�не на трето ниво и те�ен интервал без раздел�не на четвърто ниво"
+
+#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
+msgid "Space key outputs non-breakable space character at third level."
+msgstr "Интервал без раздел�не на трето ниво"
+
+#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
+msgid "Space key outputs usual space at any level."
+msgstr "Интервал на в�ички нива"
+
+#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+msgid "Spain"
+msgstr "и�пан�ка"
+
+#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Специалните комбинации (Ctrl+Alt+&lt;клавиш&gt;) �е обработват от �ървъра"
+
+#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+msgid "SrL"
+msgstr "Шри"
+
+#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
+msgid "Sri Lanka"
+msgstr "шриланк�ка"
+
+#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
+msgid "Standard"
+msgstr "�тандартна"
+
+#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
+msgid "Standard (Cedilla)"
+msgstr "�тандартна (�едий)"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
+msgid "Standard RSTU"
+msgstr "�тандартна украин�ка"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:560 ../rules/evdev.xml.in.h:560
+msgid "Standard RSTU on Russian layout"
+msgstr "�тандартна украин�ка, ру�ка подредба"
+
+#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
+msgid "Sun Type 5/6"
+msgstr "�а Sun, вид 5/6"
+
+#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
+msgid "Sun dead keys"
+msgstr "Sun, без „мъртви клавиши“"
+
+#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard (за мултимеди�)"
+
+#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
+msgid "Super is mapped to the Win-keys."
+msgstr "И двата Win-а функционират като Super"
+
+#: ../rules/base.xml.in.h:565 ../rules/evdev.xml.in.h:565
+msgid "Svdvorak"
+msgstr "Свдворак"
+
+#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
+msgid "Svk"
+msgstr "Свш"
+
+#: ../rules/base.xml.in.h:567 ../rules/evdev.xml.in.h:567
+msgid "Svn"
+msgstr "Свн"
+
+#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
+msgid "Swap Ctrl and CapsLock."
+msgstr "Разм�на на Ctrl и CapsLock"
+
+#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
+msgid "Swap ESC and CapsLock."
+msgstr "Разм�на на Esc и CapsLock"
+
+#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr "Разм�на на кодовете на два клавиша, когато клавиатурите за Macintosh �а разпознати неправилно от �дрото"
+
+#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
+msgid "Swe"
+msgstr "Шве"
+
+#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+msgid "Sweden"
+msgstr "швед�ка"
+
+#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
+msgid "Switzerland"
+msgstr "швейцар�ка"
+
+#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (за таблет)"
+
+#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
+msgid "Syr"
+msgstr "Сир"
+
+#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+msgid "Syria"
+msgstr "�ирий�ка"
+
+#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+msgid "Syriac"
+msgstr "�ириак�ка (арамей�ка)"
+
+#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
+msgid "Syriac phonetic"
+msgstr "�ириак�ка фонетична (арамей�ка)"
+
+#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
+msgid "Tajikistan"
+msgstr "таджик�ка"
+
+#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
+msgid "Tamil"
+msgstr "тамил�ка"
+
+#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
+msgid "Tamil TAB Typewriter"
+msgstr "тамил�ка машинопи�на � табулаци�"
+
+#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
+msgid "Tamil TSCII Typewriter"
+msgstr "тамил�ка машинопи�на — TSCII"
+
+#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
+msgid "Tamil Unicode"
+msgstr "тамил�ка за Уникод"
+
+#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
+msgid "Tatar"
+msgstr "татар�ка"
+
+#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
+msgid "Telugu"
+msgstr "телугу"
+
+#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
+msgid "Tha"
+msgstr "Тай"
+
+#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
+msgid "Thailand"
+msgstr "тайланд�ка"
+
+#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
+msgid "Third level choosers"
+msgstr "Избор на третото ниво"
+
+#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
+msgid "Tibetan"
+msgstr "тибет�ка"
+
+#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
+msgid "Tibetan (with ASCII numerals)"
+msgstr "тибет�ка (� цифри от ASCII)"
+
+#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+msgid "Tifinagh"
+msgstr "тифинах"
+
+#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
+msgid "Tifinagh Alternative"
+msgstr "алтернативна за тифинах"
+
+#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
+msgid "Tifinagh Alternative Phonetic"
+msgstr "алтернативна, фонетична за тифинах"
+
+#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
+msgid "Tifinagh Extended"
+msgstr "разширена за тифинах"
+
+#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
+msgid "Tifinagh Extended Phonetic"
+msgstr "разширена фонетична за тифинах"
+
+#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
+msgid "Tifinagh Phonetic"
+msgstr "фонетична за тифинах"
+
+#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
+msgid "Tilde (~) variant"
+msgstr "вариант � тилда (~)"
+
+#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
+msgid "Tjk"
+msgstr "Тдж"
+
+#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic (безжична)"
+
+#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
+msgid "Tur"
+msgstr "Тур"
+
+#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
+msgid "Turkey"
+msgstr "тур�ка"
+
+#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
+msgid "Typewriter"
+msgstr "машинопи�на"
+
+#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
+msgid "UCW layout (accented letters only)"
+msgstr "Подредба UCW (�амо ударени букви)"
+
+#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
+msgid "US keyboard with Bosnian digraphs"
+msgstr "американ�ка � бо�нен�ки диграфи"
+
+#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
+msgid "US keyboard with Bosnian letters"
+msgstr "американ�ка � бо�нен�ки букви"
+
+#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
+msgid "US keyboard with Croatian digraphs"
+msgstr "американ�ка � хърват�ки диграфи"
+
+#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
+msgid "US keyboard with Croatian letters"
+msgstr "американ�ка � хърват�ки букви"
+
+#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
+msgid "US keyboard with Estonian letters"
+msgstr "американ�ка � е�тон�ки букви"
+
+#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
+msgid "US keyboard with Lithuanian letters"
+msgstr "американ�ка � литов�ки букви"
+
+#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
+msgid "US keyboard with Slovenian digraphs"
+msgstr "американ�ка �ъ� �ловен�ки диграфи"
+
+#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
+msgid "US keyboard with Slovenian letters"
+msgstr "американ�ка �ъ� �ловен�ки букви"
+
+#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+msgid "USA"
+msgstr "�ме"
+
+#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
+msgid "Udmurt"
+msgstr "удмурт"
+
+#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
+msgid "Ukr"
+msgstr "Укр"
+
+#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
+msgid "Ukraine"
+msgstr "украин�ка"
+
+#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
+msgid "UnicodeExpert"
+msgstr "ек�пертна за Уникод"
+
+#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
+msgid "United Kingdom"
+msgstr "британ�ка"
+
+#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
+msgid "Urdu"
+msgstr "урду"
+
+#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
+msgid "Use Bosnian digraphs"
+msgstr "� бо�нен�ки диграфи"
+
+#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
+msgid "Use Croatian digraphs"
+msgstr "� хърват�ки диграфи"
+
+#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
+msgid "Use Slovenian digraphs"
+msgstr "�ъ� �ловен�ки диграфи"
+
+#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
+msgid "Use guillemets for quotes"
+msgstr "�ъ� френ�ки кавички"
+
+#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Индикаци� чрез клавиатурен �ветодиод за �м�на на подредбата"
+
+#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
+msgid "Using space key to input non-breakable space character"
+msgstr "Генериране на интервал без раздел�не � клавишa за интервал"
+
+#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+msgid "Uzb"
+msgstr "Узб"
+
+#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+msgid "Uzbekistan"
+msgstr "узбеки�тан�ка"
+
+#: ../rules/base.xml.in.h:630 ../rules/evdev.xml.in.h:630
+msgid "Vietnam"
+msgstr "виетнам�ка"
+
+#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet Keyboard (за Интернет)"
+
+#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
+msgid "Vnm"
+msgstr "Вие"
+
+#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Цифрова клавиатура — Wang 724, � допълнени�та от Уникод (�трелки и математиче�ки операции)"
+
+#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Цифрова клавиатура — Wang 724, � допълнени�та от Уникод (�трелки и математиче�ки операции). Операциите �а на �тандартното ниво"
+
+#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+msgid "Western"
+msgstr "западна"
+
+#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
+msgid "Winkeys"
+msgstr "клавиши Win"
+
+#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
+msgid "With &lt;\\|&gt; key"
+msgstr "клавиш &lt;\\|&gt;"
+
+#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
+msgid "With EuroSign on 5"
+msgstr "€ е при „5“"
+
+#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+msgid "With guillemets"
+msgstr "френ�ки кавички"
+
+#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard (за Интернет)"
+
+#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+msgid "Yakut"
+msgstr "�кут�ка"
+
+#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
+msgid "Yoruba"
+msgstr "йоруба"
+
+#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
+msgid "Z and ZHE swapped"
+msgstr "разменени „З“ и „Ж“"
+
+#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
+msgid "Zar"
+msgstr "Ю�ф"
+
+#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
+msgid "azerty/digits"
+msgstr "azerty/цифри"
+
+#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
+msgid "digits"
+msgstr "цифри"
+
+#: ../rules/base.xml.in.h:650 ../rules/evdev.xml.in.h:650
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "разменени точка и запета� и кавички (о�тар�ла)"
+
+#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
+msgid "qwerty, extended Backslash"
+msgstr "qwerty � удължен Backslash"
+
+#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
+msgid "qwerty/digits"
+msgstr "qwerty/цифри"
+
+#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
+msgid "qwertz"
+msgstr "qwertz"
diff --git a/xorg-server/xkbdata.src/po/cs.po b/xorg-server/xkbdata.src/po/cs.po
new file mode 100644
index 000000000..5ebdf70b9
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/cs.po
@@ -0,0 +1,2623 @@
+# Translation of xkeyboard-config to Czech.
+# Copyright (C) 2007, 2008 the author(s) of xkeyboard-config.
+# This file is distributed under the same license as the xkeyboard-config package.
+# Michal Bukovjan <bukm@centrum.cz>, 2003.
+# Petr Kovar <pknbe@volny.cz>, 2007, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.4-pre1\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2008-09-15 23:52+0100\n"
+"PO-Revision-Date: 2008-09-18 00:16+0200\n"
+"Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
+"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ../rules/base.xml.in.h:1 ../rules/evdev.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2 ../rules/evdev.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(Zděděné) alternativní"
+
+#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Zděděné) alternativní, mrtvé klávesy Sun"
+
+#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Zděděné) alternativní, vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
+msgid "101/104 key Compatible"
+msgstr "101/104klávesové, kompatibilní"
+
+#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/�árka/mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/�árka/vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/te�ka/mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/te�ka/vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/�árka/mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/�árka/vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/te�ka/mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/te�ka/vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/�árka/mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/�árka/vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/te�ka/mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/te�ka/vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/�árka/mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/�árka/vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/te�ka/mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/te�ka/vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:23 ../rules/evdev.xml.in.h:23
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
+msgid "ACPI Standard"
+msgstr "Standard ACPI"
+
+#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
+msgid "ATM/phone-style hexadecimal keypad"
+msgstr "ATM/šestnáctimístná klávesnice telefonního typu"
+
+#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
+msgid "Acer Laptop"
+msgstr "Acer Laptop"
+
+#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
+msgid "Add the EuroSign to the 2 key."
+msgstr "Přidá znak eura na klávesu 2."
+
+#: ../rules/base.xml.in.h:32 ../rules/evdev.xml.in.h:32
+msgid "Add the EuroSign to the 4 key."
+msgstr "Přidá znak eura na klávesu 4."
+
+#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "Přidá znak eura na klávesu 5."
+
+#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "Přidá znak eura na klávesu E."
+
+#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "Přidá standardní chování ke klávese Menu."
+
+#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Přidává znak eura k ur�itým klávesám"
+
+#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38 ../rules/evdev.xml.in.h:38
+msgid "Afg"
+msgstr "AFG"
+
+#: ../rules/base.xml.in.h:39 ../rules/evdev.xml.in.h:39
+msgid "Afghanistan"
+msgstr "Afghánistán"
+
+#: ../rules/base.xml.in.h:40 ../rules/evdev.xml.in.h:40
+msgid "Akan"
+msgstr "Akan"
+
+#: ../rules/base.xml.in.h:41 ../rules/evdev.xml.in.h:41
+msgid "Alb"
+msgstr "ALB"
+
+#: ../rules/base.xml.in.h:42 ../rules/evdev.xml.in.h:42
+msgid "Albania"
+msgstr "Albánie"
+
+#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt a Meta na klávesách Alt."
+
+#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt je přiřazena k pravé klávese Win a Super k Menu."
+
+#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Alt+Caps Lock mění rozložení."
+
+#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+Ctrl mění rozložení."
+
+#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Alt+Shift mění rozložení."
+
+#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Chování klávesy Alt/Win"
+
+#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
+msgid "Alternative"
+msgstr "Alternativní"
+
+#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "Alternativní východní"
+
+#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "Alternativní fonetické"
+
+#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "Alternativní mezinárodní (bývalé us_intl)"
+
+#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "Alternativní, mrtvé klávesy Sun"
+
+#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "Alternativní, vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "Alternativní, pouze Latin-9"
+
+#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
+msgid "And"
+msgstr "AND"
+
+#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "Varianta s apostrofem (')"
+
+#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Apple Laptop"
+
+#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+msgid "Ara"
+msgstr "ARA"
+
+#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
+msgid "Arabic"
+msgstr "Arabské"
+
+#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
+msgid "Arm"
+msgstr "ARM"
+
+#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
+msgid "Armenia"
+msgstr "Arménie"
+
+#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "Asturská varianta s H s te�kou pod a L s te�kou pod"
+
+#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
+msgid "Asus Laptop"
+msgstr "Asus Laptop"
+
+#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
+msgid "Aze"
+msgstr "AZE"
+
+#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
+msgid "Azerbaijan"
+msgstr "�zerbájdžán"
+
+#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 Internet Keyboard, bezdrátová"
+
+#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
+
+#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
+msgid "Baltic+"
+msgstr "Baltic+"
+
+#: ../rules/base.xml.in.h:80 ../rules/evdev.xml.in.h:80
+msgid "Ban"
+msgstr "BAN"
+
+#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
+msgid "Bangladesh"
+msgstr "Bangladéš"
+
+#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
+msgid "Bel"
+msgstr "BEL"
+
+#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
+msgid "Belarus"
+msgstr "Bělorusko"
+
+#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
+msgid "Belgium"
+msgstr "Belgie"
+
+#: ../rules/base.xml.in.h:85 ../rules/evdev.xml.in.h:85
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
+msgid "Bengali"
+msgstr "Bengálské"
+
+#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
+msgid "Bengali Probhat"
+msgstr "Bengálské Probhat"
+
+#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonomické, typ Dvorak"
+
+#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonomické, typ Dvorak, pouze Latin-9"
+
+#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+msgid "Bgr"
+msgstr "BGR"
+
+#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+msgid "Bhu"
+msgstr "BHU"
+
+#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
+msgid "Bhutan"
+msgstr "Bhútán"
+
+#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Biblická hebrejština (Tiro)"
+
+#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
+msgid "Bih"
+msgstr "BIH"
+
+#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
+msgid "Blr"
+msgstr "BLR"
+
+#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
+msgid "Bosnia and Herzegovina"
+msgstr "Bosna a Hercegovina"
+
+#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
+msgid "Both Alt keys together change layout."
+msgstr "Obě klávesy Alt dohromady mění rozložení."
+
+#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
+msgid "Both Ctrl keys together change layout."
+msgstr "Obě klávesy Ctrl dohromady mění rozložení."
+
+#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
+msgid "Both Shift keys together change layout."
+msgstr "Obě klávesy Shift dohromady mění rozložení."
+
+#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
+msgid "Both Win-keys switch layout while pressed."
+msgstr "Obě klávesy Win přepínají při stisknutí rozložení."
+
+#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
+msgid "Bra"
+msgstr "BRA"
+
+#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
+msgid "Braille"
+msgstr "Braillovo písmo"
+
+#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+msgid "Brazil"
+msgstr "Brazílie"
+
+#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
+msgid "Brazilian ABNT2"
+msgstr "Brazilské ABNT2"
+
+#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+msgid "Brl"
+msgstr "BRL"
+
+#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
+msgid "Bulgaria"
+msgstr "Bulharsko"
+
+#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
+msgid "Cambodia"
+msgstr "Kambodža"
+
+#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+msgid "Can"
+msgstr "CAN"
+
+#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
+msgid "Caps Lock is Compose."
+msgstr "Caps Lock je Compose."
+
+#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
+msgid "CapsLock LED shows alternative layout."
+msgstr "LED Caps Lock zobrazuje alternativní rozložení."
+
+#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "Caps Lock funguje jako Shift s uzam�ením. Shift přerušuje Caps Lock."
+
+#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "Caps Lock funguje jako Shift s uzam�ením. Shift neovlivňuje Caps Lock."
+
+#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
+msgid "CapsLock just locks the Shift modifier."
+msgstr "Caps Lock pouze uzamkne modifikátor Shift."
+
+#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
+msgid "CapsLock key behavior"
+msgstr "Chování klávesy Caps Lock"
+
+#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
+msgid "CapsLock key changes layout."
+msgstr "Klávesa Caps Lock mění rozložení."
+
+#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
+msgid "CapsLock switch to first layout, Shift+CapsLock switch to last layout."
+msgstr "Caps Lock přepíná na první rozložení, Shift+Caps Lock přepíná na poslední rozložení."
+
+#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "Caps Lock přepne Shift, takže budou dot�eny všechny klávesy."
+
+#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "Caps Lock přepne běžný převod abecedních znaků na verzálky."
+
+#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "Caps Lock používá vnitřní převod na verzálky. Shift přerušuje Caps Lock."
+
+#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "Caps Lock používá vnitřní převod na verzálky. Shift neovlivňuje Caps Lock."
+
+#: ../rules/base.xml.in.h:126 ../rules/evdev.xml.in.h:126
+msgid "Catalan variant with middle-dot L"
+msgstr "Katalánská varianta s ela geminada"
+
+#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
+msgid "Cedilla"
+msgstr "Cédille"
+
+#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+msgid "Che"
+msgstr "CHE"
+
+#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+msgid "Cherokee"
+msgstr "Čerokí"
+
+#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternativní volba)"
+
+#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
+msgid "China"
+msgstr "Čína"
+
+#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+msgid "Chuvash"
+msgstr "Čuvašské"
+
+#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
+msgid "Chuvash Latin"
+msgstr "Čuvašské latinské"
+
+#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
+msgid "Classic"
+msgstr "Klasické"
+
+#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
+msgid "Classic Dvorak"
+msgstr "Klasické Dvorak"
+
+#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 kláves)"
+
+#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 kláves)"
+
+#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 kláves)"
+
+#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
+msgid "Compose key position"
+msgstr "Umístění klávesy Compose"
+
+#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
+msgid "Congo, Democratic Republic of the"
+msgstr "Konžská demokratická republika"
+
+#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "Ctrl je přiřazena ke klávesám Win (a obvyklým klávesám Ctrl)."
+
+#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
+msgid "Croatia"
+msgstr "Chorvatsko"
+
+#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
+msgid "Ctrl key at bottom left"
+msgstr "Klávesa Ctrl vlevo dole"
+
+#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
+msgid "Ctrl key at left of 'A'"
+msgstr "Klávesa Ctrl nalevo od \"A\""
+
+#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
+msgid "Ctrl key position"
+msgstr "Umístění klávesy Ctrl"
+
+#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
+msgid "Ctrl+Shift change layout."
+msgstr "Ctrl+Shift mění rozložení."
+
+#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
+msgid "Cyrillic"
+msgstr "Cyrilice"
+
+#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
+msgid "Cyrillic with guillemets"
+msgstr "Cyrilice s francouzskými uvozovkami"
+
+#: ../rules/base.xml.in.h:161 ../rules/evdev.xml.in.h:161
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Cyrilice, prohozené Z a Ž"
+
+#: ../rules/base.xml.in.h:162 ../rules/evdev.xml.in.h:162
+msgid "Cze"
+msgstr "CZE"
+
+#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
+msgid "Czechia"
+msgstr "ÄŒesko"
+
+#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
+msgid "Dan"
+msgstr "DAN"
+
+#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
+msgid "Dead acute"
+msgstr "Mrtvá �árka"
+
+#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
+msgid "Dead grave acute"
+msgstr "Mrtvá opa�ná �árka (gravis)"
+
+#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
+msgid "Default numeric keypad keys."
+msgstr "Výchozí numerická klávesnice."
+
+#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
+msgid "Dell 101-key PC"
+msgstr "Dell PC 101klávesové"
+
+#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Notebook Dell Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Notebook Dell řady Precision M"
+
+#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
+msgid "Dell Latitude series laptop"
+msgstr "Notebook řady Dell Latitude"
+
+#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
+msgid "Denmark"
+msgstr "Dánsko"
+
+#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
+msgid "Deu"
+msgstr "DEU"
+
+#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
+msgid "Diamond 9801 / 9802 series"
+msgstr "Řada Diamond 9801 / 9802"
+
+#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+msgid "Dvorak (UK Punctuation)"
+msgstr "Dvorak (britská interpunkce)"
+
+#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+msgid "Dvorak international"
+msgstr "Dvorak mezinárodní"
+
+#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak, polské uvozovky na klávese \"1/!\""
+
+#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, polské uvozovky na klávese uvozovky"
+
+#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
+msgid "Eastern"
+msgstr "Východní"
+
+#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
+msgid "Eliminate dead keys"
+msgstr "Vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
+msgid "Epo"
+msgstr "EPO"
+
+#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
+msgid "Ergonomic"
+msgstr "Ergonomické"
+
+#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
+msgid "Esp"
+msgstr "ESP"
+
+#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+msgid "Est"
+msgstr "EST"
+
+#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
+msgid "Estonia"
+msgstr "Estonsko"
+
+#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
+msgid "Eth"
+msgstr "ETH"
+
+#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+msgid "Ethiopia"
+msgstr "Etiopie"
+
+#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
+msgid "Evdev-managed keyboard"
+msgstr "Klávesnice spravovaná pomocí Evdev"
+
+#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
+msgid "Extended"
+msgstr "Rozšířené"
+
+#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
+msgid "Extended Backslash"
+msgstr "Rozšířená klávesa zpětného lomítka"
+
+#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
+msgid "F-letter (F) variant"
+msgstr "Varianta se znakem F"
+
+#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
+msgid "Fao"
+msgstr "FAO"
+
+#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
+msgid "Faroe Islands"
+msgstr "Faerské ostrovy"
+
+#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
+msgid "Fin"
+msgstr "FIN"
+
+#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
+msgid "Finland"
+msgstr "Finsko"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
+msgid "Four-level key with abstract separators"
+msgstr "Klávesa �tvrté úrovně s abstraktními oddělova�i"
+
+#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
+msgid "Four-level key with comma"
+msgstr "Klávesa �tvrté úrovně s �árkou"
+
+#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
+msgid "Four-level key with dot"
+msgstr "Klávesa �tvrté úrovně s te�kou"
+
+#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+msgid "Four-level key with momayyez"
+msgstr "Klávesa �tvrté úrovně se znakem momajjez"
+
+#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
+msgid "Fra"
+msgstr "FRA"
+
+#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
+msgid "France"
+msgstr "Francie"
+
+#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
+msgid "French"
+msgstr "Francouzské"
+
+#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
+msgid "French (Macintosh)"
+msgstr "Francouzské (Macintosh)"
+
+#: ../rules/base.xml.in.h:219 ../rules/evdev.xml.in.h:219
+msgid "French (legacy)"
+msgstr "Francouzské (zděděné)"
+
+#: ../rules/base.xml.in.h:220 ../rules/evdev.xml.in.h:220
+msgid "French Dvorak"
+msgstr "Francouzské Dvorak"
+
+#: ../rules/base.xml.in.h:221 ../rules/evdev.xml.in.h:221
+msgid "French, Sun dead keys"
+msgstr "Francouzské, mrtvé klávesy Sun"
+
+#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
+msgid "French, eliminate dead keys"
+msgstr "Francouzské, vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
+msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
+msgstr "Notebook Fujitsu-Siemens Computers AMILO A1667G"
+
+#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
+msgid "Fula"
+msgstr "Fula"
+
+#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
+msgid "GBr"
+msgstr "GBR"
+
+#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
+msgid "Ga"
+msgstr "GA"
+
+#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
+msgid "Generic 101-key PC"
+msgstr "Obecné PC 101klávesové"
+
+#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
+msgid "Generic 102-key (Intl) PC"
+msgstr "Obecné PC 102klávesové (mez.)"
+
+#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
+msgid "Generic 104-key PC"
+msgstr "Obecné PC 104klávesové"
+
+#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
+msgid "Generic 105-key (Intl) PC"
+msgstr "Obecné PC 105klávesové (mez.)"
+
+#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
+msgid "Geo"
+msgstr "GEO"
+
+#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
+msgid "Georgia"
+msgstr "Gruzie"
+
+#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
+msgid "Georgian"
+msgstr "Gruzínské"
+
+#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
+msgid "Georgian AZERTY Tskapo"
+msgstr "Gruzínské AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
+msgid "German (Macintosh)"
+msgstr "Německé (Macintosh)"
+
+#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
+msgid "German, Sun dead keys"
+msgstr "Německé, mrtvé klávesy Sun"
+
+#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
+msgid "German, eliminate dead keys"
+msgstr "Německé, vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
+msgid "Germany"
+msgstr "Německo"
+
+#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
+msgid "Gha"
+msgstr "GHA"
+
+#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
+msgid "Gre"
+msgstr "GRE"
+
+#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
+msgid "Greece"
+msgstr "Řecko"
+
+#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
+msgid "Group toggle on multiply/divide key"
+msgstr "Přepínání skupiny klávesou násobení/dělení"
+
+#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
+msgid "Gui"
+msgstr "GUI"
+
+#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
+msgid "Guinea"
+msgstr "Guinea"
+
+#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
+msgid "Gujarati"
+msgstr "Gudžarátské"
+
+#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
+msgid "Gurmukhi"
+msgstr "Gurmuchské"
+
+#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
+msgid "Gurmukhi Jhelum"
+msgstr "Gurmuchské (Jhelum)"
+
+#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking Keyboard"
+
+#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking Keyboard for Mac"
+
+#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
+msgid "Hausa"
+msgstr "Hausa"
+
+#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
+msgid "Hewlett-Packard Internet Keyboard 5181"
+msgstr "Hewlett-Packard Internet Keyboard 5181"
+
+#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
+msgid "Hewlett-Packard Internet Keyboard 5185"
+msgstr "Hewlett-Packard Internet Keyboard 5185"
+
+#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
+msgid "Hindi Bolnagri"
+msgstr "Hindské bolnagri"
+
+#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
+msgid "Homophonic"
+msgstr "Stejně znějící"
+
+#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
+msgid "Hrv"
+msgstr "HRV"
+
+#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
+msgid "Hun"
+msgstr "HUN"
+
+#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
+msgid "Hungary"
+msgstr "Ma�arsko"
+
+#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper je přiřazena ke klávesám Win."
+
+#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (alternativní volba)"
+
+#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
+
+#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, mez."
+
+#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+msgid "ISO Alternate"
+msgstr "ISO alternativní"
+
+#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
+msgid "Iceland"
+msgstr "Island"
+
+#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
+msgid "Ind"
+msgstr "IND"
+
+#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+msgid "India"
+msgstr "Indie"
+
+#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
+msgid "International (AltGr dead keys)"
+msgstr "Mezinárodní (mrtvé klávesy AltGr)"
+
+#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
+msgid "International (with dead keys)"
+msgstr "Mezinárodní (s mrtvými klávesami)"
+
+#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+msgid "Iran"
+msgstr "�rán"
+
+#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
+msgid "Iraq"
+msgstr "Irák"
+
+#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
+msgid "Ireland"
+msgstr "Irsko"
+
+#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
+msgid "Irl"
+msgstr "IRL"
+
+#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+msgid "Irn"
+msgstr "IRN"
+
+#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
+msgid "Irq"
+msgstr "IRQ"
+
+#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
+msgid "Isl"
+msgstr "ISL"
+
+#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
+msgid "Isr"
+msgstr "ISR"
+
+#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
+msgid "Israel"
+msgstr "Izrael"
+
+#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
+msgid "Ita"
+msgstr "ITA"
+
+#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
+msgid "Italy"
+msgstr "Itálie"
+
+#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
+msgid "Japan"
+msgstr "Japonsko"
+
+#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
+msgid "Japan (PC-98xx Series)"
+msgstr "Japonsko (řada PC-98xx)"
+
+#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
+msgid "Japanese 106-key"
+msgstr "Japonské 106klávesové"
+
+#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
+msgid "Japanese keyboard options"
+msgstr "Volby japonské klávesnice"
+
+#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
+msgid "Jpn"
+msgstr "JPN"
+
+#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
+msgid "Kana Lock key is locking"
+msgstr "Klávesa Kana Lock uzamyká"
+
+#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
+msgid "Kannada"
+msgstr "Kannadské"
+
+#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
+msgid "Kashubian"
+msgstr "Kašubské"
+
+#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
+msgid "Kaz"
+msgstr "KAZ"
+
+#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
+msgid "Kazakh with Russian"
+msgstr "Kazašská s ruštinou"
+
+#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
+msgid "Kazakhstan"
+msgstr "Kazachstán"
+
+#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
+msgid "Keypad"
+msgstr "Numerická klávesnice"
+
+#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
+msgid "Keypad with unicode additions (arrows and math operators)"
+msgstr "Numerická klávesnice s doplňky Unicode (šipky a matematické operátory)"
+
+#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
+msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Numerická klávesnice s doplňky Unicode (šipky a matematické operátory). Matematické operátory na výchozí úrovni."
+
+#: ../rules/base.xml.in.h:320 ../rules/evdev.xml.in.h:320
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
+msgid "Khm"
+msgstr "KHM"
+
+#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
+msgid "Kir"
+msgstr "KIR"
+
+#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
+msgid "Komi"
+msgstr "Komi"
+
+#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
+msgid "Kor"
+msgstr "KOR"
+
+#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
+msgid "Korea, Republic of"
+msgstr "Korejská republika"
+
+#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
+msgid "Korean 106-key"
+msgstr "Korejské 106klávesové"
+
+#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
+msgid "Ktunaxa"
+msgstr "Ktunaxa"
+
+#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+msgid "Kurdish, (F)"
+msgstr "Kurdské, (F)"
+
+#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+msgid "Kurdish, Arabic-Latin"
+msgstr "Kurdské, arabsko-latinské"
+
+#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Kurdské, latinské Alt-Q"
+
+#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
+msgid "Kurdish, Latin Q"
+msgstr "Kurdské, latinské Q"
+
+#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
+msgid "Kyrgyzstan"
+msgstr "Kyrgyzstán"
+
+#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
+msgid "LCtrl+LShift change layout."
+msgstr "Levá klávesa Ctrl a levá klávesa Shift mění rozložení."
+
+#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
+msgid "LEKP"
+msgstr "LEKP"
+
+#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
+msgid "LEKPa"
+msgstr "LEKPa"
+
+#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
+msgid "Lao"
+msgstr "LAO"
+
+#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop Keyboard pro notebook Compaq (napÅ™. Armada)"
+
+#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Internet Keyboard pro notebook Compaq (napÅ™. Presario)"
+
+#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Notebook eMachines m68xx"
+
+#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
+msgid "Latin"
+msgstr "Latinské"
+
+#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
+msgid "Latin American"
+msgstr "Latinskoamerické"
+
+#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
+msgid "Latin Unicode"
+msgstr "Latinské Unicode"
+
+#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
+msgid "Latin Unicode qwerty"
+msgstr "Latinské Unicode qwerty"
+
+#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
+msgid "Latin qwerty"
+msgstr "Latinské qwerty"
+
+#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
+msgid "Latin unicode"
+msgstr "Latinské Unicode"
+
+#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
+msgid "Latin unicode qwerty"
+msgstr "Latinské Unicode qwerty"
+
+#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
+msgid "Latin with guillemets"
+msgstr "Latinské s francouzskými uvozovkami"
+
+#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
+msgid "Latvia"
+msgstr "Lotyšsko"
+
+#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
+msgid "Lav"
+msgstr "LAV"
+
+#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
+msgid "Layout switching"
+msgstr "Přepínání rozložení"
+
+#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
+msgid "Left Alt is swapped with left Win-key."
+msgstr "Levá klávesa Alt je prohozena s levou klávesou Win."
+
+#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
+msgid "Left Alt key changes layout."
+msgstr "Levá klávesa Alt mění rozložení."
+
+#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
+msgid "Left Alt key switches layout while pressed."
+msgstr "Levá klávesa Alt přepne při stisknutí rozložení."
+
+#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
+msgid "Left Ctrl key changes layout."
+msgstr "Levá klávesa Ctrl mění rozložení."
+
+#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
+msgid "Left Shift key changes layout."
+msgstr "Levá klávesa Shift mění rozložení."
+
+#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
+msgid "Left Win-key changes layout."
+msgstr "Levá klávesa Win mění rozložení."
+
+#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
+msgid "Left Win-key is Compose."
+msgstr "Levá klávesa Win je Compose."
+
+#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
+msgid "Left Win-key switches layout while pressed."
+msgstr "Levá klávesa Win přepne při stisknutí rozložení."
+
+#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
+msgid "Left hand"
+msgstr "Levoruké"
+
+#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
+msgid "Left handed Dvorak"
+msgstr "Levoruké Dvorak"
+
+#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+msgid "Legacy"
+msgstr "Zděděné"
+
+#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
+msgid "Legacy Wang 724 keypad"
+msgstr "Zděděná numerická klávesnice Wang 724"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+msgid "Legacy key with comma"
+msgstr "Zděděná klávesa s �árkou"
+
+#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+msgid "Legacy key with dot"
+msgstr "Zděděná klávesa s te�kou"
+
+#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
+msgid "Legacy keypad"
+msgstr "Zděděná numerická klávesnice"
+
+#: ../rules/base.xml.in.h:369 ../rules/evdev.xml.in.h:369
+msgid "Less-than/Greater-than is Compose."
+msgstr "Menší než/větší než je Compose."
+
+#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+msgid "Lithuania"
+msgstr "Litva"
+
+#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (alternativní volba)"
+
+#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:375 ../rules/evdev.xml.in.h:375
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (alternativní volba 2)"
+
+#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Přídavné klávesy Logitech G15 pomocí G15daemon"
+
+#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech Generic Keyboard"
+
+#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Keyboard"
+
+#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite Keyboard"
+
+#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Keyboard"
+
+#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
+msgid "Ltu"
+msgstr "LTU"
+
+#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
+msgid "MNE"
+msgstr "MNE"
+
+#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (mez.)"
+
+#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
+msgid "Macedonia"
+msgstr "Makedonie"
+
+#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
+msgid "Macintosh Old"
+msgstr "Macintosh staré"
+
+#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, mrtvé klávesy Sun"
+
+#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Vytvořit z klávesy Caps Lock další Ctrl."
+
+#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
+msgid "Mal"
+msgstr "MAL"
+
+#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
+msgid "Malayalam"
+msgstr "Malajálamské"
+
+#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
+msgid "Malayalam Lalitha"
+msgstr "Malajálamské lalitha"
+
+#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
+msgid "Maldives"
+msgstr "Maledivy"
+
+#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
+msgid "Maltese keyboard with US layout"
+msgstr "Maltézská klávesnice s americkým rozložením"
+
+#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
+msgid "Mao"
+msgstr "MAO"
+
+#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
+msgid "Maori"
+msgstr "Maorské"
+
+#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
+msgid "Menu is Compose."
+msgstr "Menu je Compose."
+
+#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
+msgid "Menu key changes layout."
+msgstr "Klávesa Menu mění rozložení."
+
+#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta je přiřazena ke klávesám Win."
+
+#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta je přiřazena k levé klávese Win."
+
+#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, švédská"
+
+#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
+
+#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:428 ../rules/evdev.xml.in.h:428
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+msgid "Miscellaneous compatibility options"
+msgstr "Dodate�né volby kompatibility"
+
+#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+msgid "Mkd"
+msgstr "MKD"
+
+#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+msgid "Mlt"
+msgstr "MLT"
+
+#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+msgid "Mmr"
+msgstr "MMR"
+
+#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
+msgid "Mng"
+msgstr "MNG"
+
+#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
+msgid "Mongolia"
+msgstr "Mongolsko"
+
+#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
+msgid "Montenegro"
+msgstr "Černá Hora"
+
+#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
+msgid "Morocco"
+msgstr "Maroko"
+
+#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
+msgid "Multilingual"
+msgstr "Vícejazy�né"
+
+#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
+msgid "Multilingual, first part"
+msgstr "Vícejazy�né, první �ást"
+
+#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
+msgid "Multilingual, second part"
+msgstr "Vícejazy�né, druhá �ást"
+
+#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+msgid "Myanmar"
+msgstr "Barma"
+
+#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
+msgid "NICOLA-F style Backspace"
+msgstr "Backspace typu NICOLA-F"
+
+#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
+msgid "Neostyle"
+msgstr "Neostyle"
+
+#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
+msgid "Nep"
+msgstr "NEP"
+
+#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
+msgid "Nepal"
+msgstr "Nepál"
+
+#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
+msgid "Netherlands"
+msgstr "Nizozemsko"
+
+#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
+msgid "Nig"
+msgstr "NIG"
+
+#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
+msgid "Nigeria"
+msgstr "Nigérie"
+
+#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
+msgid "Nld"
+msgstr "NLD"
+
+#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
+msgid "Nor"
+msgstr "NOR"
+
+#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
+msgid "Northern Saami"
+msgstr "Severolaponské"
+
+#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Severolaponské, vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
+msgid "Norway"
+msgstr "Norsko"
+
+#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
+msgid "NumLock LED shows alternative layout."
+msgstr "LED Num Lock zobrazuje alternativní rozložení."
+
+#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
+msgid "Numeric keypad delete key behaviour"
+msgstr "Chování klávesy Delete na numerické klávesnici"
+
+#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
+msgid "Numeric keypad keys work as with Mac."
+msgstr "Klávesy numerické klávesnice fungují stejně jako u po�íta�e Mac."
+
+#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
+msgid "Numeric keypad layout selection"
+msgstr "Výběr rozložení numerické klávesnice"
+
+#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
+msgid "OLPC"
+msgstr "OLPC"
+
+#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
+msgid "OLPC Dari"
+msgstr "OLPC, darí"
+
+#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
+msgid "OLPC Pashto"
+msgstr "OLPC, paštó"
+
+#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
+msgid "OLPC Southern Uzbek"
+msgstr "OLPC, jihouzbecké"
+
+#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
+msgid "Ogham"
+msgstr "Ogam"
+
+#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
+msgid "Oriya"
+msgstr "Urijské"
+
+#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Internet keyboard pro Ortek MCK-800 MM"
+
+#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+msgid "Ossetian"
+msgstr "Osetinské"
+
+#: ../rules/base.xml.in.h:469 ../rules/evdev.xml.in.h:469
+msgid "Ossetian, Winkeys"
+msgstr "Osetinské, klávesy Win"
+
+#: ../rules/base.xml.in.h:470 ../rules/evdev.xml.in.h:470
+msgid "Ossetian, legacy"
+msgstr "Osetinské, zděděné"
+
+#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+msgid "PC-98xx Series"
+msgstr "Řada PC-98xx"
+
+#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+msgid "Pak"
+msgstr "PAK"
+
+#: ../rules/base.xml.in.h:473 ../rules/evdev.xml.in.h:473
+msgid "Pakistan"
+msgstr "Pákistán"
+
+#: ../rules/base.xml.in.h:474 ../rules/evdev.xml.in.h:474
+msgid "Pashto"
+msgstr "Paštské"
+
+#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
+msgid "Phonetic"
+msgstr "Fonetické"
+
+#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
+msgid "Pol"
+msgstr "POL"
+
+#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
+msgid "Poland"
+msgstr "Polsko"
+
+#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
+msgid "Polytonic"
+msgstr "Polytonické"
+
+#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+msgid "Portugal"
+msgstr "Portugalsko"
+
+#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Stisknutí levé klávesy Alt umožní výběr 3. úrovně."
+
+#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Stisknutí levé klávesy Win umožní výběr 3. úrovně."
+
+#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
+msgid "Press Menu key to choose 3rd level."
+msgstr "Stisknutí levé klávesy Menu umožní výběr 3. úrovně."
+
+#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "Stisknutí pravé klávesy Alt umožní výběr 3. úrovně, Shift a pravá klávesa Alt je Multi_Key."
+
+#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Stisknutí pravé klávesy Alt umožní výběr 3. úrovně."
+
+#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Stisknutí pravé klávesy Ctrl umožní výběr 3. úrovně."
+
+#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Stisknutí pravé klávesy Win umožní výběr 3. úrovně."
+
+#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Stisknutí jakékoliv klávesy Alt umožní výběr 3. úrovně."
+
+#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Stisknutí jakékoliv klávesy Win umožní výběr 3. úrovně."
+
+#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
+msgid "Pro Keypad"
+msgstr "Pro Keypad"
+
+#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
+msgid "Probhat"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
+msgid "Programmer Dvorak"
+msgstr "Programátorské Dvorak"
+
+#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+msgid "Prt"
+msgstr "PRT"
+
+#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
+msgid "R-Alt switches layout while pressed."
+msgstr "Pravá klávesa Alt přepne při stisknutí rozložení."
+
+#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
+msgid "Right Alt is Compose."
+msgstr "Pravá klávesa Alt je Compose."
+
+#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
+msgid "Right Alt key changes layout."
+msgstr "Pravá klávesa Alt mění rozložení."
+
+#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
+msgid "Right Alt key never chooses 3rd level."
+msgstr "Pravá klávesa Alt nikdy neumožní výběr 3. úrovně."
+
+#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
+msgid "Right Ctrl is Compose."
+msgstr "Pravá klávesa Ctrl je Compose."
+
+#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
+msgid "Right Ctrl key changes layout."
+msgstr "Pravá klávesa Ctrl mění rozložení."
+
+#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "Pravá klávesa Ctrl přepne při stisknutí rozložení."
+
+#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Pravá klávesa Ctrl funguje jako pravá klávesa Alt."
+
+#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
+msgid "Right Shift key changes layout."
+msgstr "Pravá klávesa Shift mění rozložení."
+
+#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
+msgid "Right Win-key changes layout."
+msgstr "Pravá klávesa Win mění rozložení."
+
+#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
+msgid "Right Win-key is Compose."
+msgstr "Pravá klávesa Win je Compose."
+
+#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
+msgid "Right Win-key switches layout while pressed."
+msgstr "Pravá klávesa Win přepne při stisknutí rozložení."
+
+#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+msgid "Right hand"
+msgstr "Pravoruké"
+
+#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
+msgid "Right handed Dvorak"
+msgstr "Pravoruké Dvorak"
+
+#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
+msgid "Romania"
+msgstr "Rumunsko"
+
+#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
+msgid "Romanian keyboard with German letters"
+msgstr "Rumunská klávesnice s německými znaky"
+
+#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Rumunská klávesnice s německými znaky, vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+msgid "Rou"
+msgstr "ROU"
+
+#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+msgid "Rus"
+msgstr "RUS"
+
+#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+msgid "Russia"
+msgstr "Rusko"
+
+#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+msgid "Russian"
+msgstr "Ruské"
+
+#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+msgid "Russian phonetic"
+msgstr "Ruské fonetické"
+
+#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+msgid "Russian phonetic Dvorak"
+msgstr "Ruské fonetické Dvorak"
+
+#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Ruské fonetické, vylou�it mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+msgid "Russian with Kazakh"
+msgstr "Ruská s kazaštinou"
+
+#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
+msgid "ScrollLock LED shows alternative layout."
+msgstr "LED Scroll Lock zobrazuje alternativní rozložení."
+
+#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
+msgid "Serbia"
+msgstr "Srbsko"
+
+#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
+msgid "Shift cancels CapsLock."
+msgstr "Shift ruší Caps Lock."
+
+#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "Shift s numerickými klávesami funguje jako v MS Windows."
+
+#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
+msgid "Shift+CapsLock changes layout."
+msgstr "Shift+Caps Lock mění rozložení."
+
+#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
+msgid "Simple"
+msgstr "Jednoduché"
+
+#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
+msgid "Slovakia"
+msgstr "Slovensko"
+
+#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
+msgid "Slovenia"
+msgstr "Slovinsko"
+
+#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
+msgid "South Africa"
+msgstr "Jižní Afrika"
+
+#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
+msgid "Southern Uzbek"
+msgstr "Jihouzbecké"
+
+#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Stisknutí mezerníku zadává na �tvrté úrovni znak nedělitelné mezery, tenkou nedělitelnou mezeru na šesté úrovni"
+
+#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift"
+msgstr "Stisknutí mezerníku zadává na �tvrté úrovni znak nedělitelné mezery, tenkou nedělitelnou mezeru na šesté úrovni (přes Ctrl+Shift)"
+
+#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr "Stisknutí mezerníku zadává na �tvrté úrovni znak nedělitelné mezery."
+
+#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
+msgid "Space key outputs non-breakable space character at second level."
+msgstr "Stisknutí mezerníku zadává na druhé úrovni znak nedělitelné mezery."
+
+#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr "Stisknutí mezerníku zadává na třetí úrovni znak nedělitelné mezery, nic na úrovni �tvrté."
+
+#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Stisknutí mezerníku zadává na třetí úrovni znak nedělitelné mezery, tenkou nedělitelnou mezeru na �tvrté úrovni"
+
+#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
+msgid "Space key outputs non-breakable space character at third level."
+msgstr "Stisknutí mezerníku zadává na třetí úrovni znak nedělitelné mezery."
+
+#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
+msgid "Space key outputs usual space at any level."
+msgstr "Stisknutí mezerníku zadává na jakékoliv úrovni znak běžné mezery."
+
+#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+msgid "Spain"
+msgstr "Španělsko"
+
+#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Speciální klávesy (Ctrl+Alt+&lt;klávesa&gt;) zpracovány v serveru."
+
+#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+msgid "SrL"
+msgstr "SRL"
+
+#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
+msgid "Sri Lanka"
+msgstr "Srí Lanka"
+
+#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
+msgid "Standard"
+msgstr "Standardní"
+
+#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
+msgid "Standard (Cedilla)"
+msgstr "Standardní (cédille)"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
+msgid "Standard RSTU"
+msgstr "Standardní RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:560 ../rules/evdev.xml.in.h:560
+msgid "Standard RSTU on Russian layout"
+msgstr "Standardní RSTU s ruským rozložením"
+
+#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
+msgid "Sun Type 5/6"
+msgstr "Sun Type 5/6"
+
+#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
+msgid "Sun dead keys"
+msgstr "Mrtvé klávesy Sun"
+
+#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
+msgid "Super is mapped to the Win-keys."
+msgstr "Super je přiřazena ke klávesám Win."
+
+#: ../rules/base.xml.in.h:565 ../rules/evdev.xml.in.h:565
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
+msgid "Svk"
+msgstr "SVK"
+
+#: ../rules/base.xml.in.h:567 ../rules/evdev.xml.in.h:567
+msgid "Svn"
+msgstr "SVN"
+
+#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
+msgid "Swap Ctrl and CapsLock."
+msgstr "Zaměnit Ctrl a Caps Lock."
+
+#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
+msgid "Swap ESC and CapsLock."
+msgstr "Zaměnit Esc a Caps Lock."
+
+#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr "Zamění klávesové kódy dvou kláves v případě chybné detekce klávesnic Mac jádrem."
+
+#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
+msgid "Swe"
+msgstr "SWE"
+
+#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+msgid "Sweden"
+msgstr "Švédsko"
+
+#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
+msgid "Switzerland"
+msgstr "Švýcarsko"
+
+#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
+msgid "Syr"
+msgstr "SYR"
+
+#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+msgid "Syria"
+msgstr "Sýrie"
+
+#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+msgid "Syriac"
+msgstr "Syrské"
+
+#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
+msgid "Syriac phonetic"
+msgstr "Syrské fonetické"
+
+#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
+msgid "Tajikistan"
+msgstr "Tádžikistán"
+
+#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
+msgid "Tamil"
+msgstr "Tamilské"
+
+#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
+msgid "Tamil TAB Typewriter"
+msgstr "Tamil TAB Typewriter"
+
+#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamil TSCII Typewriter"
+
+#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
+msgid "Tamil Unicode"
+msgstr "Tamilské Unicode"
+
+#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
+msgid "Tatar"
+msgstr "Tatarské"
+
+#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
+msgid "Telugu"
+msgstr "Tegulské"
+
+#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
+msgid "Tha"
+msgstr "THA"
+
+#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
+msgid "Thailand"
+msgstr "Thajsko"
+
+#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
+msgid "Third level choosers"
+msgstr "Výběr třetí úrovně"
+
+#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
+msgid "Tibetan"
+msgstr "Tibetské"
+
+#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetské (s �íslicemi ASCII)"
+
+#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
+msgid "Tifinagh Alternative"
+msgstr "Tifinagh, alternativní"
+
+#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Tifinagh, alternativní fonetické"
+
+#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
+msgid "Tifinagh Extended"
+msgstr "Tifinagh, rozšířené"
+
+#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
+msgid "Tifinagh Extended Phonetic"
+msgstr "Tifinagh, rozšířené fonetické"
+
+#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
+msgid "Tifinagh Phonetic"
+msgstr "Tifinagh, fonetické"
+
+#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
+msgid "Tilde (~) variant"
+msgstr "Varianta s vlnovkou (~)"
+
+#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
+msgid "Tjk"
+msgstr "TJK"
+
+#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
+msgid "Tur"
+msgstr "TUR"
+
+#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
+msgid "Turkey"
+msgstr "Turecko"
+
+#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
+msgid "Typewriter"
+msgstr "Psací stroj"
+
+#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
+msgid "UCW layout (accented letters only)"
+msgstr "Rozložení UCW (pouze znaky s diakritikou)"
+
+#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Americká klávesnice s bosenskými spřežkami"
+
+#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
+msgid "US keyboard with Bosnian letters"
+msgstr "Americká klávesnice s bosenskými znaky"
+
+#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
+msgid "US keyboard with Croatian digraphs"
+msgstr "Americká klávesnice s chorvatskými spřežkami"
+
+#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
+msgid "US keyboard with Croatian letters"
+msgstr "Americká klávesnice s chorvatskými znaky"
+
+#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
+msgid "US keyboard with Estonian letters"
+msgstr "Americká klávesnice s estonskými znaky"
+
+#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
+msgid "US keyboard with Lithuanian letters"
+msgstr "Americká klávesnice s litevskými znaky"
+
+#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Americká klávesnice se slovinskými spřežkami"
+
+#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
+msgid "US keyboard with Slovenian letters"
+msgstr "Americká klávesnice se slovinskými znaky"
+
+#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
+msgid "Udmurt"
+msgstr "Udmurtské"
+
+#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
+msgid "Ukr"
+msgstr "UKR"
+
+#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
+msgid "Ukraine"
+msgstr "Ukrajina"
+
+#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
+msgid "United Kingdom"
+msgstr "Spojené království"
+
+#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
+msgid "Urdu"
+msgstr "Urdské"
+
+#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
+msgid "Use Bosnian digraphs"
+msgstr "Používat bosenské spřežky"
+
+#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
+msgid "Use Croatian digraphs"
+msgstr "Používat chorvatské spřežky"
+
+#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
+msgid "Use Slovenian digraphs"
+msgstr "Používat slovinské spřežky"
+
+#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
+msgid "Use guillemets for quotes"
+msgstr "Používat francouzské uvozovky"
+
+#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Použít LED klávesnice k zobrazení alternativního rozložení."
+
+#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
+msgid "Using space key to input non-breakable space character"
+msgstr "Používání mezerníku k zadávání znaku nedělitelné mezery"
+
+#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+msgid "Uzb"
+msgstr "UZB"
+
+#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+msgid "Uzbekistan"
+msgstr "Uzbekistán"
+
+#: ../rules/base.xml.in.h:630 ../rules/evdev.xml.in.h:630
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
+msgid "Vnm"
+msgstr "VNM"
+
+#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Numerická klávesnice Wang 724 s doplňky Unicode (šipky a matematické operátory)"
+
+#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Numerická klávesnice Wang 724 s doplňky Unicode (šipky a matematické operátory). Matematické operátory na výchozí úrovni."
+
+#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+msgid "Wang model 724 azerty"
+msgstr "Wang, model 724 azerty"
+
+#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+msgid "Western"
+msgstr "Západní"
+
+#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
+msgid "Winkeys"
+msgstr "Klávesy Win"
+
+#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
+msgid "With &lt;\\|&gt; key"
+msgstr "S klávesou &lt;\\|&gt;"
+
+#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
+msgid "With EuroSign on 5"
+msgstr "Se znakem eura na klávese 5"
+
+#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+msgid "With guillemets"
+msgstr "S francouzskými uvozovkami"
+
+#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+msgid "Yakut"
+msgstr "jakutské"
+
+#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
+msgid "Yoruba"
+msgstr "Jorubské"
+
+#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
+msgid "Z and ZHE swapped"
+msgstr "Prohozené Z a Ž"
+
+#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
+msgid "Zar"
+msgstr "ZAR"
+
+#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
+msgid "azerty/digits"
+msgstr "azerty/�íslice"
+
+#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
+msgid "digits"
+msgstr "�íslice"
+
+#: ../rules/base.xml.in.h:650 ../rules/evdev.xml.in.h:650
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "posunutý středník a uvozovka (zastaralé)"
+
+#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, rozšířená klávesa zpětného lomítka"
+
+#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
+msgid "qwerty/digits"
+msgstr "qwerty/�íslice"
+
+#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
+msgid "qwertz"
+msgstr "qwertz"
diff --git a/xorg-server/xkbdata.src/po/da.po b/xorg-server/xkbdata.src/po/da.po
new file mode 100644
index 000000000..2f606d52b
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/da.po
@@ -0,0 +1,2931 @@
+# Danish translation of xfree86-xkb-xml.
+# Copyright (C) 2003-2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+# Ole Laursen <olau@hardworking.dk>, 2003.
+# Joe Hansen <joedalton2@yahoo.dk>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config-1.3-pre1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-05-13 23:22+0100\n"
+"PO-Revision-Date: 2008-08-20 23:03+0100\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:2
+#, fuzzy
+msgid "(Legacy) Alternative"
+msgstr "Fransk (alternativ)"
+
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:4
+#, fuzzy
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "Slå døde taster fra"
+
+#: ../rules/base.xml.in.h:5
+msgid "(Legacy) Dvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:6
+msgid "101/104 key Compatible"
+msgstr ""
+
+#: ../rules/base.xml.in.h:7
+#, fuzzy
+msgid "101/qwerty/comma/Dead keys"
+msgstr "l2/101/qwerty/komma"
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/komma/Slå døde taster fra"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/punktum/døde taster"
+
+#: ../rules/base.xml.in.h:10
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/punktum/Slå døde taster fra"
+
+#: ../rules/base.xml.in.h:11
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/komma/Døde taster"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/komma/Slå døde taster fra"
+
+#: ../rules/base.xml.in.h:13
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/punktum/Døde taster"
+
+#: ../rules/base.xml.in.h:14
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/punktum/Slå døde taster fra"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/komma/Døde taster"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/komma/Slå døde taster fra"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/punktum/Døde taster"
+
+#: ../rules/base.xml.in.h:18
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/punktum/Slå døde taster fra"
+
+#: ../rules/base.xml.in.h:19
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/komma/Døde taster"
+
+#: ../rules/base.xml.in.h:20
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/komma/Slå døde taster fra"
+
+#: ../rules/base.xml.in.h:21
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/punktum/Døde taster"
+
+#: ../rules/base.xml.in.h:22
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/punktum/Slå døde taster fra"
+
+#: ../rules/base.xml.in.h:23
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:24
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:25
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:26
+msgid "ACPI Standard"
+msgstr "ACPI-standard"
+
+#: ../rules/base.xml.in.h:27
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:28
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:29
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:30
+msgid "Acer Laptop"
+msgstr "Acer bærbar"
+
+#: ../rules/base.xml.in.h:31
+msgid "Add the EuroSign to the 2 key."
+msgstr "Tilføj eurotegnet til 2-tasten."
+
+#: ../rules/base.xml.in.h:32
+msgid "Add the EuroSign to the 4 key."
+msgstr "Tilføj eurotegnet til 4-tasten."
+
+#: ../rules/base.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "Tilføj eurotegnet til 5-tasten."
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "Tilføj eurotegnet til E-tasten."
+
+#: ../rules/base.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "Tilføj standardopførslen til menutasten."
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Tilføjelse af eurotegnet til bestemte taster"
+
+#: ../rules/base.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38
+msgid "Afg"
+msgstr "Afg"
+
+#: ../rules/base.xml.in.h:39
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+#: ../rules/base.xml.in.h:40
+msgid "Akan"
+msgstr "Akan"
+
+#: ../rules/base.xml.in.h:41
+msgid "Alb"
+msgstr "Alb"
+
+#: ../rules/base.xml.in.h:42
+msgid "Albania"
+msgstr "Albanien"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt og Meta er på Alt-tasterne."
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt ligger på den højre Win-tast og Super på Menu."
+
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Alt+Caps lock-tast skifter layout."
+
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+Ctrl skifter layout."
+
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Alt+skift skifter layout."
+
+#: ../rules/base.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win-tasteopførsel"
+
+#: ../rules/base.xml.in.h:50
+msgid "Alternative"
+msgstr "Alternative"
+
+#: ../rules/base.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "Alternativ østlig"
+
+#: ../rules/base.xml.in.h:52
+#, fuzzy
+msgid "Alternative Phonetic"
+msgstr "Alternativ"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "Alternativ international (tidligere us_intl)"
+
+#: ../rules/base.xml.in.h:54
+#, fuzzy
+msgid "Alternative, Sun dead keys"
+msgstr "Slå døde taster fra"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "Alternativ, slå døde taster fra"
+
+#: ../rules/base.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "Alternativ, kun latin-9"
+
+#: ../rules/base.xml.in.h:57
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:58
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../rules/base.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Apple bærbar"
+
+#: ../rules/base.xml.in.h:62
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:63
+msgid "Arabic"
+msgstr "Arabisk"
+
+#: ../rules/base.xml.in.h:64
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:65
+msgid "Armenia"
+msgstr "Armenien"
+
+#: ../rules/base.xml.in.h:66
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr ""
+
+#: ../rules/base.xml.in.h:67
+msgid "Asus Laptop"
+msgstr "Asus bærbar"
+
+#: ../rules/base.xml.in.h:68
+msgid "Aze"
+msgstr "Ase"
+
+#: ../rules/base.xml.in.h:69
+msgid "Azerbaijan"
+msgstr "Aserbajdsjan"
+
+#: ../rules/base.xml.in.h:70
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet Keyboard"
+
+#: ../rules/base.xml.in.h:71
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:72
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF-multimedie"
+
+#: ../rules/base.xml.in.h:73
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:74
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
+
+#: ../rules/base.xml.in.h:75
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:76
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:77
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:78
+#, fuzzy
+msgid "BTC 9019U"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:79
+#, fuzzy
+msgid "Baltic+"
+msgstr "Basal"
+
+#: ../rules/base.xml.in.h:80
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:81
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: ../rules/base.xml.in.h:82
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:83
+msgid "Belarus"
+msgstr "Hviderusland"
+
+#: ../rules/base.xml.in.h:84
+msgid "Belgium"
+msgstr "Belgien"
+
+#: ../rules/base.xml.in.h:85
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:86
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:87
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:88
+msgid "Bengali"
+msgstr "Bengali"
+
+#: ../rules/base.xml.in.h:89
+#, fuzzy
+msgid "Bengali Probhat"
+msgstr "Bengali"
+
+#: ../rules/base.xml.in.h:90
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr ""
+
+#: ../rules/base.xml.in.h:91
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr ""
+
+#: ../rules/base.xml.in.h:92
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:93
+#, fuzzy
+msgid "Bhu"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:94
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: ../rules/base.xml.in.h:95
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Bibelsk hebraisk (Tiro)"
+
+#: ../rules/base.xml.in.h:96
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:97
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:98
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnien-herzegovina"
+
+#: ../rules/base.xml.in.h:99
+msgid "Both Alt keys together change layout."
+msgstr "Begge Alt-taster til sammen skifter layout."
+
+#: ../rules/base.xml.in.h:100
+msgid "Both Ctrl keys together change layout."
+msgstr "Begge Ctrl-taster til sammen skifter layout."
+
+#: ../rules/base.xml.in.h:101
+msgid "Both Shift keys together change layout."
+msgstr "Begge skiftetaster til sammen skifter layout."
+
+#: ../rules/base.xml.in.h:102
+msgid "Both Win-keys switch layout while pressed."
+msgstr "Begge Win-taster skifter layout når der trykkes på dem."
+
+#: ../rules/base.xml.in.h:103
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:104
+#, fuzzy
+msgid "Braille"
+msgstr "Brasiliansk"
+
+#: ../rules/base.xml.in.h:105
+#, fuzzy
+msgid "Brazil"
+msgstr "Brasiliansk"
+
+#: ../rules/base.xml.in.h:106
+msgid "Brazilian ABNT2"
+msgstr "Brasiliansk ABNT2"
+
+#: ../rules/base.xml.in.h:107
+#, fuzzy
+msgid "Brl"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:108
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:109
+msgid "Buckwalter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:110
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Bulgarisk"
+
+#: ../rules/base.xml.in.h:111
+msgid "Cambodia"
+msgstr "Cambodia"
+
+#: ../rules/base.xml.in.h:112
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:113
+msgid "Canada"
+msgstr "Canada"
+
+#: ../rules/base.xml.in.h:114
+#, fuzzy
+msgid "Caps Lock is Compose."
+msgstr "Menu is Compose"
+
+#: ../rules/base.xml.in.h:115
+msgid "CapsLock LED shows alternative layout."
+msgstr "Caps Lock LED viser alternativ layout."
+
+#: ../rules/base.xml.in.h:116
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "Agerer som skiftetasten med lås. Skift annullerer Caps Lock."
+
+#: ../rules/base.xml.in.h:117
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "Agerer som skiftetasten med lås. Skift annullerer ikke Caps Lock."
+
+#: ../rules/base.xml.in.h:118
+msgid "CapsLock just locks the Shift modifier."
+msgstr ""
+
+#: ../rules/base.xml.in.h:119
+msgid "CapsLock key behavior"
+msgstr "Opførsel for Caps Lock-tast"
+
+#: ../rules/base.xml.in.h:120
+#, fuzzy
+msgid "CapsLock key changes layout."
+msgstr "Caps Lock-tast skifter gruppe"
+
+#: ../rules/base.xml.in.h:121
+msgid "CapsLock switch to first layout, Shift+CapsLock switch to last layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:122
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr ""
+
+#: ../rules/base.xml.in.h:123
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr ""
+
+#: ../rules/base.xml.in.h:124
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "Bruger intern forstørrelse af bogstaver. Skift annullerer Caps Lock."
+
+#: ../rules/base.xml.in.h:125
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "Bruger intern forstørrelse af bogstaver. Skift annullerer ikke Caps Lock."
+
+#: ../rules/base.xml.in.h:126
+msgid "Catalan variant with middle-dot L"
+msgstr ""
+
+#: ../rules/base.xml.in.h:127
+msgid "Cedilla"
+msgstr ""
+
+#: ../rules/base.xml.in.h:128
+#, fuzzy
+msgid "Che"
+msgstr "Tje"
+
+#: ../rules/base.xml.in.h:129
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:130
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternativ)"
+
+#: ../rules/base.xml.in.h:131
+#, fuzzy
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:132
+msgid "Cherry CyMotion Master Linux"
+msgstr ""
+
+#: ../rules/base.xml.in.h:133
+msgid "Cherry CyMotion Master XPress"
+msgstr ""
+
+#: ../rules/base.xml.in.h:134
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:135
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:136
+#, fuzzy
+msgid "Chicony KU-0108"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:137
+msgid "China"
+msgstr ""
+
+#: ../rules/base.xml.in.h:138
+msgid "Chuvash"
+msgstr ""
+
+#: ../rules/base.xml.in.h:139
+msgid "Chuvash Latin"
+msgstr ""
+
+#: ../rules/base.xml.in.h:140
+#, fuzzy
+msgid "Classic"
+msgstr "Basal"
+
+#: ../rules/base.xml.in.h:141
+#, fuzzy
+msgid "Classic Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:142
+msgid "Classmate PC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:143
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:144
+msgid "Colemak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:145
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:146
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 taster)"
+
+#: ../rules/base.xml.in.h:147
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 taster)"
+
+#: ../rules/base.xml.in.h:148
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 taster)"
+
+#: ../rules/base.xml.in.h:149
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:150
+#, fuzzy
+msgid "Compose key position"
+msgstr "Ctrl-tast placering"
+
+#: ../rules/base.xml.in.h:151
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+
+#: ../rules/base.xml.in.h:152
+#, fuzzy
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "Super ligger på Win-tasterne (standard)."
+
+#: ../rules/base.xml.in.h:153
+msgid "Croatia"
+msgstr "Kroatien"
+
+#: ../rules/base.xml.in.h:154
+msgid "Ctrl key at bottom left"
+msgstr "Ctrl-tast nederst til venstre"
+
+#: ../rules/base.xml.in.h:155
+msgid "Ctrl key at left of 'A'"
+msgstr "Ctrl-tast til venstre for 'A'"
+
+#: ../rules/base.xml.in.h:156
+msgid "Ctrl key position"
+msgstr "Ctrl-tast placering"
+
+#: ../rules/base.xml.in.h:157
+msgid "Ctrl+Shift change layout."
+msgstr "Ctrl+skift skifter layout."
+
+#: ../rules/base.xml.in.h:158
+msgid "Cyrillic"
+msgstr "Kyrillisk"
+
+#: ../rules/base.xml.in.h:159
+msgid "Cyrillic with guillemets"
+msgstr ""
+
+#: ../rules/base.xml.in.h:160
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr ""
+
+#: ../rules/base.xml.in.h:161
+msgid "Cze"
+msgstr "Tje"
+
+#: ../rules/base.xml.in.h:162
+#, fuzzy
+msgid "Czechia"
+msgstr "Tjekkisk"
+
+#: ../rules/base.xml.in.h:163
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:164
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:165
+msgid "Dan"
+msgstr "Dan"
+
+#: ../rules/base.xml.in.h:166
+msgid "Dead acute"
+msgstr "Død accent"
+
+#: ../rules/base.xml.in.h:167
+msgid "Dead grave acute"
+msgstr "Død accent grave"
+
+#: ../rules/base.xml.in.h:168
+msgid "Default numeric keypad keys."
+msgstr "Standard numerisk tastatur taster."
+
+#: ../rules/base.xml.in.h:169
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:170
+msgid "Dell 101-key PC"
+msgstr "Dell 101-taster PC"
+
+#: ../rules/base.xml.in.h:171
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell bærbar/notebook Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:172
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell bærbar/notebook Precision M series"
+
+#: ../rules/base.xml.in.h:173
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude series bærbar"
+
+#: ../rules/base.xml.in.h:174
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:175
+msgid "Dell SK-8125"
+msgstr "Dell Sk-8125"
+
+#: ../rules/base.xml.in.h:176
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+# mon ikke fejl i engelsk her.
+#: ../rules/base.xml.in.h:177
+msgid "Dell USB Multimedia Keybard"
+msgstr "Dell USB Multimedia Keybard"
+
+#: ../rules/base.xml.in.h:178
+msgid "Denmark"
+msgstr "Danmark"
+
+#: ../rules/base.xml.in.h:179
+msgid "Deu"
+msgstr "Tys"
+
+#: ../rules/base.xml.in.h:180
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:181
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802-serien"
+
+#: ../rules/base.xml.in.h:182
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:183
+msgid "Dvorak international"
+msgstr "Dvorak international"
+
+#: ../rules/base.xml.in.h:184
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr ""
+
+#: ../rules/base.xml.in.h:185
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:186
+#, fuzzy
+msgid "Eastern"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:187
+msgid "Eliminate dead keys"
+msgstr "Slå døde taster fra"
+
+#: ../rules/base.xml.in.h:188
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:189
+#, fuzzy
+msgid "Epo"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:190
+#, fuzzy
+msgid "Ergonomic"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:191
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:192
+msgid "Esperanto"
+msgstr ""
+
+#: ../rules/base.xml.in.h:193
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:194
+#, fuzzy
+msgid "Estonia"
+msgstr "Estisk"
+
+#: ../rules/base.xml.in.h:195
+#, fuzzy
+msgid "Eth"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:196
+#, fuzzy
+msgid "Ethiopia"
+msgstr "Estisk"
+
+#: ../rules/base.xml.in.h:197
+msgid "Evdev-managed keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:198
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:199
+#, fuzzy
+msgid "Ewe"
+msgstr "Sve"
+
+#: ../rules/base.xml.in.h:200
+msgid "Extended"
+msgstr "Udvidet"
+
+#: ../rules/base.xml.in.h:201
+#, fuzzy
+msgid "Extended Backslash"
+msgstr "Udvidet"
+
+#: ../rules/base.xml.in.h:202
+msgid "F-letter (F) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:203
+msgid "Fao"
+msgstr "Fær"
+
+#: ../rules/base.xml.in.h:204
+msgid "Faroe Islands"
+msgstr "Færøerne"
+
+#: ../rules/base.xml.in.h:205
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:206
+msgid "Finland"
+msgstr "Finland"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:209
+msgid "Four-level key with abstract separators"
+msgstr ""
+
+#: ../rules/base.xml.in.h:210
+msgid "Four-level key with comma"
+msgstr ""
+
+#: ../rules/base.xml.in.h:211
+msgid "Four-level key with dot"
+msgstr ""
+
+#: ../rules/base.xml.in.h:212
+msgid "Four-level key with momayyez"
+msgstr ""
+
+#: ../rules/base.xml.in.h:213
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:214
+msgid "France"
+msgstr "Frankrig"
+
+#: ../rules/base.xml.in.h:215
+msgid "French"
+msgstr "Fransk"
+
+#: ../rules/base.xml.in.h:216
+msgid "French (Macintosh)"
+msgstr "Fransk (Macintosh)"
+
+#: ../rules/base.xml.in.h:217
+#, fuzzy
+msgid "French (legacy)"
+msgstr "Fransk (alternativ)"
+
+#: ../rules/base.xml.in.h:218
+msgid "French Dvorak"
+msgstr "Fransk dvorak"
+
+#: ../rules/base.xml.in.h:219
+msgid "French, Sun dead keys"
+msgstr "Fransk, Sun døde taster"
+
+#: ../rules/base.xml.in.h:220
+msgid "French, eliminate dead keys"
+msgstr "Fransk, slå døde taster fra"
+
+#: ../rules/base.xml.in.h:221
+msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
+msgstr "Fujitsu-Siemens Computers AMILO A1667G bærbar"
+
+#: ../rules/base.xml.in.h:222
+msgid "Fula"
+msgstr ""
+
+#: ../rules/base.xml.in.h:223
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:224
+msgid "Ga"
+msgstr ""
+
+#: ../rules/base.xml.in.h:225
+msgid "Generic 101-key PC"
+msgstr "Generisk 101-taster PC"
+
+#: ../rules/base.xml.in.h:226
+msgid "Generic 102-key (Intl) PC"
+msgstr "Generisk 102-taster (Intl) PC"
+
+#: ../rules/base.xml.in.h:227
+msgid "Generic 104-key PC"
+msgstr "Generisk 104-taster PC"
+
+#: ../rules/base.xml.in.h:228
+msgid "Generic 105-key (Intl) PC"
+msgstr "Generisk 105-taster (Intl) PC"
+
+#: ../rules/base.xml.in.h:229
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:230
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:231
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:232
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:233
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:234
+msgid "Georgia"
+msgstr "Georgien"
+
+#: ../rules/base.xml.in.h:235
+msgid "Georgian"
+msgstr "Georgisk"
+
+#: ../rules/base.xml.in.h:236
+msgid "Georgian AZERTY Tskapo"
+msgstr "Georgisk AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:237
+msgid "German (Macintosh)"
+msgstr "Tysk (Macintosh)"
+
+#: ../rules/base.xml.in.h:238
+msgid "German, Sun dead keys"
+msgstr "Tysk, Sun døde taster"
+
+#: ../rules/base.xml.in.h:239
+msgid "German, eliminate dead keys"
+msgstr "Tysk, slå døde taster fra"
+
+#: ../rules/base.xml.in.h:240
+msgid "Germany"
+msgstr "Tyskland"
+
+#: ../rules/base.xml.in.h:241
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:242
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../rules/base.xml.in.h:243
+msgid "Gre"
+msgstr "Græ"
+
+#: ../rules/base.xml.in.h:244
+msgid "Greece"
+msgstr "Grækenland"
+
+#: ../rules/base.xml.in.h:245
+msgid "Group toggle on multiply/divide key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:246
+#, fuzzy
+msgid "Gui"
+msgstr "Guj"
+
+#: ../rules/base.xml.in.h:247
+msgid "Guinea"
+msgstr ""
+
+#: ../rules/base.xml.in.h:248
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../rules/base.xml.in.h:249
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../rules/base.xml.in.h:250
+msgid "Gurmukhi Jhelum"
+msgstr "Gurmukhi Jhelum"
+
+#: ../rules/base.xml.in.h:251
+#, fuzzy
+msgid "Gyration"
+msgstr "Kroatisk"
+
+#: ../rules/base.xml.in.h:252
+msgid "Happy Hacking Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:253
+msgid "Happy Hacking Keyboard for Mac"
+msgstr ""
+
+#: ../rules/base.xml.in.h:254
+msgid "Hausa"
+msgstr ""
+
+#: ../rules/base.xml.in.h:255
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:256
+msgid "Hewlett-Packard Internet Keyboard 5181"
+msgstr "Hewlett-Packard Internet Keyboard 5181"
+
+#: ../rules/base.xml.in.h:257
+msgid "Hewlett-Packard Internet Keyboard 5185"
+msgstr "Hewlett-Packard Internet Keyboard 5185"
+
+#: ../rules/base.xml.in.h:258
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:259
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:260
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:261
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:262
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:263
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:264
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:265
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:266
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:267
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+#: ../rules/base.xml.in.h:268
+msgid "Hindi Bolnagri"
+msgstr ""
+
+#: ../rules/base.xml.in.h:269
+msgid "Homophonic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:270
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:271
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:272
+msgid "Hun"
+msgstr "Ung"
+
+#: ../rules/base.xml.in.h:273
+msgid "Hungary"
+msgstr "Ungarn"
+
+#: ../rules/base.xml.in.h:274
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper ligger på Win-tasterne."
+
+#: ../rules/base.xml.in.h:275
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:276
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:277
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:278
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (alternativ)"
+
+#: ../rules/base.xml.in.h:279
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:280
+#, fuzzy
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:281
+msgid "IBM ThinkPad R60/T60/Z60m/Z60t/R61/T61/Z61m/Z61t"
+msgstr "IBM ThinkPad R60/T60/Z60m/Z60t/R61/T61/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:282
+msgid "ISO Alternate"
+msgstr "ISO-alternativ"
+
+#: ../rules/base.xml.in.h:283
+msgid "Iceland"
+msgstr "Island"
+
+#: ../rules/base.xml.in.h:284
+msgid "Igbo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:285
+#, fuzzy
+msgid "Ind"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:286
+#, fuzzy
+msgid "India"
+msgstr "Canadisk"
+
+#: ../rules/base.xml.in.h:287
+msgid "International (AltGr dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:288
+msgid "International (with dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:289
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: ../rules/base.xml.in.h:290
+msgid "Iran"
+msgstr "Iran"
+
+#: ../rules/base.xml.in.h:291
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../rules/base.xml.in.h:292
+msgid "Ireland"
+msgstr "Irland"
+
+#: ../rules/base.xml.in.h:293
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:294
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:295
+msgid "Irq"
+msgstr "Irk"
+
+#: ../rules/base.xml.in.h:296
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:297
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:298
+msgid "Israel"
+msgstr "Israel"
+
+#: ../rules/base.xml.in.h:299
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:300
+msgid "Italy"
+msgstr "Italien"
+
+#: ../rules/base.xml.in.h:301
+msgid "Japan"
+msgstr "Japan"
+
+#: ../rules/base.xml.in.h:302
+msgid "Japan (PC-98xx Series)"
+msgstr "Japan (PC-98xx serier)"
+
+#: ../rules/base.xml.in.h:303
+msgid "Japanese 106-key"
+msgstr "Japansk 106-taster"
+
+#: ../rules/base.xml.in.h:304
+msgid "Japanese keyboard options"
+msgstr ""
+
+#: ../rules/base.xml.in.h:305
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:306
+#, fuzzy
+msgid "Kana"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:307
+msgid "Kana Lock key is locking"
+msgstr ""
+
+#: ../rules/base.xml.in.h:308
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../rules/base.xml.in.h:309
+msgid "Kashubian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:310
+#, fuzzy
+msgid "Kaz"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:311
+msgid "Kazakh with Russian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:312
+msgid "Kazakhstan"
+msgstr "Kazakstan"
+
+#: ../rules/base.xml.in.h:313
+msgid "Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:314
+msgid "Keypad with unicode additions (arrows and math operators)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:315
+msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:316
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:317
+msgid "Khm"
+msgstr ""
+
+#: ../rules/base.xml.in.h:318
+msgid "Kir"
+msgstr ""
+
+#: ../rules/base.xml.in.h:319
+msgid "Komi"
+msgstr ""
+
+#: ../rules/base.xml.in.h:320
+#, fuzzy
+msgid "Kor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:321
+msgid "Korea, Republic of"
+msgstr ""
+
+#: ../rules/base.xml.in.h:322
+msgid "Korean 106-key"
+msgstr "Koreansk 106-tast"
+
+#: ../rules/base.xml.in.h:323
+msgid "Kurdish, (F)"
+msgstr "Kurdisk, (F)"
+
+#: ../rules/base.xml.in.h:324
+msgid "Kurdish, Arabic-Latin"
+msgstr ""
+
+#: ../rules/base.xml.in.h:325
+msgid "Kurdish, Latin Alt-Q"
+msgstr ""
+
+#: ../rules/base.xml.in.h:326
+msgid "Kurdish, Latin Q"
+msgstr ""
+
+#: ../rules/base.xml.in.h:327
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:328
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:329
+#, fuzzy
+msgid "LCtrl+LShift change layout."
+msgstr "Ctrl+skift skifter gruppe"
+
+#: ../rules/base.xml.in.h:330
+msgid "LEKP"
+msgstr ""
+
+#: ../rules/base.xml.in.h:331
+msgid "LEKPa"
+msgstr ""
+
+#: ../rules/base.xml.in.h:332
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:333
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:334
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Bærbar Compaq (fx Armada) Laptop Keyboard"
+
+#: ../rules/base.xml.in.h:335
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Bærbar/notebook Compaq (fx Presario) Internet Keyboard"
+
+#: ../rules/base.xml.in.h:336
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Bærbar/notebook eMachines m68xx"
+
+#: ../rules/base.xml.in.h:337
+msgid "Latin"
+msgstr "Latin"
+
+#: ../rules/base.xml.in.h:338
+#, fuzzy
+msgid "Latin American"
+msgstr "Latinamerika"
+
+#: ../rules/base.xml.in.h:339
+#, fuzzy
+msgid "Latin Unicode"
+msgstr "Latinamerika"
+
+#: ../rules/base.xml.in.h:340
+#, fuzzy
+msgid "Latin Unicode qwerty"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:341
+msgid "Latin qwerty"
+msgstr "Latin qwerty"
+
+#: ../rules/base.xml.in.h:342
+#, fuzzy
+msgid "Latin unicode"
+msgstr "Latinamerika"
+
+#: ../rules/base.xml.in.h:343
+msgid "Latin unicode qwerty"
+msgstr ""
+
+#: ../rules/base.xml.in.h:344
+msgid "Latin with guillemets"
+msgstr ""
+
+#: ../rules/base.xml.in.h:345
+#, fuzzy
+msgid "Latvia"
+msgstr "Lettisk"
+
+#: ../rules/base.xml.in.h:346
+#, fuzzy
+msgid "Lav"
+msgstr "Let"
+
+#: ../rules/base.xml.in.h:347
+msgid "Layout switching"
+msgstr ""
+
+#: ../rules/base.xml.in.h:348
+#, fuzzy
+msgid "Left Alt is swapped with left Win-key."
+msgstr "Meta ligger på venstre Win-tast."
+
+#: ../rules/base.xml.in.h:349
+#, fuzzy
+msgid "Left Alt key changes layout."
+msgstr "Venstre Alt-tast skifter gruppe"
+
+#: ../rules/base.xml.in.h:350
+#, fuzzy
+msgid "Left Alt key switches layout while pressed."
+msgstr "Venstre Win-tast skifter gruppe mens nedtrykket"
+
+#: ../rules/base.xml.in.h:351
+#, fuzzy
+msgid "Left Ctrl key changes layout."
+msgstr "Venstre Ctrl-tast skifter gruppe"
+
+#: ../rules/base.xml.in.h:352
+#, fuzzy
+msgid "Left Shift key changes layout."
+msgstr "Venstre skiftetast skifter gruppe"
+
+#: ../rules/base.xml.in.h:353
+#, fuzzy
+msgid "Left Win-key changes layout."
+msgstr "Venstre Win-tast skifter gruppe"
+
+#: ../rules/base.xml.in.h:354
+#, fuzzy
+msgid "Left Win-key is Compose."
+msgstr "Højre Win-tast er Compose"
+
+#: ../rules/base.xml.in.h:355
+#, fuzzy
+msgid "Left Win-key switches layout while pressed."
+msgstr "Venstre Win-tast skifter gruppe mens nedtrykket"
+
+#: ../rules/base.xml.in.h:356
+msgid "Left hand"
+msgstr "Venstre hånd"
+
+#: ../rules/base.xml.in.h:357
+msgid "Left handed Dvorak"
+msgstr "Venstrehåndet dvorak"
+
+#: ../rules/base.xml.in.h:358
+msgid "Legacy"
+msgstr ""
+
+#: ../rules/base.xml.in.h:359
+msgid "Legacy Wang 724 keypad"
+msgstr ""
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:361
+msgid "Legacy key with comma"
+msgstr ""
+
+#: ../rules/base.xml.in.h:362
+msgid "Legacy key with dot"
+msgstr ""
+
+#: ../rules/base.xml.in.h:363
+msgid "Legacy keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:364
+msgid "Less-than/Greater-than is Compose."
+msgstr ""
+
+#: ../rules/base.xml.in.h:365
+msgid "Lithuania"
+msgstr ""
+
+#: ../rules/base.xml.in.h:366
+#, fuzzy
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Deluxe Access Keyboard"
+
+#: ../rules/base.xml.in.h:367
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:368
+#, fuzzy
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (alternativ)"
+
+#: ../rules/base.xml.in.h:369
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:370
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:371
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:372
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:373
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (alternativ 2)"
+
+#: ../rules/base.xml.in.h:374
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:375
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:376
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 ekstra taster via G15daemon"
+
+#: ../rules/base.xml.in.h:377
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech Generic Keyboard"
+
+#: ../rules/base.xml.in.h:378
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Keyboard"
+
+#: ../rules/base.xml.in.h:379
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:380
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:381
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite Keyboard"
+
+#: ../rules/base.xml.in.h:382
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:383
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:384
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Keyboard"
+
+#: ../rules/base.xml.in.h:385
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:386
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:387
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:388
+#, fuzzy
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:389
+#, fuzzy
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:390
+msgid "Ltu"
+msgstr "Lit"
+
+#: ../rules/base.xml.in.h:391
+msgid "MESS"
+msgstr ""
+
+#: ../rules/base.xml.in.h:392
+msgid "MNE"
+msgstr ""
+
+#: ../rules/base.xml.in.h:393
+msgid "MacBook/MacBook Pro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:394
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:395
+#, fuzzy
+msgid "Macedonia"
+msgstr "Makedonsk"
+
+#: ../rules/base.xml.in.h:396
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:397
+msgid "Macintosh Old"
+msgstr "Macintosh gammel"
+
+#: ../rules/base.xml.in.h:398
+#, fuzzy
+msgid "Macintosh, Sun dead keys"
+msgstr "Sun døde taster"
+
+#: ../rules/base.xml.in.h:399
+#, fuzzy
+msgid "Macintosh, eliminate dead keys"
+msgstr "Slå døde taster fra"
+
+#: ../rules/base.xml.in.h:400
+#, fuzzy
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Gør Caps Lock til en ekstra Ctrl"
+
+#: ../rules/base.xml.in.h:401
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:402
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../rules/base.xml.in.h:403
+#, fuzzy
+msgid "Malayalam Lalitha"
+msgstr "Malayalam"
+
+#: ../rules/base.xml.in.h:404
+#, fuzzy
+msgid "Maldives"
+msgstr "Maltesisk"
+
+#: ../rules/base.xml.in.h:405
+#, fuzzy
+msgid "Malta"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:406
+#, fuzzy
+msgid "Maltese keyboard with US layout"
+msgstr "Maltesisk (US-layout)"
+
+#: ../rules/base.xml.in.h:407
+#, fuzzy
+msgid "Mao"
+msgstr "Fær"
+
+#: ../rules/base.xml.in.h:408
+#, fuzzy
+msgid "Maori"
+msgstr "Farsi"
+
+#: ../rules/base.xml.in.h:409
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:410
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:411
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:412
+#, fuzzy
+msgid "Menu is Compose."
+msgstr "Menu is Compose"
+
+#: ../rules/base.xml.in.h:413
+#, fuzzy
+msgid "Menu key changes layout."
+msgstr "Menutast skifter gruppe"
+
+#: ../rules/base.xml.in.h:414
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta ligger på Win-tasterne."
+
+#: ../rules/base.xml.in.h:415
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta ligger på venstre Win-tast."
+
+#: ../rules/base.xml.in.h:416
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:417
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, svensk"
+
+#: ../rules/base.xml.in.h:418
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:419
+#, fuzzy
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:420
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:421
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:422
+#, fuzzy
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:423
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:424
+#, fuzzy
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:425
+msgid "Miscellaneous compatibility options"
+msgstr "Diverse kompatibilitetsvalg"
+
+#: ../rules/base.xml.in.h:426
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:427
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:428
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:429
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:430
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mongolsk"
+
+#: ../rules/base.xml.in.h:431
+msgid "Montenegro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:432
+msgid "Morocco"
+msgstr ""
+
+#: ../rules/base.xml.in.h:433
+msgid "Multilingual"
+msgstr ""
+
+#: ../rules/base.xml.in.h:434
+msgid "Multilingual, first part"
+msgstr ""
+
+#: ../rules/base.xml.in.h:435
+msgid "Multilingual, second part"
+msgstr ""
+
+#: ../rules/base.xml.in.h:436
+#, fuzzy
+msgid "Myanmar"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:437
+msgid "NICOLA-F style Backspace"
+msgstr ""
+
+#: ../rules/base.xml.in.h:438
+msgid "Neostyle"
+msgstr ""
+
+#: ../rules/base.xml.in.h:439
+msgid "Nep"
+msgstr ""
+
+#: ../rules/base.xml.in.h:440
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../rules/base.xml.in.h:441
+msgid "Netherlands"
+msgstr "Holland"
+
+#: ../rules/base.xml.in.h:442
+msgid "Nig"
+msgstr "Nig"
+
+#: ../rules/base.xml.in.h:443
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#: ../rules/base.xml.in.h:444
+msgid "Nld"
+msgstr "Hollandsk"
+
+#: ../rules/base.xml.in.h:445
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:446
+msgid "Northern Saami"
+msgstr "Nordligt saami"
+
+#: ../rules/base.xml.in.h:447
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Nordligt saami, slå døde taster fra"
+
+#: ../rules/base.xml.in.h:448
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:449
+msgid "Norway"
+msgstr "Norge"
+
+#: ../rules/base.xml.in.h:450
+#, fuzzy
+msgid "NumLock LED shows alternative layout."
+msgstr "Num Lock LED viser alternativ gruppe"
+
+#: ../rules/base.xml.in.h:451
+msgid "Numeric keypad delete key behaviour"
+msgstr ""
+
+#: ../rules/base.xml.in.h:452
+msgid "Numeric keypad keys work as with Mac."
+msgstr ""
+
+#: ../rules/base.xml.in.h:453
+msgid "Numeric keypad layout selection"
+msgstr ""
+
+#: ../rules/base.xml.in.h:454
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:455
+msgid "OLPC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:456
+msgid "OLPC Dari"
+msgstr ""
+
+#: ../rules/base.xml.in.h:457
+msgid "OLPC Pashto"
+msgstr ""
+
+#: ../rules/base.xml.in.h:458
+msgid "OLPC Southern Uzbek"
+msgstr ""
+
+#: ../rules/base.xml.in.h:459
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:460
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:461
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../rules/base.xml.in.h:462
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet keyboard"
+
+#: ../rules/base.xml.in.h:463
+#, fuzzy
+msgid "Ossetian"
+msgstr "Russisk"
+
+#: ../rules/base.xml.in.h:464
+msgid "Ossetian, Winkeys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:465
+msgid "Ossetian, legacy"
+msgstr ""
+
+#: ../rules/base.xml.in.h:466
+msgid "PC-98xx Series"
+msgstr "PC-98xx-serien"
+
+#: ../rules/base.xml.in.h:467
+#, fuzzy
+msgid "Pak"
+msgstr "Pan"
+
+#: ../rules/base.xml.in.h:468
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:469
+msgid "Pashto"
+msgstr ""
+
+#: ../rules/base.xml.in.h:470
+#, fuzzy
+msgid "Pattachote"
+msgstr "Thai (Pattachote)"
+
+#: ../rules/base.xml.in.h:471
+msgid "Phonetic"
+msgstr "Fonetisk"
+
+#: ../rules/base.xml.in.h:472
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:473
+msgid "Poland"
+msgstr "Polen"
+
+#: ../rules/base.xml.in.h:474
+msgid "Polytonic"
+msgstr "Polytonisk"
+
+#: ../rules/base.xml.in.h:475
+msgid "Portugal"
+msgstr "Portugal"
+
+#: ../rules/base.xml.in.h:476
+#, fuzzy
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Tryk venstre Win-tast for at vælge tredje niveau"
+
+#: ../rules/base.xml.in.h:477
+#, fuzzy
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Tryk venstre Win-tast for at vælge tredje niveau"
+
+#: ../rules/base.xml.in.h:478
+#, fuzzy
+msgid "Press Menu key to choose 3rd level."
+msgstr "Tryk menutast for at vælge tredje niveau"
+
+#: ../rules/base.xml.in.h:479
+#, fuzzy
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "Tryk højre Win-tast for at vælge tredje niveau"
+
+#: ../rules/base.xml.in.h:480
+#, fuzzy
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Tryk højre Win-tast for at vælge tredje niveau"
+
+#: ../rules/base.xml.in.h:481
+#, fuzzy
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Tryk højre Ctrl-tast for at vælge tredje niveau"
+
+#: ../rules/base.xml.in.h:482
+#, fuzzy
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Tryk højre Win-tast for at vælge tredje niveau"
+
+#: ../rules/base.xml.in.h:483
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Tryk på en af Alt-tasterne for at vælge tredje niveau."
+
+#: ../rules/base.xml.in.h:484
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Tryk på en af Win-tasterne for at vælge tredje niveau."
+
+#: ../rules/base.xml.in.h:485
+#, fuzzy
+msgid "Pro"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:486
+msgid "Pro Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:487
+#, fuzzy
+msgid "Probhat"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:488
+msgid "Programmer Dvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:489
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:490
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:491
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:492
+#, fuzzy
+msgid "R-Alt switches layout while pressed."
+msgstr "Højre Alt skifter gruppe mens nedtrykket"
+
+#: ../rules/base.xml.in.h:493
+#, fuzzy
+msgid "Right Alt is Compose."
+msgstr "Højre Alt er Compose"
+
+#: ../rules/base.xml.in.h:494
+#, fuzzy
+msgid "Right Alt key changes layout."
+msgstr "Højre Alt-tast skifter gruppe"
+
+#: ../rules/base.xml.in.h:495
+#, fuzzy
+msgid "Right Alt key never chooses 3rd level."
+msgstr "Tryk højre Win-tast for at vælge tredje niveau"
+
+#: ../rules/base.xml.in.h:496
+#, fuzzy
+msgid "Right Ctrl is Compose."
+msgstr "Højre Alt er Compose"
+
+#: ../rules/base.xml.in.h:497
+#, fuzzy
+msgid "Right Ctrl key changes layout."
+msgstr "Højre Ctrl-tast skifter gruppe"
+
+#: ../rules/base.xml.in.h:498
+#, fuzzy
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "Højre Win-tast skifter gruppe mens nedtrykket"
+
+#: ../rules/base.xml.in.h:499
+#, fuzzy
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Højre Ctrl-tast virker som højre Alt"
+
+#: ../rules/base.xml.in.h:500
+#, fuzzy
+msgid "Right Shift key changes layout."
+msgstr "Højre skiftetast skifter gruppe"
+
+#: ../rules/base.xml.in.h:501
+#, fuzzy
+msgid "Right Win-key changes layout."
+msgstr "Højre Win-tast skifter gruppe"
+
+#: ../rules/base.xml.in.h:502
+#, fuzzy
+msgid "Right Win-key is Compose."
+msgstr "Højre Win-tast er Compose"
+
+#: ../rules/base.xml.in.h:503
+#, fuzzy
+msgid "Right Win-key switches layout while pressed."
+msgstr "Højre Win-tast skifter gruppe mens nedtrykket"
+
+#: ../rules/base.xml.in.h:504
+msgid "Right hand"
+msgstr "Højre hånd"
+
+#: ../rules/base.xml.in.h:505
+msgid "Right handed Dvorak"
+msgstr "Højre hånd dvorak"
+
+#: ../rules/base.xml.in.h:506
+#, fuzzy
+msgid "Romania"
+msgstr "Rumænsk"
+
+#: ../rules/base.xml.in.h:507
+#, fuzzy
+msgid "Romanian keyboard with German letters"
+msgstr "US-tastatur med rumænske bogstaver"
+
+#: ../rules/base.xml.in.h:508
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:509
+msgid "Rou"
+msgstr "Rum"
+
+#: ../rules/base.xml.in.h:510
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:511
+msgid "Russia"
+msgstr "Rusland"
+
+#: ../rules/base.xml.in.h:512
+msgid "Russian"
+msgstr "Russisk"
+
+#: ../rules/base.xml.in.h:513
+#, fuzzy
+msgid "Russian phonetic"
+msgstr "Russisk"
+
+#: ../rules/base.xml.in.h:514
+msgid "Russian phonetic Dvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:515
+#, fuzzy
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Slå døde taster fra"
+
+#: ../rules/base.xml.in.h:516
+msgid "Russian with Kazakh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:517
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:518
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:519
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:520
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:521
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:522
+msgid "SRB"
+msgstr ""
+
+#: ../rules/base.xml.in.h:523
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:524
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:525
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:526
+#, fuzzy
+msgid "ScrollLock LED shows alternative layout."
+msgstr "Scroll Lock LED viser alternativ gruppe"
+
+#: ../rules/base.xml.in.h:527
+msgid "Secwepemctsin"
+msgstr ""
+
+#: ../rules/base.xml.in.h:528
+msgid "Serbia"
+msgstr "Serbien"
+
+#: ../rules/base.xml.in.h:529
+msgid "Shift cancels CapsLock."
+msgstr ""
+
+#: ../rules/base.xml.in.h:530
+#, fuzzy
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "Skift med numeriske taster virker som i MS Windows"
+
+#: ../rules/base.xml.in.h:531
+#, fuzzy
+msgid "Shift+CapsLock changes layout."
+msgstr "Caps Lock-tast skifter gruppe"
+
+#: ../rules/base.xml.in.h:532
+msgid "Slovakia"
+msgstr "Slovakiet"
+
+#: ../rules/base.xml.in.h:533
+msgid "Slovenia"
+msgstr "Slovenien"
+
+#: ../rules/base.xml.in.h:534
+msgid "South Africa"
+msgstr "Sydafrika"
+
+#: ../rules/base.xml.in.h:535
+msgid "Southern Uzbek"
+msgstr ""
+
+#: ../rules/base.xml.in.h:536
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:537
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift"
+msgstr ""
+
+#: ../rules/base.xml.in.h:538
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:539
+msgid "Space key outputs non-breakable space character at second level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:540
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:541
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:542
+msgid "Space key outputs non-breakable space character at third level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:543
+msgid "Space key outputs usual space at any level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:544
+#, fuzzy
+msgid "Spain"
+msgstr "Spansk"
+
+#: ../rules/base.xml.in.h:545
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Specialtaster (Ctrl+Alt+&lt;key&gt;) håndteret i en server."
+
+#: ../rules/base.xml.in.h:546
+#, fuzzy
+msgid "SrL"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:547
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../rules/base.xml.in.h:548
+msgid "Standard"
+msgstr "Standard"
+
+#: ../rules/base.xml.in.h:549
+#, fuzzy
+msgid "Standard (Cedilla)"
+msgstr "Standard"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:551
+#, fuzzy
+msgid "Standard RSTU"
+msgstr "Standard"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:553
+msgid "Standard RSTU on Russian layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:554
+msgid "Sun Type 5/6"
+msgstr "Sun type 5/6"
+
+#: ../rules/base.xml.in.h:555
+msgid "Sun dead keys"
+msgstr "Sun døde taster"
+
+#: ../rules/base.xml.in.h:556
+#, fuzzy
+msgid "Super Power Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:557
+#, fuzzy
+msgid "Super is mapped to the Win-keys."
+msgstr "Hyper ligger på Win-tasterne."
+
+#: ../rules/base.xml.in.h:558
+#, fuzzy
+msgid "Svdvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:559
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:560
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:561
+#, fuzzy
+msgid "Swap Ctrl and CapsLock."
+msgstr "Ombyt Ctrl og Caps Lock"
+
+#: ../rules/base.xml.in.h:562
+#, fuzzy
+msgid "Swap ESC and CapsLock."
+msgstr "Ombyt Ctrl og Caps Lock"
+
+#: ../rules/base.xml.in.h:563
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr ""
+
+#: ../rules/base.xml.in.h:564
+msgid "Swe"
+msgstr "Sve"
+
+#: ../rules/base.xml.in.h:565
+#, fuzzy
+msgid "Sweden"
+msgstr "Sve"
+
+#: ../rules/base.xml.in.h:566
+#, fuzzy
+msgid "Switzerland"
+msgstr "Schweizisk-tysk"
+
+#: ../rules/base.xml.in.h:567
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet-pc)"
+
+#: ../rules/base.xml.in.h:568
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:569
+msgid "Syria"
+msgstr "Syrien"
+
+#: ../rules/base.xml.in.h:570
+msgid "Syriac"
+msgstr "Syrisk"
+
+#: ../rules/base.xml.in.h:571
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Fonetisk"
+
+#: ../rules/base.xml.in.h:572
+#, fuzzy
+msgid "TIS-820.2538"
+msgstr "Thai (TIS-820.2538)"
+
+#: ../rules/base.xml.in.h:573
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Tajik"
+
+#: ../rules/base.xml.in.h:574
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../rules/base.xml.in.h:575
+#, fuzzy
+msgid "Tamil TAB Typewriter"
+msgstr "\"Skrivemaskine\""
+
+#: ../rules/base.xml.in.h:576
+msgid "Tamil TSCII Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:577
+msgid "Tamil Unicode"
+msgstr ""
+
+#: ../rules/base.xml.in.h:578
+msgid "Tatar"
+msgstr ""
+
+#: ../rules/base.xml.in.h:579
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../rules/base.xml.in.h:580
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:581
+#, fuzzy
+msgid "Thailand"
+msgstr "Tamil"
+
+#: ../rules/base.xml.in.h:582
+msgid "Third level choosers"
+msgstr "Tredje niveaus vælgere"
+
+#: ../rules/base.xml.in.h:583
+msgid "Tibetan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:584
+msgid "Tibetan (with ASCII numerals)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:585
+msgid "Tifinagh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:586
+#, fuzzy
+msgid "Tifinagh Alternative"
+msgstr "Fransk (alternativ)"
+
+#: ../rules/base.xml.in.h:587
+msgid "Tifinagh Alternative Phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:588
+msgid "Tifinagh Extended"
+msgstr "Tifinagh udvidet"
+
+#: ../rules/base.xml.in.h:589
+msgid "Tifinagh Extended Phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:590
+#, fuzzy
+msgid "Tifinagh Phonetic"
+msgstr "Fonetisk"
+
+#: ../rules/base.xml.in.h:591
+msgid "Tilde (~) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:592
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:593
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:594
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:595
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:596
+msgid "Tur"
+msgstr "Tyr"
+
+#: ../rules/base.xml.in.h:597
+#, fuzzy
+msgid "Turkey"
+msgstr "Tyr"
+
+#: ../rules/base.xml.in.h:598
+#, fuzzy
+msgid "Typewriter"
+msgstr "\"Skrivemaskine\""
+
+#: ../rules/base.xml.in.h:599
+#, fuzzy
+msgid "US keyboard with Bosnian digraphs"
+msgstr "US-tastatur med rumænske bogstaver"
+
+#: ../rules/base.xml.in.h:600
+#, fuzzy
+msgid "US keyboard with Bosnian letters"
+msgstr "US-tastatur med rumænske bogstaver"
+
+#: ../rules/base.xml.in.h:601
+#, fuzzy
+msgid "US keyboard with Croatian digraphs"
+msgstr "US-tastatur med rumænske bogstaver"
+
+#: ../rules/base.xml.in.h:602
+#, fuzzy
+msgid "US keyboard with Croatian letters"
+msgstr "US-tastatur med rumænske bogstaver"
+
+#: ../rules/base.xml.in.h:603
+#, fuzzy
+msgid "US keyboard with Estonian letters"
+msgstr "US-tastatur med rumænske bogstaver"
+
+#: ../rules/base.xml.in.h:604
+#, fuzzy
+msgid "US keyboard with Lithuanian letters"
+msgstr "US-tastatur med rumænske bogstaver"
+
+#: ../rules/base.xml.in.h:605
+#, fuzzy
+msgid "US keyboard with Slovenian digraphs"
+msgstr "US-tastatur med rumænske bogstaver"
+
+#: ../rules/base.xml.in.h:606
+#, fuzzy
+msgid "US keyboard with Slovenian letters"
+msgstr "US-tastatur med rumænske bogstaver"
+
+#: ../rules/base.xml.in.h:607
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.xml.in.h:608
+msgid "Udmurt"
+msgstr ""
+
+#: ../rules/base.xml.in.h:609
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:610
+#, fuzzy
+msgid "Ukraine"
+msgstr "Ukraine"
+
+#: ../rules/base.xml.in.h:611
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:612
+msgid "United Kingdom"
+msgstr "United Kingdom"
+
+#: ../rules/base.xml.in.h:613
+msgid "Urdu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:614
+msgid "Use Bosnian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:615
+msgid "Use Croatian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:616
+msgid "Use Slovenian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:617
+msgid "Use guillemets for quotes"
+msgstr ""
+
+#: ../rules/base.xml.in.h:618
+#, fuzzy
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Bruger tastatur-LED til at vise alternativ gruppe"
+
+#: ../rules/base.xml.in.h:619
+msgid "Using space key to input non-breakable space character"
+msgstr ""
+
+#: ../rules/base.xml.in.h:620
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:621
+#, fuzzy
+msgid "Uzbekistan"
+msgstr "Uzbekisk"
+
+#: ../rules/base.xml.in.h:622
+#, fuzzy
+msgid "Vietnam"
+msgstr "Vietnamesisk"
+
+#: ../rules/base.xml.in.h:623
+#, fuzzy
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:624
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:625
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:626
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:627
+msgid "Wang model 724 azerty"
+msgstr ""
+
+#: ../rules/base.xml.in.h:628
+msgid "Western"
+msgstr ""
+
+#: ../rules/base.xml.in.h:629
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:630
+msgid "Winkeys"
+msgstr "Win-taster"
+
+#: ../rules/base.xml.in.h:631
+msgid "With &lt;\\|&gt; key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:632
+msgid "With EuroSign on 5"
+msgstr ""
+
+#: ../rules/base.xml.in.h:633
+msgid "With guillemets"
+msgstr ""
+
+#: ../rules/base.xml.in.h:634
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:635
+msgid "Yoruba"
+msgstr ""
+
+#: ../rules/base.xml.in.h:636
+msgid "Z and ZHE swapped"
+msgstr ""
+
+#: ../rules/base.xml.in.h:637
+msgid "Zar"
+msgstr ""
+
+#: ../rules/base.xml.in.h:638
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:639
+msgid "azerty/digits"
+msgstr "azerty/cifre"
+
+#: ../rules/base.xml.in.h:640
+msgid "digits"
+msgstr "cifre"
+
+#: ../rules/base.xml.in.h:641
+msgid "displaced semicolon and quote (obsolete)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:642
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:643
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:644
+msgid "qwerty, extended Backslash"
+msgstr ""
+
+#: ../rules/base.xml.in.h:645
+msgid "qwerty/digits"
+msgstr "qwerty/cifre"
+
+#: ../rules/base.xml.in.h:646
+#, fuzzy
+msgid "qwertz"
+msgstr "qwerty"
+
+#~ msgid "A Tamil typewrite-style keymap; TAB encoding"
+#~ msgstr "En tamilsk skrivemaskine-tastaturudlægning; TAB-kodning"
+
+#~ msgid "A Tamil typewrite-style keymap; TSCII encoding"
+#~ msgstr "En tamilsk skrivemaskine-tastaturudlægning; TSCII-kodning"
+
+#~ msgid "A Tamil typewrite-style keymap; Unicode encoding"
+#~ msgstr "En tamilsk skrivemaskine-tastaturudlægning; Unicode-kodning"
+
+#~ msgid "Arb"
+#~ msgstr "Arb"
+
+#~ msgid "Bosnian"
+#~ msgstr "Bosnisk"
+
+#~ msgid "Burmese"
+#~ msgstr "Burmesisk"
+
+#~ msgid "CloGaelach Laptop"
+#~ msgstr "CloGaelach-bærbar"
+
+#~ msgid "Czech (qwerty)"
+#~ msgstr "Tjekkisk (qwerty)"
+
+#~ msgid "Danish"
+#~ msgstr "Dansk"
+
+#~ msgid "Dutch"
+#~ msgstr "Hollandsk"
+
+#~ msgid "Dvo"
+#~ msgstr "Dvo"
+
+#~ msgid "Finnish"
+#~ msgstr "Finsk"
+
+#~ msgid "French Canadian"
+#~ msgstr "Fransk-canadisk"
+
+#~ msgid "Georgian (latin)"
+#~ msgstr "Georgisk (latinsk)"
+
+#~ msgid "Georgian (russian)"
+#~ msgstr "Georgisk (russisk)"
+
+#~ msgid "Grc"
+#~ msgstr "Græ"
+
+#~ msgid "Group Shift/Lock behavior"
+#~ msgstr "Gruppeskift/-lås-opførsel"
+
+#~ msgid "Hin"
+#~ msgstr "Hin"
+
+#~ msgid "Hindi"
+#~ msgstr "Hindi"
+
+#~ msgid "INSCRIPT layout"
+#~ msgstr "INSCRIPT-layout"
+
+#~ msgid "IS434 laptop"
+#~ msgstr "IS434-bærbar"
+
+#~ msgid "Iku"
+#~ msgstr "Iku"
+
+#~ msgid "Irish"
+#~ msgstr "Irsk"
+
+#~ msgid "Italian"
+#~ msgstr "Italiensk"
+
+#~ msgid "Lithuanian azerty standard"
+#~ msgstr "Litauisk azerty-standard"
+
+#~ msgid "Lithuanian qwerty \"numeric\""
+#~ msgstr "Litauisk qwerty-numerisk"
+
+#~ msgid "Logitech iTouch keyboard Internet Navigator"
+#~ msgstr "Logitech iTouch keyboard Internet Navigator"
+
+#~ msgid "Northern Saami (Finland)"
+#~ msgstr "Nordligt Saami (Finland)"
+
+#~ msgid "Northern Saami (Sweden)"
+#~ msgstr "Nordligt Saami (Sverige)"
+
+#~ msgid "Ogh"
+#~ msgstr "Ogh"
+
+#~ msgid "Ori"
+#~ msgstr "Ori"
+
+#~ msgid "PC104"
+#~ msgstr "PC104"
+
+#~ msgid "Polish"
+#~ msgstr "Polsk"
+
+#~ msgid "Polish (qwertz)"
+#~ msgstr "Polsk (qwertz)"
+
+#~ msgid "PowerPC PS/2"
+#~ msgstr "PowerPC PS/2"
+
+#~ msgid "Sapmi"
+#~ msgstr "Sapmi"
+
+#~ msgid "Scg"
+#~ msgstr "Scg"
+
+#~ msgid "Slovak (qwerty)"
+#~ msgstr "Slovakisk (qwerty)"
+
+#~ msgid "Sme"
+#~ msgstr "Sme"
+
+#~ msgid "Sv"
+#~ msgstr "Sv"
+
+#~ msgid "Swedish"
+#~ msgstr "Svensk"
+
+#~ msgid "Swiss French"
+#~ msgstr "Schweizisk-fransk"
+
+#~ msgid "Tel"
+#~ msgstr "Tel"
+
+#~ msgid "Thai (Kedmanee)"
+#~ msgstr "Thai (Kedmanee)"
+
+#~ msgid "Tml"
+#~ msgstr "Tml"
+
+#~ msgid "Turkish"
+#~ msgstr "Tyrkisk"
+
+#~ msgid "Turkish Alt-Q Layout"
+#~ msgstr "Tyrkisk Alt-Q-layout"
+
+#~ msgid "U.S. English"
+#~ msgstr "U.S. Engelsk"
+
+#~ msgid "U.S. English w/ ISO9995-3"
+#~ msgstr "U.S. Engelsk w/ ISO9995-3"
+
+#~ msgid "U.S. English w/ dead keys"
+#~ msgstr "U.S. Engelsk m. døde taster"
+
+#~ msgid "US"
+#~ msgstr "US"
+
+#~ msgid "Yug"
+#~ msgstr "Yug"
+
+#~ msgid "Yugoslavian"
+#~ msgstr "Yugoslavisk"
+
+#~ msgid "abnt2"
+#~ msgstr "abnt2"
+
+#~ msgid "bksl"
+#~ msgstr "omsk"
+
+#~ msgid "laptop"
+#~ msgstr "bæbar"
+
+#~ msgid "sefi"
+#~ msgstr "sefi"
+
+#~ msgid "si1452"
+#~ msgstr "si1452"
+
+#~ msgid "uni/101/qwerty/comma"
+#~ msgstr "uni/101/qwerty/komma"
+
+#~ msgid "uni/101/qwerty/dot"
+#~ msgstr "uni/101/qwerty/punktum"
+
+#~ msgid "uni/101/qwertz/comma"
+#~ msgstr "uni/101/qwertz/komma"
+
+#~ msgid "uni/101/qwertz/dot"
+#~ msgstr "uni/101/qwertz/punktum"
+
+#~ msgid "uni/102/qwerty/comma"
+#~ msgstr "uni/102/qwerty/komma"
+
+#~ msgid "uni/102/qwerty/dot"
+#~ msgstr "uni/102/qwerty/punktum"
+
+#~ msgid "uni/102/qwertz/comma"
+#~ msgstr "uni/102/qwertz/komma"
+
+#~ msgid "uni/102/qwertz/dot"
+#~ msgstr "uni/102/qwertz/punktum"
diff --git a/xorg-server/xkbdata.src/po/el.po b/xorg-server/xkbdata.src/po/el.po
new file mode 100644
index 000000000..61caf0f85
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/el.po
@@ -0,0 +1,1668 @@
+# Translation of xkeyboard-config to Greek
+# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) 2004, Free Software Foundation.
+# Simos Xenitellis <simos74@gmx.net>, 2004, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 0.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-01-24 22:57+0000\n"
+"PO-Revision-Date: 2005-11-18 18:34+0500\n"
+"Last-Translator: Simos Xenitellis <simos74@gmx.net>\n"
+"Language-Team: Greek <nls@tux.hellug.gr>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#: rules/base.xml.in.h:1
+msgid "\"Standard\""
+msgstr "\"Τυπικό\""
+
+#: rules/base.xml.in.h:2
+msgid "\"Typewriter\""
+msgstr "\"Γ�αφομηχανή\""
+
+#: rules/base.xml.in.h:3
+msgid "(F)"
+msgstr "(F)"
+
+#: rules/base.xml.in.h:4
+msgid "101/qwerty/comma/Dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:5
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:6
+msgid "101/qwerty/dot/Dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:7
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:8
+msgid "101/qwertz/comma/Dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:9
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:10
+msgid "101/qwertz/dot/Dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:11
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:12
+msgid "102/qwerty/comma/Dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:13
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:14
+msgid "102/qwerty/dot/Dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:15
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:16
+msgid "102/qwertz/comma/Dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:17
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:18
+msgid "102/qwertz/dot/Dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:19
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:20
+msgid "A4Tech KB-21"
+msgstr ""
+
+#: rules/base.xml.in.h:21
+msgid "A4Tech KBS-8"
+msgstr ""
+
+#: rules/base.xml.in.h:22
+msgid "ACPI Standard"
+msgstr ""
+
+#: rules/base.xml.in.h:23
+msgid "Acer AirKey V"
+msgstr ""
+
+#: rules/base.xml.in.h:24
+msgid "Add the EuroSign to the 2 key."
+msgstr "Π�οσθήκη του συμβόλου Ευ�ώ στο πλήκτ�ο 2."
+
+#: rules/base.xml.in.h:25
+msgid "Add the EuroSign to the 5 key."
+msgstr "Π�οσθήκη του συμβόλου Ευ�ώ στο πλήκτ�ο 5."
+
+#: rules/base.xml.in.h:26
+msgid "Add the EuroSign to the E key."
+msgstr "Π�οσθήκη του συμβόλου Ευ�ώ στο πλήκτ�ο Ε."
+
+#: rules/base.xml.in.h:27
+msgid "Add the standard behavior to Menu key."
+msgstr ""
+
+#: rules/base.xml.in.h:28
+msgid "Adding the EuroSign to certain keys"
+msgstr "Π�οσθήκη του συμβόλου Ευ�ώ σε συγκεκ�ιμένα πλήκτ�α"
+
+#: rules/base.xml.in.h:29
+msgid "Advance Scorpius KI"
+msgstr ""
+
+#: rules/base.xml.in.h:30
+msgid "Alb"
+msgstr "ΑΛΒ"
+
+#: rules/base.xml.in.h:31
+msgid "Albania"
+msgstr "Αλβανία"
+
+#: rules/base.xml.in.h:32
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr ""
+
+#: rules/base.xml.in.h:33
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr ""
+
+#: rules/base.xml.in.h:34
+msgid "Alt+Control changes group."
+msgstr "Το Alt+Control αλλάζει ομάδα."
+
+#: rules/base.xml.in.h:35
+msgid "Alt+Shift changes group."
+msgstr "Το Alt+Shift αλλάζει ομάδα."
+
+#: rules/base.xml.in.h:36
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: rules/base.xml.in.h:37
+msgid "Alt/Win key behavior"
+msgstr "Συμπε�ιφο�ά πλήκτ�ου Alt/Win"
+
+#: rules/base.xml.in.h:38
+msgid "Alternative"
+msgstr "Ενναλακτικό"
+
+#: rules/base.xml.in.h:39
+msgid "Alternative international (former us_intl)"
+msgstr ""
+
+#: rules/base.xml.in.h:40
+msgid "Alternative, Sun dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:41
+msgid "Alternative, eliminate dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:42
+msgid "Apostrophe (') variant"
+msgstr ""
+
+#: rules/base.xml.in.h:43
+msgid "Ara"
+msgstr "ΑΡΑ"
+
+#: rules/base.xml.in.h:44
+msgid "Arabic"
+msgstr "Α�αβικό"
+
+#: rules/base.xml.in.h:45
+msgid "Arm"
+msgstr "ΑΡΜ"
+
+#: rules/base.xml.in.h:46
+msgid "Armenia"
+msgstr "Α�μενία"
+
+#: rules/base.xml.in.h:47
+msgid "Aze"
+msgstr "ΑΖΕ"
+
+#: rules/base.xml.in.h:48
+msgid "Azerbaijan"
+msgstr ""
+
+#: rules/base.xml.in.h:49
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:50
+msgid "BTC 5090"
+msgstr ""
+
+#: rules/base.xml.in.h:51
+msgid "BTC 5113RF Multimedia"
+msgstr ""
+
+#: rules/base.xml.in.h:52
+msgid "BTC 5126T"
+msgstr ""
+
+#: rules/base.xml.in.h:53
+msgid "BTC 9000"
+msgstr ""
+
+#: rules/base.xml.in.h:54
+msgid "BTC 9000A"
+msgstr ""
+
+#: rules/base.xml.in.h:55
+msgid "BTC 9001AH"
+msgstr ""
+
+#: rules/base.xml.in.h:56
+msgid "Bel"
+msgstr "ΒΕΛ"
+
+#: rules/base.xml.in.h:57
+msgid "Belarus"
+msgstr ""
+
+#: rules/base.xml.in.h:58
+msgid "Belgium"
+msgstr "Βέλγιο"
+
+#: rules/base.xml.in.h:59
+msgid "Ben"
+msgstr "ΒΕ�"
+
+#: rules/base.xml.in.h:60
+msgid "Bengali"
+msgstr ""
+
+#: rules/base.xml.in.h:61
+msgid "Bgr"
+msgstr ""
+
+#: rules/base.xml.in.h:62
+msgid "Bih"
+msgstr ""
+
+#: rules/base.xml.in.h:63
+msgid "Blr"
+msgstr ""
+
+#: rules/base.xml.in.h:64
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: rules/base.xml.in.h:65
+msgid "Both Alt keys together change group."
+msgstr ""
+
+#: rules/base.xml.in.h:66
+msgid "Both Ctrl keys together change group."
+msgstr ""
+
+#: rules/base.xml.in.h:67
+msgid "Both Shift keys together change group."
+msgstr ""
+
+#: rules/base.xml.in.h:68
+msgid "Both Win-keys switch group while pressed."
+msgstr ""
+
+#: rules/base.xml.in.h:69
+msgid "Bra"
+msgstr "ΒΡΑ"
+
+#: rules/base.xml.in.h:70
+msgid "Brazil"
+msgstr ""
+
+#: rules/base.xml.in.h:71
+msgid "Brazilian ABNT2"
+msgstr ""
+
+#: rules/base.xml.in.h:72
+msgid "Brother Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:73
+msgid "Bulgaria"
+msgstr "Βουλγα�ία"
+
+#: rules/base.xml.in.h:74
+msgid "Can"
+msgstr "ΚΑ�"
+
+#: rules/base.xml.in.h:75
+msgid "Canada"
+msgstr "Καναδάς"
+
+#: rules/base.xml.in.h:76
+msgid "CapsLock LED shows alternative group."
+msgstr ""
+
+#: rules/base.xml.in.h:77
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr ""
+
+#: rules/base.xml.in.h:78
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr ""
+
+#: rules/base.xml.in.h:79
+msgid "CapsLock just locks the Shift modifier."
+msgstr ""
+
+#: rules/base.xml.in.h:80
+msgid "CapsLock key behavior"
+msgstr "Συμπε�ιφο�ά πλήκτ�ου Κλείδωμα Κεφαλαίων"
+
+#: rules/base.xml.in.h:81
+msgid "CapsLock key changes group."
+msgstr ""
+
+#: rules/base.xml.in.h:82
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr ""
+
+#: rules/base.xml.in.h:83
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr ""
+
+#: rules/base.xml.in.h:84
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr ""
+
+#: rules/base.xml.in.h:85
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr ""
+
+#: rules/base.xml.in.h:86
+msgid "Che"
+msgstr ""
+
+#: rules/base.xml.in.h:87
+msgid "Cherry Blue Line CyBo@rd"
+msgstr ""
+
+#: rules/base.xml.in.h:88
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr ""
+
+#: rules/base.xml.in.h:89
+msgid "Chicony Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:90
+msgid "Chicony KB-9885"
+msgstr ""
+
+#: rules/base.xml.in.h:91
+msgid "CloGaelach"
+msgstr ""
+
+#: rules/base.xml.in.h:92
+msgid "CloGaelach Laptop"
+msgstr ""
+
+#: rules/base.xml.in.h:93
+msgid "Compaq Easy Access Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:94
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr ""
+
+#: rules/base.xml.in.h:95
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr ""
+
+#: rules/base.xml.in.h:96
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr ""
+
+#: rules/base.xml.in.h:97
+msgid "Compaq iPaq Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:98
+msgid "Control Key Position"
+msgstr "Θέση Πλήκτ�ου Control"
+
+#: rules/base.xml.in.h:99
+msgid "Control key at bottom left"
+msgstr "Πλήκτ�ο Control κάτω α�ιστε�ά"
+
+#: rules/base.xml.in.h:100
+msgid "Control key at left of 'A'"
+msgstr "Πλήκτ�ο Control στα α�ιστε�ά του 'Α'"
+
+#: rules/base.xml.in.h:101
+msgid "Control+Shift changes group."
+msgstr "Το Control+Shift αλλάζει ομάδα."
+
+#: rules/base.xml.in.h:102
+msgid "Croatia"
+msgstr "Κ�οατία"
+
+#: rules/base.xml.in.h:103
+msgid "Cyrillic"
+msgstr "Κυ�ιλλικά"
+
+#: rules/base.xml.in.h:104
+msgid "Cze"
+msgstr "Τσε"
+
+#: rules/base.xml.in.h:105
+msgid "Czechia"
+msgstr "Τσεχία"
+
+#: rules/base.xml.in.h:106
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: rules/base.xml.in.h:107
+msgid "Dead acute"
+msgstr ""
+
+#: rules/base.xml.in.h:108
+msgid "Dead grave acute"
+msgstr ""
+
+#: rules/base.xml.in.h:109
+msgid "Dell"
+msgstr ""
+
+#: rules/base.xml.in.h:110
+msgid "Dell 101-key PC"
+msgstr ""
+
+#: rules/base.xml.in.h:111
+msgid "Denmark"
+msgstr ""
+
+#: rules/base.xml.in.h:112
+msgid "Deu"
+msgstr ""
+
+#: rules/base.xml.in.h:113
+msgid "Deva"
+msgstr "�ΤΕ"
+
+#: rules/base.xml.in.h:114
+msgid "Devanagari"
+msgstr "�τεναβαγκά�ι"
+
+#: rules/base.xml.in.h:115
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:116
+msgid "Diamond 9801 / 9802 series"
+msgstr ""
+
+#: rules/base.xml.in.h:117
+msgid "Dnk"
+msgstr ""
+
+#: rules/base.xml.in.h:118
+msgid "Dvorak"
+msgstr ""
+
+#: rules/base.xml.in.h:119
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr ""
+
+#: rules/base.xml.in.h:120
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr ""
+
+#: rules/base.xml.in.h:121
+msgid "Dzo"
+msgstr "ΤΖΟ"
+
+#: rules/base.xml.in.h:122
+msgid "Dzongkha"
+msgstr "Τζόνγκα"
+
+#: rules/base.xml.in.h:123
+msgid "Eliminate dead keys"
+msgstr "Χω�ίς νεκ�ά πλήκτ�α"
+
+#: rules/base.xml.in.h:124
+msgid "Ennyah DKB-1008"
+msgstr ""
+
+#: rules/base.xml.in.h:125
+msgid "Esp"
+msgstr "ΙΣΠ"
+
+#: rules/base.xml.in.h:126
+msgid "Est"
+msgstr "ΕΣΘ"
+
+#: rules/base.xml.in.h:127
+msgid "Estonia"
+msgstr "Εσθονία"
+
+#: rules/base.xml.in.h:128
+msgid "Everex STEPnote"
+msgstr ""
+
+#: rules/base.xml.in.h:129
+msgid "Extended"
+msgstr ""
+
+#: rules/base.xml.in.h:130
+msgid "Extended Backslash"
+msgstr ""
+
+#: rules/base.xml.in.h:131
+msgid "F-letter (F) variant"
+msgstr ""
+
+#: rules/base.xml.in.h:132
+msgid "Fao"
+msgstr ""
+
+#: rules/base.xml.in.h:133
+msgid "Faroe Islands"
+msgstr ""
+
+#: rules/base.xml.in.h:134
+msgid "Fin"
+msgstr "ΦΙ�"
+
+#: rules/base.xml.in.h:135
+msgid "Finish and Swedish"
+msgstr "Φινλανδικά και Σουηδικά"
+
+#: rules/base.xml.in.h:136
+msgid "Finland"
+msgstr "Φινλανδία"
+
+#: rules/base.xml.in.h:137
+msgid "Fra"
+msgstr "ΓΑΛ"
+
+#: rules/base.xml.in.h:138
+msgid "France"
+msgstr "Γαλλία"
+
+#: rules/base.xml.in.h:139
+msgid "French"
+msgstr "Γαλλικά"
+
+#: rules/base.xml.in.h:140
+msgid "French (legacy)"
+msgstr ""
+
+#: rules/base.xml.in.h:141
+#, fuzzy
+msgid "French Dvorak"
+msgstr "Γαλλικά �τβό�ακ"
+
+#: rules/base.xml.in.h:142
+msgid "French, Sun dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:143
+msgid "French, eliminate dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:144
+msgid "GBr"
+msgstr "ΗΒΑ"
+
+#: rules/base.xml.in.h:145
+msgid "Generic 101-key PC"
+msgstr "Τυπικός Ηλεκ. Υπολογιστής 101-πλήκτ�ων"
+
+#: rules/base.xml.in.h:146
+msgid "Generic 102-key (Intl) PC"
+msgstr "Τυπικός Ηλεκ. Υπολογιστής 102-πλήκτ�ων (Διεθνές)"
+
+#: rules/base.xml.in.h:147
+msgid "Generic 104-key PC"
+msgstr "Τυπικός Ηλεκ. Υπολογιστής 104-πλήκτ�ων"
+
+#: rules/base.xml.in.h:148
+msgid "Generic 105-key (Intl) PC"
+msgstr "Τυπικός Ηλεκ. Υπολογιστής 105-πλήκτ�ων (Διεθνές)"
+
+#: rules/base.xml.in.h:149
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr ""
+
+#: rules/base.xml.in.h:150
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr ""
+
+#: rules/base.xml.in.h:151
+msgid "Geo"
+msgstr "ΓΕΩ"
+
+#: rules/base.xml.in.h:152
+msgid "Georgia"
+msgstr "Γεω�γία"
+
+#: rules/base.xml.in.h:153
+msgid "German, Sun dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:154
+msgid "German, eliminate dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:155
+msgid "Germany"
+msgstr "Γε�μανία"
+
+#: rules/base.xml.in.h:156
+msgid "Gre"
+msgstr "ΕΛΛ"
+
+#: rules/base.xml.in.h:157
+msgid "Greece"
+msgstr "Ελλάδα"
+
+#: rules/base.xml.in.h:158
+msgid "Group Shift/Lock behavior"
+msgstr ""
+
+#: rules/base.xml.in.h:159
+msgid "Guj"
+msgstr "ΓΚΖ"
+
+#: rules/base.xml.in.h:160
+msgid "Gujarati"
+msgstr "Γκουτζα�άτι"
+
+#: rules/base.xml.in.h:161
+msgid "Gurmukhi"
+msgstr "Γκου�μο�κι"
+
+#: rules/base.xml.in.h:162
+msgid "Guru"
+msgstr ""
+
+#: rules/base.xml.in.h:163
+msgid "Gyration"
+msgstr ""
+
+#: rules/base.xml.in.h:164
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:165
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr ""
+
+#: rules/base.xml.in.h:166
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr ""
+
+#: rules/base.xml.in.h:167
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr ""
+
+#: rules/base.xml.in.h:168
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr ""
+
+#: rules/base.xml.in.h:169
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr ""
+
+#: rules/base.xml.in.h:170
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr ""
+
+#: rules/base.xml.in.h:171
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr ""
+
+#: rules/base.xml.in.h:172
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:173
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:174
+msgid "Honeywell Euroboard"
+msgstr ""
+
+#: rules/base.xml.in.h:175
+msgid "Hrv"
+msgstr ""
+
+#: rules/base.xml.in.h:176
+msgid "Hun"
+msgstr ""
+
+#: rules/base.xml.in.h:177
+msgid "Hungary"
+msgstr ""
+
+#: rules/base.xml.in.h:178
+msgid "Hyper is mapped to the Win-keys."
+msgstr ""
+
+#: rules/base.xml.in.h:179
+msgid "IBM Rapid Access"
+msgstr ""
+
+#: rules/base.xml.in.h:180
+msgid "IBM Rapid Access II"
+msgstr ""
+
+#: rules/base.xml.in.h:181
+msgid "IBM Rapid Access II (alternate option)"
+msgstr ""
+
+#: rules/base.xml.in.h:182
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr ""
+
+#: rules/base.xml.in.h:183
+msgid "INSCRIPT layout"
+msgstr ""
+
+#: rules/base.xml.in.h:184
+msgid "IS434"
+msgstr ""
+
+#: rules/base.xml.in.h:185
+msgid "IS434 laptop"
+msgstr ""
+
+#: rules/base.xml.in.h:186
+msgid "ISO Alternate"
+msgstr ""
+
+#: rules/base.xml.in.h:187
+msgid "Iceland"
+msgstr ""
+
+#: rules/base.xml.in.h:188
+msgid "Iku"
+msgstr ""
+
+#: rules/base.xml.in.h:189
+msgid "International (with dead keys)"
+msgstr ""
+
+#: rules/base.xml.in.h:190
+msgid "Inuktitut"
+msgstr ""
+
+#: rules/base.xml.in.h:191
+msgid "Iran"
+msgstr "Ι�άν"
+
+#: rules/base.xml.in.h:192
+msgid "Ireland"
+msgstr "Ι�λανδία"
+
+#: rules/base.xml.in.h:193
+msgid "Irl"
+msgstr "ΙΡΛ"
+
+#: rules/base.xml.in.h:194
+msgid "Irn"
+msgstr "ΙΡ�"
+
+#: rules/base.xml.in.h:195
+msgid "Isl"
+msgstr "ΙΣΛ"
+
+#: rules/base.xml.in.h:196
+msgid "Isr"
+msgstr "ΙΣΡ"
+
+#: rules/base.xml.in.h:197
+msgid "Israel"
+msgstr "Ισ�αήλ"
+
+#: rules/base.xml.in.h:198
+msgid "Ita"
+msgstr "ΙΤΑ"
+
+#: rules/base.xml.in.h:199
+msgid "Italy"
+msgstr "Ιταλία"
+
+#: rules/base.xml.in.h:200
+msgid "Japan"
+msgstr "Ιαπωνία"
+
+#: rules/base.xml.in.h:201
+msgid "Japanese 106-key"
+msgstr ""
+
+#: rules/base.xml.in.h:202
+msgid "Jpn"
+msgstr "ΙΑΠ"
+
+#: rules/base.xml.in.h:203
+msgid "Kan"
+msgstr "ΚΑ�"
+
+#: rules/base.xml.in.h:204
+msgid "Kannada"
+msgstr "Κάνναντα"
+
+#: rules/base.xml.in.h:205
+msgid "Keytronic FlexPro"
+msgstr ""
+
+#: rules/base.xml.in.h:206
+msgid "Kyr"
+msgstr "ΚΥΡ"
+
+#: rules/base.xml.in.h:207
+msgid "Kyrgyzstan"
+msgstr "Κυ�γιστάν"
+
+#: rules/base.xml.in.h:208
+msgid "LAm"
+msgstr "ΛΑΜ"
+
+#: rules/base.xml.in.h:209
+msgid "Lao"
+msgstr "ΛΑΟ"
+
+#: rules/base.xml.in.h:210
+msgid "Laos"
+msgstr "Λάος"
+
+#: rules/base.xml.in.h:211
+msgid "Laptop"
+msgstr "Φο�ητός"
+
+#: rules/base.xml.in.h:212
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:213
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:214
+msgid "Laptop/notebook Dell Inspiron 8xxx"
+msgstr ""
+
+#: rules/base.xml.in.h:215
+msgid "Latin"
+msgstr ""
+
+#: rules/base.xml.in.h:216
+msgid "Latin American"
+msgstr ""
+
+#: rules/base.xml.in.h:217
+msgid "Latin Unicode"
+msgstr ""
+
+#: rules/base.xml.in.h:218
+msgid "Latin Unicode qwerty"
+msgstr ""
+
+#: rules/base.xml.in.h:219
+msgid "Latin qwerty"
+msgstr ""
+
+#: rules/base.xml.in.h:220
+msgid "Latin with guillemots"
+msgstr ""
+
+#: rules/base.xml.in.h:221
+msgid "Latvia"
+msgstr ""
+
+#: rules/base.xml.in.h:222
+msgid "Left Alt key changes group."
+msgstr ""
+
+#: rules/base.xml.in.h:223
+msgid "Left Alt key switches group while pressed."
+msgstr ""
+
+#: rules/base.xml.in.h:224
+msgid "Left Ctrl key changes group."
+msgstr ""
+
+#: rules/base.xml.in.h:225
+msgid "Left Shift key changes group."
+msgstr ""
+
+#: rules/base.xml.in.h:226
+msgid "Left Win-key changes group."
+msgstr ""
+
+#: rules/base.xml.in.h:227
+msgid "Left Win-key switches group while pressed."
+msgstr ""
+
+#: rules/base.xml.in.h:228
+msgid "Lithuania"
+msgstr "Λιθουανία"
+
+#: rules/base.xml.in.h:229
+msgid "Logitech Access Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:230
+msgid "Logitech Cordless Desktop"
+msgstr ""
+
+#: rules/base.xml.in.h:231
+msgid "Logitech Cordless Desktop Navigator"
+msgstr ""
+
+#: rules/base.xml.in.h:232
+msgid "Logitech Cordless Desktop Optical"
+msgstr ""
+
+#: rules/base.xml.in.h:233
+msgid "Logitech Cordless Desktop Pro"
+msgstr ""
+
+#: rules/base.xml.in.h:234
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr ""
+
+#: rules/base.xml.in.h:235
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr ""
+
+#: rules/base.xml.in.h:236
+msgid "Logitech Cordless Desktop iTouch"
+msgstr ""
+
+#: rules/base.xml.in.h:237
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr ""
+
+#: rules/base.xml.in.h:238
+msgid "Logitech Deluxe Access Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:239
+msgid "Logitech Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:240
+msgid "Logitech Internet Navigator Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:241
+msgid "Logitech iTouch"
+msgstr ""
+
+#: rules/base.xml.in.h:242
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr ""
+
+#: rules/base.xml.in.h:243
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr ""
+
+#: rules/base.xml.in.h:244
+msgid "Ltu"
+msgstr ""
+
+#: rules/base.xml.in.h:245
+msgid "Lva"
+msgstr ""
+
+#: rules/base.xml.in.h:246
+msgid "Macedonian"
+msgstr "Φυ�ομιακά"
+
+#: rules/base.xml.in.h:247
+msgid "Macintosh"
+msgstr ""
+
+#: rules/base.xml.in.h:248
+msgid "Macintosh Old"
+msgstr ""
+
+#: rules/base.xml.in.h:249
+msgid "Make CapsLock an additional Control."
+msgstr ""
+
+#: rules/base.xml.in.h:250
+msgid "Mal"
+msgstr "ΜΑΛ"
+
+#: rules/base.xml.in.h:251
+msgid "Malayalam"
+msgstr "Μαλαγιαλάμ"
+
+#: rules/base.xml.in.h:252
+msgid "Malta"
+msgstr "Μάλτα"
+
+#: rules/base.xml.in.h:253
+msgid "Mao"
+msgstr "ΜΑΟ"
+
+#: rules/base.xml.in.h:254
+msgid "Maori"
+msgstr "Μαο�ί"
+
+#: rules/base.xml.in.h:255
+msgid "Memorex MX1998"
+msgstr ""
+
+#: rules/base.xml.in.h:256
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:257
+msgid "Memorex MX2750"
+msgstr ""
+
+#: rules/base.xml.in.h:258
+msgid "Menu is Compose."
+msgstr ""
+
+#: rules/base.xml.in.h:259
+msgid "Menu key changes group."
+msgstr ""
+
+#: rules/base.xml.in.h:260
+msgid "Meta is mapped to the Win-keys."
+msgstr ""
+
+#: rules/base.xml.in.h:261
+msgid "Meta is mapped to the left Win-key."
+msgstr ""
+
+#: rules/base.xml.in.h:262
+msgid "Microsoft Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:263
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr ""
+
+#: rules/base.xml.in.h:264
+msgid "Microsoft Natural"
+msgstr ""
+
+#: rules/base.xml.in.h:265
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr ""
+
+#: rules/base.xml.in.h:266
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr ""
+
+#: rules/base.xml.in.h:267
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr ""
+
+#: rules/base.xml.in.h:268
+msgid "Microsoft Office Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:269
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr ""
+
+#: rules/base.xml.in.h:270
+msgid "Miscellaneous compatibility options"
+msgstr "Διάφο�ες επιλογές συμβατότητας"
+
+#: rules/base.xml.in.h:271
+msgid "Mkd"
+msgstr "ΦΥΡ"
+
+#: rules/base.xml.in.h:272
+msgid "Mlt"
+msgstr ""
+
+#: rules/base.xml.in.h:273
+msgid "Mmr"
+msgstr ""
+
+#: rules/base.xml.in.h:274
+msgid "Mng"
+msgstr "ΜΟΓ"
+
+#: rules/base.xml.in.h:275
+msgid "Mongolia"
+msgstr "Μογγολία"
+
+#: rules/base.xml.in.h:276
+msgid "Multilingual"
+msgstr "Πολ�γλωσσο"
+
+#: rules/base.xml.in.h:277
+msgid "Multilingual, second part"
+msgstr ""
+
+#: rules/base.xml.in.h:278
+msgid "Myanmar"
+msgstr ""
+
+#: rules/base.xml.in.h:279
+msgid "Netherlands"
+msgstr "Ολλανδία"
+
+#: rules/base.xml.in.h:280
+msgid "Nld"
+msgstr "ΟΛΑ"
+
+#: rules/base.xml.in.h:281
+msgid "Nor"
+msgstr "�ΟΡ"
+
+#: rules/base.xml.in.h:282
+msgid "Northern Saami"
+msgstr ""
+
+#: rules/base.xml.in.h:283
+msgid "Northgate OmniKey 101"
+msgstr ""
+
+#: rules/base.xml.in.h:284
+msgid "Norway"
+msgstr "�ο�βηγία"
+
+#: rules/base.xml.in.h:285
+msgid "NumLock LED shows alternative group."
+msgstr ""
+
+#: rules/base.xml.in.h:286
+msgid "Ogam"
+msgstr ""
+
+#: rules/base.xml.in.h:287
+msgid "Ogham"
+msgstr ""
+
+#: rules/base.xml.in.h:288
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:289
+msgid "Ori"
+msgstr ""
+
+#: rules/base.xml.in.h:290
+msgid "Oriya"
+msgstr ""
+
+#: rules/base.xml.in.h:291
+msgid "PC-98xx Series"
+msgstr ""
+
+#: rules/base.xml.in.h:292
+msgid "Pattachote"
+msgstr ""
+
+#: rules/base.xml.in.h:293
+msgid "Phonetic"
+msgstr "Φωνητικά"
+
+#: rules/base.xml.in.h:294
+msgid "Pol"
+msgstr "ΠΟΛ"
+
+#: rules/base.xml.in.h:295
+msgid "Poland"
+msgstr "Πολωνία"
+
+#: rules/base.xml.in.h:296
+msgid "Polytonic"
+msgstr "Πολυτονικά"
+
+#: rules/base.xml.in.h:297
+msgid "Portugal"
+msgstr "Πο�τογαλία"
+
+#: rules/base.xml.in.h:298
+msgid "PowerPC PS/2"
+msgstr ""
+
+#: rules/base.xml.in.h:299
+msgid "Press Left Alt key to choose 3rd level."
+msgstr ""
+
+#: rules/base.xml.in.h:300
+msgid "Press Left Win-key to choose 3rd level."
+msgstr ""
+
+#: rules/base.xml.in.h:301
+msgid "Press Menu key to choose 3rd level."
+msgstr ""
+
+#: rules/base.xml.in.h:302
+msgid "Press Right Alt key to choose 3rd level."
+msgstr ""
+
+#: rules/base.xml.in.h:303
+msgid "Press Right Control to choose 3rd level."
+msgstr ""
+
+#: rules/base.xml.in.h:304
+msgid "Press Right Win-key to choose 3rd level."
+msgstr ""
+
+#: rules/base.xml.in.h:305
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr ""
+
+#: rules/base.xml.in.h:306
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr ""
+
+#: rules/base.xml.in.h:307
+msgid "Probhat"
+msgstr ""
+
+#: rules/base.xml.in.h:308
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr ""
+
+#: rules/base.xml.in.h:309
+msgid "Prt"
+msgstr ""
+
+#: rules/base.xml.in.h:310
+msgid "QTronix Scorpius 98N+"
+msgstr ""
+
+#: rules/base.xml.in.h:311
+msgid "R-Alt switches group while pressed."
+msgstr ""
+
+#: rules/base.xml.in.h:312
+msgid "Right Alt is Compose."
+msgstr ""
+
+#: rules/base.xml.in.h:313
+msgid "Right Alt key changes group."
+msgstr ""
+
+#: rules/base.xml.in.h:314
+msgid "Right Control key works as Right Alt."
+msgstr ""
+
+#: rules/base.xml.in.h:315
+msgid "Right Ctrl is Compose."
+msgstr ""
+
+#: rules/base.xml.in.h:316
+msgid "Right Ctrl key changes group."
+msgstr ""
+
+#: rules/base.xml.in.h:317
+msgid "Right Ctrl key switches group while pressed."
+msgstr ""
+
+#: rules/base.xml.in.h:318
+msgid "Right Shift key changes group."
+msgstr ""
+
+#: rules/base.xml.in.h:319
+msgid "Right Win-key changes group."
+msgstr ""
+
+#: rules/base.xml.in.h:320
+msgid "Right Win-key is Compose."
+msgstr ""
+
+#: rules/base.xml.in.h:321
+msgid "Right Win-key switches group while pressed."
+msgstr ""
+
+#: rules/base.xml.in.h:322
+msgid "Romania"
+msgstr "Ρουμανία"
+
+#: rules/base.xml.in.h:323
+msgid "Romanian keyboard with German letters"
+msgstr ""
+
+#: rules/base.xml.in.h:324
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:325
+msgid "Rou"
+msgstr "ΡΟΥ"
+
+#: rules/base.xml.in.h:326
+msgid "Rus"
+msgstr "ΡΩΣ"
+
+#: rules/base.xml.in.h:327
+msgid "Russia"
+msgstr "Ρωσία"
+
+#: rules/base.xml.in.h:328
+msgid "Russian"
+msgstr "Ρωσσικά"
+
+#: rules/base.xml.in.h:329
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: rules/base.xml.in.h:330
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: rules/base.xml.in.h:331
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: rules/base.xml.in.h:332
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: rules/base.xml.in.h:333
+msgid "SVEN Ergonomic 2500"
+msgstr ""
+
+#: rules/base.xml.in.h:334
+msgid "Samsung SDM 4500P"
+msgstr ""
+
+#: rules/base.xml.in.h:335
+msgid "Samsung SDM 4510P"
+msgstr ""
+
+#: rules/base.xml.in.h:336
+msgid "ScrollLock LED shows alternative group."
+msgstr ""
+
+#: rules/base.xml.in.h:337
+msgid "Serbian"
+msgstr "Σε�βικά"
+
+#: rules/base.xml.in.h:338
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr ""
+
+#: rules/base.xml.in.h:339
+msgid "Shift+CapsLock changes group."
+msgstr ""
+
+#: rules/base.xml.in.h:340
+msgid "Sin"
+msgstr "ΣΙ�"
+
+#: rules/base.xml.in.h:341
+msgid "Sinhala"
+msgstr "Σινχάλα"
+
+#: rules/base.xml.in.h:342
+msgid "Slovakia"
+msgstr "Σλοβακία"
+
+#: rules/base.xml.in.h:343
+msgid "Slovenia"
+msgstr "Σλοβενία"
+
+#: rules/base.xml.in.h:344
+msgid "Smi"
+msgstr ""
+
+#: rules/base.xml.in.h:345
+msgid "Spain"
+msgstr "Ισπανία"
+
+#: rules/base.xml.in.h:346
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr ""
+
+#: rules/base.xml.in.h:347
+msgid "Srp"
+msgstr ""
+
+#: rules/base.xml.in.h:348
+msgid "Standard"
+msgstr "Τυπικό"
+
+#: rules/base.xml.in.h:349
+msgid "Sun dead keys"
+msgstr ""
+
+#: rules/base.xml.in.h:350
+msgid "Super Power Multimedia Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:351
+msgid "Super is mapped to the Win-keys (default)."
+msgstr ""
+
+#: rules/base.xml.in.h:352
+msgid "Svk"
+msgstr "ΣΛΚ"
+
+#: rules/base.xml.in.h:353
+msgid "Svn"
+msgstr "ΣΛΒ"
+
+#: rules/base.xml.in.h:354
+msgid "Swap Control and CapsLock."
+msgstr ""
+
+#: rules/base.xml.in.h:355
+msgid "Swe"
+msgstr "ΣΟΥ"
+
+#: rules/base.xml.in.h:356
+msgid "Sweden"
+msgstr "Σουηδία"
+
+#: rules/base.xml.in.h:357
+msgid "Switzerland"
+msgstr "Ελβετία"
+
+#: rules/base.xml.in.h:358
+msgid "Symplon PaceBook (tablet PC)"
+msgstr ""
+
+#: rules/base.xml.in.h:359
+msgid "Syr"
+msgstr "ΣΥΡ"
+
+#: rules/base.xml.in.h:360
+msgid "Syriac"
+msgstr "Συ�ιακά"
+
+#: rules/base.xml.in.h:361
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: rules/base.xml.in.h:362
+msgid "Tajikistan"
+msgstr "Τατζικιστάν"
+
+#: rules/base.xml.in.h:363
+msgid "Tam"
+msgstr "ΤΑΜ"
+
+#: rules/base.xml.in.h:364
+msgid "Tamil"
+msgstr "Ταμίλ"
+
+#: rules/base.xml.in.h:365
+msgid "Tel"
+msgstr "ΤΕΛ"
+
+#: rules/base.xml.in.h:366
+msgid "Telugu"
+msgstr "Τελο�γκου"
+
+#: rules/base.xml.in.h:367
+msgid "Tha"
+msgstr "ΤΑΥ"
+
+#: rules/base.xml.in.h:368
+msgid "Thailand"
+msgstr "Ταϋλάνδη"
+
+#: rules/base.xml.in.h:369
+msgid "Third level choosers"
+msgstr "Επιλογείς τ�ίτου επιπέδου"
+
+#: rules/base.xml.in.h:370
+msgid "Tilde (~) variant"
+msgstr ""
+
+#: rules/base.xml.in.h:371
+msgid "Tjk"
+msgstr "ΤΤΖ"
+
+#: rules/base.xml.in.h:372
+msgid "Toshiba Satellite S3000"
+msgstr ""
+
+#: rules/base.xml.in.h:373
+msgid "Trust Direct Access Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:374
+msgid "Trust Wireless Keyboard Classic"
+msgstr ""
+
+#: rules/base.xml.in.h:375
+msgid "Tur"
+msgstr "ΤΟΥ"
+
+#: rules/base.xml.in.h:376
+msgid "Turkish"
+msgstr "Του�κικά"
+
+#: rules/base.xml.in.h:377
+msgid "Typewrite-style keymap; TAB encoding"
+msgstr ""
+
+#: rules/base.xml.in.h:378
+msgid "Typewrite-style keymap; Unicode encoding"
+msgstr ""
+
+#: rules/base.xml.in.h:379
+msgid "U.S. English"
+msgstr "Αγγλικά ΗΠΑ"
+
+#: rules/base.xml.in.h:380
+msgid "US keyboard with Croatian letters"
+msgstr ""
+
+#: rules/base.xml.in.h:381
+msgid "US keyboard with Lithuanian letters"
+msgstr ""
+
+#: rules/base.xml.in.h:382
+msgid "US keyboard with Maltian letters"
+msgstr ""
+
+#: rules/base.xml.in.h:383
+msgid "US keyboard with Romanian letters"
+msgstr ""
+
+#: rules/base.xml.in.h:384
+msgid "USA"
+msgstr "ΗΠΑ"
+
+#: rules/base.xml.in.h:385
+msgid "Ukr"
+msgstr "ΟΥΚ"
+
+#: rules/base.xml.in.h:386
+msgid "Ukraine"
+msgstr "Ουκ�ανία"
+
+#. RSTU 2019-91
+#: rules/base.xml.in.h:388
+msgid "Ukrainian standard RSTU"
+msgstr ""
+
+#: rules/base.xml.in.h:389
+msgid "UnicodeExpert"
+msgstr ""
+
+#: rules/base.xml.in.h:390
+msgid "United Kingdom"
+msgstr "Ηνωμένο Βασίλειο"
+
+#: rules/base.xml.in.h:391
+msgid "Urd"
+msgstr "ΟΥΡ"
+
+#: rules/base.xml.in.h:392
+msgid "Urdu"
+msgstr "Ο��ντου"
+
+#: rules/base.xml.in.h:393
+msgid "Use keyboard LED to show alternative group."
+msgstr "Χ�ήση του LED του πληκτ�ολογίου για την υπόδειξη της εναλλακτικής ομάδας."
+
+#: rules/base.xml.in.h:394
+msgid "Uzb"
+msgstr "ΟΥΖ"
+
+#: rules/base.xml.in.h:395
+msgid "Uzbekistan"
+msgstr "Ουζμπεκιστάν"
+
+#: rules/base.xml.in.h:396
+msgid "Vietnam"
+msgstr "Βιετνάμ"
+
+#: rules/base.xml.in.h:397
+msgid "Vnm"
+msgstr "ΒΙΕ"
+
+#: rules/base.xml.in.h:398
+msgid "Winbook Model XP5"
+msgstr ""
+
+#: rules/base.xml.in.h:399
+msgid "Winkeys"
+msgstr ""
+
+#: rules/base.xml.in.h:400
+msgid "With &lt;\\|&gt; key"
+msgstr ""
+
+#: rules/base.xml.in.h:401
+msgid "With Malayalam digits"
+msgstr ""
+
+#: rules/base.xml.in.h:402
+msgid "With guillemots"
+msgstr ""
+
+#: rules/base.xml.in.h:403
+msgid "Yahoo! Internet Keyboard"
+msgstr "Πληκτ�ολόγιο Διαδικτ�ου Yahoo!"
+
+#: rules/base.xml.in.h:404
+msgid "Z and ZHE swapped"
+msgstr ""
+
+#: rules/base.xml.in.h:405
+msgid "azerty"
+msgstr "azerty"
+
+#: rules/base.xml.in.h:406
+msgid "azerty/digits"
+msgstr ""
+
+#: rules/base.xml.in.h:407
+msgid "digits"
+msgstr "digits"
+
+#: rules/base.xml.in.h:408
+msgid "lyx"
+msgstr "lyx"
+
+#: rules/base.xml.in.h:409
+msgid "qwerty"
+msgstr "qwerty"
+
+#: rules/base.xml.in.h:410
+msgid "qwerty, extended Backslash"
+msgstr ""
+
+#: rules/base.xml.in.h:411
+msgid "qwerty/digits"
+msgstr ""
+
+#: rules/base.xml.in.h:412
+msgid "qwertz"
+msgstr "qwertz"
+
+#: rules/base.xml.in.h:413
+msgid "si1452"
+msgstr "si1452"
diff --git a/xorg-server/xkbdata.src/po/en_GB.po b/xorg-server/xkbdata.src/po/en_GB.po
new file mode 100644
index 000000000..48af18093
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/en_GB.po
@@ -0,0 +1,1867 @@
+# British English translations for xkeyboard-config package.
+# Copyright (C) 2005 Free Software Foundation
+# This file is distributed under the same license as the xkeyboard-config package.
+# Christopher Orr <chris@protactin.co.uk>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-09-04 23:04+0100\n"
+"PO-Revision-Date: 2005-04-09 16:58+0100\n"
+"Last-Translator: Christopher Orr <chris@protactin.co.uk>\n"
+"Language-Team: English <en_gb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/comma/Dead keys"
+
+#: ../rules/base.xml.in.h:3
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/comma/Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:4
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/dot/Dead keys"
+
+#: ../rules/base.xml.in.h:5
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/dot/Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/comma/Dead keys"
+
+#: ../rules/base.xml.in.h:7
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/comma/Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/dot/Dead keys"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/dot/Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:10
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/comma/Dead keys"
+
+#: ../rules/base.xml.in.h:11
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/comma/Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:12
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/dot/Dead keys"
+
+#: ../rules/base.xml.in.h:13
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/dot/Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:14
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/comma/Dead keys"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/comma/Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/dot/Dead keys"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/dot/Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:18
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:19
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:20
+msgid "ACPI Standard"
+msgstr "ACPI Standard"
+
+#: ../rules/base.xml.in.h:21
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:22
+msgid "Acer TravelMate 800"
+msgstr "Acer TravelMate 800"
+
+#: ../rules/base.xml.in.h:23
+msgid "Add the EuroSign to the 2 key."
+msgstr "Add the Euro sign to the 2 key."
+
+#: ../rules/base.xml.in.h:24
+msgid "Add the EuroSign to the 5 key."
+msgstr "Add the Euro sign to the 5 key."
+
+#: ../rules/base.xml.in.h:25
+msgid "Add the EuroSign to the E key."
+msgstr "Add the Euro sign to the E key."
+
+#: ../rules/base.xml.in.h:26
+msgid "Add the standard behavior to Menu key."
+msgstr "Add the standard behaviour to Menu key."
+
+#: ../rules/base.xml.in.h:27
+msgid "Adding the EuroSign to certain keys"
+msgstr "Adding the Euro sign to certain keys"
+
+#: ../rules/base.xml.in.h:28
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:29
+msgid "Alb"
+msgstr "Alb"
+
+#: ../rules/base.xml.in.h:30
+msgid "Albania"
+msgstr "Albania"
+
+#: ../rules/base.xml.in.h:31
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Alt and Meta are on the Alt keys (default)."
+
+#: ../rules/base.xml.in.h:32
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt is mapped to the right Win-key and Super to Menu."
+
+#: ../rules/base.xml.in.h:33
+#, fuzzy
+msgid "Alt+Ctrl changes group."
+msgstr "Alt+Control changes group."
+
+#: ../rules/base.xml.in.h:34
+msgid "Alt+Shift changes group."
+msgstr "Alt+Shift changes group."
+
+#: ../rules/base.xml.in.h:35
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:36
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win key behaviour"
+
+#: ../rules/base.xml.in.h:37
+msgid "Alternative"
+msgstr "Alternative"
+
+#: ../rules/base.xml.in.h:38
+msgid "Alternative international (former us_intl)"
+msgstr "Alternative international (former us_intl)"
+
+#: ../rules/base.xml.in.h:39
+msgid "Alternative, Sun dead keys"
+msgstr "Alternative, Sun dead keys"
+
+#: ../rules/base.xml.in.h:40
+msgid "Alternative, eliminate dead keys"
+msgstr "Alternative, eliminate dead keys"
+
+#: ../rules/base.xml.in.h:41
+msgid "Apostrophe (') variant"
+msgstr "Apostrophe (') variant"
+
+#: ../rules/base.xml.in.h:42
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:43
+msgid "Arabic"
+msgstr "Arabic"
+
+#: ../rules/base.xml.in.h:44
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:45
+msgid "Armenia"
+msgstr "Armenia"
+
+#: ../rules/base.xml.in.h:46
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:47
+msgid "Azerbaijan"
+msgstr "Azerbaijan"
+
+#: ../rules/base.xml.in.h:48
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet Keyboard"
+
+#: ../rules/base.xml.in.h:49
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:50
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:51
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:52
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:53
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:54
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:55
+#, fuzzy
+msgid "Ban"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:56
+msgid "Bangladesh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:57
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:58
+msgid "Belarus"
+msgstr "Belarus"
+
+#: ../rules/base.xml.in.h:59
+msgid "Belgium"
+msgstr "Belgium"
+
+#: ../rules/base.xml.in.h:60
+#, fuzzy
+msgid "Bengali"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:61
+#, fuzzy
+msgid "Bengali Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:62
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:63
+#, fuzzy
+msgid "Bhu"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:64
+#, fuzzy
+msgid "Bhutan"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:65
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:66
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:67
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnia and Herzegovina"
+
+#: ../rules/base.xml.in.h:68
+msgid "Both Alt keys together change group."
+msgstr "Both Alt keys together change group."
+
+#: ../rules/base.xml.in.h:69
+msgid "Both Ctrl keys together change group."
+msgstr "Both Ctrl keys together change group."
+
+#: ../rules/base.xml.in.h:70
+msgid "Both Shift keys together change group."
+msgstr "Both Shift keys together change group."
+
+#: ../rules/base.xml.in.h:71
+msgid "Both Win-keys switch group while pressed."
+msgstr "Both Win-keys switch group while pressed."
+
+#: ../rules/base.xml.in.h:72
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:73
+msgid "Brazil"
+msgstr "Brazil"
+
+#: ../rules/base.xml.in.h:74
+msgid "Brazilian ABNT2"
+msgstr "Brazilian ABNT2"
+
+#: ../rules/base.xml.in.h:75
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:76
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+#: ../rules/base.xml.in.h:77
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:78
+msgid "Canada"
+msgstr "Canada"
+
+#: ../rules/base.xml.in.h:79
+msgid "CapsLock LED shows alternative group."
+msgstr "Caps Lock LED shows alternative group."
+
+#: ../rules/base.xml.in.h:80
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "Caps Lock acts as Shift with locking. Shift cancels Caps Lock."
+
+#: ../rules/base.xml.in.h:81
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "Caps Lock acts as Shift with locking. Shift doesn't cancel Caps Lock."
+
+#: ../rules/base.xml.in.h:82
+msgid "CapsLock just locks the Shift modifier."
+msgstr "Caps Lock just locks the Shift modifier."
+
+#: ../rules/base.xml.in.h:83
+msgid "CapsLock key behavior"
+msgstr "Caps Lock key behaviour"
+
+#: ../rules/base.xml.in.h:84
+msgid "CapsLock key changes group."
+msgstr "Caps Lock key changes group."
+
+#: ../rules/base.xml.in.h:85
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "Caps Lock toggles Shift so all keys are affected."
+
+#: ../rules/base.xml.in.h:86
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "Caps Lock toggles normal capitalisation of alphabetic characters."
+
+#: ../rules/base.xml.in.h:87
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr "Caps Lock uses internal capitalisation. Shift cancels Caps Lock."
+
+#: ../rules/base.xml.in.h:88
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr ""
+"Caps Lock uses internal capitalisation. Shift doesn't cancel Caps Lock."
+
+#: ../rules/base.xml.in.h:89
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:90
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:91
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternate option)"
+
+#: ../rules/base.xml.in.h:92
+msgid "Cherry CyMotion Master Linux"
+msgstr ""
+
+#: ../rules/base.xml.in.h:93
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:94
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:95
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:96
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:97
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 keys)"
+
+#: ../rules/base.xml.in.h:98
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 keys)"
+
+#: ../rules/base.xml.in.h:99
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 keys)"
+
+#: ../rules/base.xml.in.h:100
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:101
+#, fuzzy
+msgid "Compose key position"
+msgstr "Control Key Position"
+
+#: ../rules/base.xml.in.h:102
+msgid "Croatia"
+msgstr "Croatia"
+
+#: ../rules/base.xml.in.h:103
+#, fuzzy
+msgid "Ctrl key at bottom left"
+msgstr "Control key at bottom left"
+
+#: ../rules/base.xml.in.h:104
+#, fuzzy
+msgid "Ctrl key at left of 'A'"
+msgstr "Control key at left of 'A'"
+
+#: ../rules/base.xml.in.h:105
+#, fuzzy
+msgid "Ctrl key position"
+msgstr "Control Key Position"
+
+#: ../rules/base.xml.in.h:106
+#, fuzzy
+msgid "Ctrl+Shift changes group."
+msgstr "Control+Shift changes group."
+
+#: ../rules/base.xml.in.h:107
+msgid "Cyrillic"
+msgstr "Cyrillic"
+
+#: ../rules/base.xml.in.h:108
+msgid "Cze"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:109
+msgid "Czechia"
+msgstr "Czechia"
+
+#: ../rules/base.xml.in.h:110
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:111
+msgid "Dead acute"
+msgstr "Dead acute"
+
+#: ../rules/base.xml.in.h:112
+msgid "Dead grave acute"
+msgstr "Dead grave acute"
+
+#: ../rules/base.xml.in.h:113
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:114
+msgid "Dell 101-key PC"
+msgstr "Dell 101-key PC"
+
+#: ../rules/base.xml.in.h:115
+msgid "Denmark"
+msgstr "Denmark"
+
+#: ../rules/base.xml.in.h:116
+msgid "Deu"
+msgstr "Deu"
+
+#: ../rules/base.xml.in.h:117
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:118
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 series"
+
+#: ../rules/base.xml.in.h:119
+msgid "Dnk"
+msgstr "Dnk"
+
+#: ../rules/base.xml.in.h:120
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:121
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak, Polish quotes on key \"1/!\""
+
+#: ../rules/base.xml.in.h:122
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, Polish quotes on quotemark key"
+
+#: ../rules/base.xml.in.h:123
+msgid "Eliminate dead keys"
+msgstr "Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:124
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:125
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:126
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:127
+msgid "Estonia"
+msgstr "Estonia"
+
+#: ../rules/base.xml.in.h:128
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:129
+msgid "Extended"
+msgstr "Extended"
+
+#: ../rules/base.xml.in.h:130
+msgid "Extended Backslash"
+msgstr "Extended Backslash"
+
+#: ../rules/base.xml.in.h:131
+msgid "F-letter (F) variant"
+msgstr "F-letter (F) variant"
+
+#: ../rules/base.xml.in.h:132
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:133
+msgid "Faroe Islands"
+msgstr "Faroe Islands"
+
+#: ../rules/base.xml.in.h:134
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:135
+msgid "Finland"
+msgstr "Finland"
+
+#: ../rules/base.xml.in.h:136
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:137
+msgid "France"
+msgstr "France"
+
+#: ../rules/base.xml.in.h:138
+msgid "French"
+msgstr "French"
+
+#: ../rules/base.xml.in.h:139
+msgid "French (legacy)"
+msgstr "French (legacy)"
+
+#: ../rules/base.xml.in.h:140
+msgid "French Dvorak"
+msgstr "French Dvorak"
+
+#: ../rules/base.xml.in.h:141
+msgid "French, Sun dead keys"
+msgstr "French, Sun dead keys"
+
+#: ../rules/base.xml.in.h:142
+msgid "French, eliminate dead keys"
+msgstr "French, eliminate dead keys"
+
+#: ../rules/base.xml.in.h:143
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:144
+msgid "Generic 101-key PC"
+msgstr "Generic 101-key PC"
+
+#: ../rules/base.xml.in.h:145
+msgid "Generic 102-key (Intl) PC"
+msgstr "Generic 102-key (Intl) PC"
+
+#: ../rules/base.xml.in.h:146
+msgid "Generic 104-key PC"
+msgstr "Generic 104-key PC"
+
+#: ../rules/base.xml.in.h:147
+msgid "Generic 105-key (Intl) PC"
+msgstr "Generic 105-key (Intl) PC"
+
+#: ../rules/base.xml.in.h:148
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:149
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:150
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:151
+msgid "Georgia"
+msgstr "Georgia"
+
+#: ../rules/base.xml.in.h:152
+msgid "German, Sun dead keys"
+msgstr "German, Sun dead keys"
+
+#: ../rules/base.xml.in.h:153
+msgid "German, eliminate dead keys"
+msgstr "German, eliminate dead keys"
+
+#: ../rules/base.xml.in.h:154
+msgid "Germany"
+msgstr "Germany"
+
+#: ../rules/base.xml.in.h:155
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:156
+msgid "Greece"
+msgstr "Greece"
+
+#: ../rules/base.xml.in.h:157
+msgid "Group Shift/Lock behavior"
+msgstr "Group Shift/Lock behaviour"
+
+#: ../rules/base.xml.in.h:158
+#, fuzzy
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../rules/base.xml.in.h:159
+#, fuzzy
+msgid "Gurmukhi"
+msgstr "Guru"
+
+#: ../rules/base.xml.in.h:160
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:161
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:162
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:163
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:164
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:165
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:166
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:167
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:168
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:169
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:170
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:171
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:172
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:173
+msgid "Hun"
+msgstr "Hun"
+
+#: ../rules/base.xml.in.h:174
+msgid "Hungary"
+msgstr "Hungary"
+
+#: ../rules/base.xml.in.h:175
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper is mapped to the Win-keys."
+
+#: ../rules/base.xml.in.h:176
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:177
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:178
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (alternate option)"
+
+#: ../rules/base.xml.in.h:179
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:180
+msgid "ISO Alternate"
+msgstr "ISO Alternate"
+
+#: ../rules/base.xml.in.h:181
+msgid "Iceland"
+msgstr "Iceland"
+
+#: ../rules/base.xml.in.h:182
+#, fuzzy
+msgid "Ind"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:183
+msgid "India"
+msgstr ""
+
+#: ../rules/base.xml.in.h:184
+msgid "International (with dead keys)"
+msgstr "International (with dead keys)"
+
+#: ../rules/base.xml.in.h:185
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: ../rules/base.xml.in.h:186
+msgid "Iran"
+msgstr "Iran"
+
+#: ../rules/base.xml.in.h:187
+msgid "Ireland"
+msgstr "Ireland"
+
+#: ../rules/base.xml.in.h:188
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:189
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:190
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:191
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:192
+msgid "Israel"
+msgstr "Israel"
+
+#: ../rules/base.xml.in.h:193
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:194
+msgid "Italy"
+msgstr "Italy"
+
+#: ../rules/base.xml.in.h:195
+msgid "Japan"
+msgstr "Japan"
+
+#: ../rules/base.xml.in.h:196
+msgid "Japanese 106-key"
+msgstr "Japanese 106-key"
+
+#: ../rules/base.xml.in.h:197
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:198
+#, fuzzy
+msgid "Kannada"
+msgstr "Canada"
+
+#: ../rules/base.xml.in.h:199
+msgid "Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:200
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:201
+msgid "Kyr"
+msgstr "Kyr"
+
+#: ../rules/base.xml.in.h:202
+msgid "Kyrgyzstan"
+msgstr "Kyrgyzstan"
+
+#: ../rules/base.xml.in.h:203
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:204
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:205
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:206
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+
+#: ../rules/base.xml.in.h:207
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+
+#: ../rules/base.xml.in.h:208
+msgid "Laptop/notebook Dell Inspiron 8xxx"
+msgstr "Laptop/notebook Dell Inspiron 8xxx"
+
+#: ../rules/base.xml.in.h:209
+msgid "Latin"
+msgstr "Latin"
+
+#: ../rules/base.xml.in.h:210
+msgid "Latin American"
+msgstr "Latin American"
+
+#: ../rules/base.xml.in.h:211
+msgid "Latin Unicode"
+msgstr "Latin Unicode"
+
+#: ../rules/base.xml.in.h:212
+msgid "Latin Unicode qwerty"
+msgstr "Latin Unicode qwerty"
+
+#: ../rules/base.xml.in.h:213
+msgid "Latin qwerty"
+msgstr "Latin qwerty"
+
+#: ../rules/base.xml.in.h:214
+msgid "Latin with guillemots"
+msgstr "Latin with guillemots"
+
+#: ../rules/base.xml.in.h:215
+msgid "Latvia"
+msgstr "Latvia"
+
+#: ../rules/base.xml.in.h:216
+msgid "Left Alt key changes group."
+msgstr "Left Alt key changes group."
+
+#: ../rules/base.xml.in.h:217
+msgid "Left Alt key switches group while pressed."
+msgstr "Left Alt key switches group while pressed."
+
+#: ../rules/base.xml.in.h:218
+msgid "Left Ctrl key changes group."
+msgstr "Left Ctrl key changes group."
+
+#: ../rules/base.xml.in.h:219
+msgid "Left Shift key changes group."
+msgstr "Left Shift key changes group."
+
+#: ../rules/base.xml.in.h:220
+msgid "Left Win-key changes group."
+msgstr "Left Win-key changes group."
+
+#: ../rules/base.xml.in.h:221
+msgid "Left Win-key switches group while pressed."
+msgstr "Left Win-key switches group while pressed."
+
+#: ../rules/base.xml.in.h:222
+msgid "Lithuania"
+msgstr "Lithuania"
+
+#: ../rules/base.xml.in.h:223
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:224
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:225
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:226
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:227
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: ../rules/base.xml.in.h:228
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (alternate option)"
+
+#: ../rules/base.xml.in.h:229
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (alternate option2)"
+
+#: ../rules/base.xml.in.h:230
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:231
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:232
+msgid "Logitech Deluxe Access Keyboard"
+msgstr "Logitech Deluxe Access Keyboard"
+
+#: ../rules/base.xml.in.h:233
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:234
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:235
+#, fuzzy
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:236
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:237
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:238
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr "Logitech iTouch keyboard Internet Navigator"
+
+#: ../rules/base.xml.in.h:239
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:240
+msgid "Lva"
+msgstr "Lva"
+
+#: ../rules/base.xml.in.h:241
+#, fuzzy
+msgid "Macedonia (FYROM)"
+msgstr "Macedonian"
+
+#: ../rules/base.xml.in.h:242
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:243
+msgid "Macintosh Old"
+msgstr "Macintosh Old"
+
+#: ../rules/base.xml.in.h:244
+#, fuzzy
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Make Caps Lock an additional Control."
+
+#: ../rules/base.xml.in.h:245
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:246
+#, fuzzy
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../rules/base.xml.in.h:247
+msgid "Maldives"
+msgstr ""
+
+#: ../rules/base.xml.in.h:248
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:249
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:250
+msgid "Maori"
+msgstr "Maori"
+
+#: ../rules/base.xml.in.h:251
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:252
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:253
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:254
+msgid "Menu is Compose."
+msgstr "Menu is Compose."
+
+#: ../rules/base.xml.in.h:255
+msgid "Menu key changes group."
+msgstr "Menu key changes group."
+
+#: ../rules/base.xml.in.h:256
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta is mapped to the Win-keys."
+
+#: ../rules/base.xml.in.h:257
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta is mapped to the left Win-key."
+
+#: ../rules/base.xml.in.h:258
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:259
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Swedish"
+
+#: ../rules/base.xml.in.h:260
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:261
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:262
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:263
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:264
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:265
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:266
+msgid "Miscellaneous compatibility options"
+msgstr "Miscellaneous compatibility options"
+
+#: ../rules/base.xml.in.h:267
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:268
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:269
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:270
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:271
+msgid "Mongolia"
+msgstr "Mongolia"
+
+#: ../rules/base.xml.in.h:272
+msgid "Multilingual"
+msgstr "Multilingual"
+
+#: ../rules/base.xml.in.h:273
+msgid "Multilingual, second part"
+msgstr "Multilingual, second part"
+
+#: ../rules/base.xml.in.h:274
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: ../rules/base.xml.in.h:275
+msgid "Netherlands"
+msgstr "Netherlands"
+
+#: ../rules/base.xml.in.h:276
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:277
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:278
+msgid "Northern Saami"
+msgstr "Northern Saami"
+
+#: ../rules/base.xml.in.h:279
+#, fuzzy
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Alternative, eliminate dead keys"
+
+#: ../rules/base.xml.in.h:280
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:281
+msgid "Norway"
+msgstr "Norway"
+
+#: ../rules/base.xml.in.h:282
+msgid "NumLock LED shows alternative group."
+msgstr "Num Lock LED shows alternative group."
+
+#: ../rules/base.xml.in.h:283
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:284
+#, fuzzy
+msgid "Ogham IS434"
+msgstr "IS434"
+
+#: ../rules/base.xml.in.h:285
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/Internet keyboard"
+
+#: ../rules/base.xml.in.h:286
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../rules/base.xml.in.h:287
+msgid "PC-98xx Series"
+msgstr "PC-98xx Series"
+
+#: ../rules/base.xml.in.h:288
+msgid "Pak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:289
+#, fuzzy
+msgid "Pakistan"
+msgstr "Tajikistan"
+
+#: ../rules/base.xml.in.h:290
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:291
+msgid "Phonetic"
+msgstr "Phonetic"
+
+#: ../rules/base.xml.in.h:292
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:293
+msgid "Poland"
+msgstr "Poland"
+
+#: ../rules/base.xml.in.h:294
+msgid "Polytonic"
+msgstr "Polytonic"
+
+#: ../rules/base.xml.in.h:295
+msgid "Portugal"
+msgstr "Portugal"
+
+#: ../rules/base.xml.in.h:296
+#, fuzzy
+msgid "Power G5"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:297
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:298
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Press Left Alt key to choose 3rd level."
+
+#: ../rules/base.xml.in.h:299
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Press Left Win-key to choose 3rd level."
+
+#: ../rules/base.xml.in.h:300
+msgid "Press Menu key to choose 3rd level."
+msgstr "Press Menu key to choose 3rd level."
+
+#: ../rules/base.xml.in.h:301
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Press Right Alt key to choose 3rd level."
+
+#: ../rules/base.xml.in.h:302
+#, fuzzy
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Press Right Control to choose 3rd level."
+
+#: ../rules/base.xml.in.h:303
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Press Right Win-key to choose 3rd level."
+
+#: ../rules/base.xml.in.h:304
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Press any of Alt keys to choose 3rd level."
+
+#: ../rules/base.xml.in.h:305
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Press any of Win-keys to choose 3rd level."
+
+#: ../rules/base.xml.in.h:306
+#, fuzzy
+msgid "Pro"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:307
+msgid "Pro Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:308
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:309
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:310
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:311
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:312
+msgid "R-Alt switches group while pressed."
+msgstr "R-Alt switches group while pressed."
+
+#: ../rules/base.xml.in.h:313
+msgid "Right Alt is Compose."
+msgstr "Right Alt is Compose."
+
+#: ../rules/base.xml.in.h:314
+msgid "Right Alt key changes group."
+msgstr "Right Alt key changes group."
+
+#: ../rules/base.xml.in.h:315
+msgid "Right Ctrl is Compose."
+msgstr "Right Ctrl is Compose."
+
+#: ../rules/base.xml.in.h:316
+msgid "Right Ctrl key changes group."
+msgstr "Right Ctrl key changes group."
+
+#: ../rules/base.xml.in.h:317
+msgid "Right Ctrl key switches group while pressed."
+msgstr "Right Ctrl key switches group while pressed."
+
+#: ../rules/base.xml.in.h:318
+#, fuzzy
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Right Control key works as Right Alt."
+
+#: ../rules/base.xml.in.h:319
+msgid "Right Shift key changes group."
+msgstr "Right Shift key changes group."
+
+#: ../rules/base.xml.in.h:320
+msgid "Right Win-key changes group."
+msgstr "Right Win-key changes group."
+
+#: ../rules/base.xml.in.h:321
+msgid "Right Win-key is Compose."
+msgstr "Right Win-key is Compose."
+
+#: ../rules/base.xml.in.h:322
+msgid "Right Win-key switches group while pressed."
+msgstr "Right Win-key switches group while pressed."
+
+#: ../rules/base.xml.in.h:323
+msgid "Romania"
+msgstr "Romania"
+
+#: ../rules/base.xml.in.h:324
+msgid "Romanian keyboard with German letters"
+msgstr "Romanian keyboard with German letters"
+
+#: ../rules/base.xml.in.h:325
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Romanian keyboard with German letters, eliminate dead keys"
+
+#: ../rules/base.xml.in.h:326
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:327
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:328
+msgid "Russia"
+msgstr "Russia"
+
+#: ../rules/base.xml.in.h:329
+msgid "Russian"
+msgstr "Russian"
+
+#: ../rules/base.xml.in.h:330
+#, fuzzy
+msgid "Russian phonetic"
+msgstr "Russian"
+
+#: ../rules/base.xml.in.h:331
+#, fuzzy
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "French, eliminate dead keys"
+
+#: ../rules/base.xml.in.h:332
+msgid "SCG"
+msgstr ""
+
+#: ../rules/base.xml.in.h:333
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:334
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:335
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:336
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:337
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:338
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:339
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:340
+msgid "ScrollLock LED shows alternative group."
+msgstr "Scroll Lock LED shows alternative group."
+
+#: ../rules/base.xml.in.h:341
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:342
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Shift with numpad keys works as in MS Windows."
+
+#: ../rules/base.xml.in.h:343
+msgid "Shift+CapsLock changes group."
+msgstr "Shift+Caps Lock changes group."
+
+#: ../rules/base.xml.in.h:344
+msgid "Slovakia"
+msgstr "Slovakia"
+
+#: ../rules/base.xml.in.h:345
+msgid "Slovenia"
+msgstr "Slovenia"
+
+#: ../rules/base.xml.in.h:346
+msgid "Spain"
+msgstr "Spain"
+
+#: ../rules/base.xml.in.h:347
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+
+#: ../rules/base.xml.in.h:348
+#, fuzzy
+msgid "SrL"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:349
+#, fuzzy
+msgid "Sri Lanka"
+msgstr "Serbian"
+
+#: ../rules/base.xml.in.h:350
+msgid "Standard"
+msgstr "Standard"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:352
+#, fuzzy
+msgid "Standard RSTU"
+msgstr "Standard"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:354
+msgid "Standard RSTU on Russian layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:355
+msgid "Sun dead keys"
+msgstr "Sun dead keys"
+
+#: ../rules/base.xml.in.h:356
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:357
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "Super is mapped to the Win-keys (default)."
+
+#: ../rules/base.xml.in.h:358
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:359
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:360
+#, fuzzy
+msgid "Swap Ctrl and CapsLock."
+msgstr "Swap Control and Caps Lock."
+
+#: ../rules/base.xml.in.h:361
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:362
+msgid "Sweden"
+msgstr "Sweden"
+
+#: ../rules/base.xml.in.h:363
+msgid "Switzerland"
+msgstr "Switzerland"
+
+#: ../rules/base.xml.in.h:364
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:365
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:366
+#, fuzzy
+msgid "Syria"
+msgstr "Syriac"
+
+#: ../rules/base.xml.in.h:367
+msgid "Syriac"
+msgstr "Syriac"
+
+#: ../rules/base.xml.in.h:368
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Russian"
+
+#: ../rules/base.xml.in.h:369
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:370
+msgid "Tajikistan"
+msgstr "Tajikistan"
+
+#: ../rules/base.xml.in.h:371
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../rules/base.xml.in.h:372
+#, fuzzy
+msgid "Tamil TAB Typewriter"
+msgstr "\"Typewriter\""
+
+#: ../rules/base.xml.in.h:373
+msgid "Tamil TSCII Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:374
+#, fuzzy
+msgid "Tamil Unicode"
+msgstr "Latin Unicode"
+
+#: ../rules/base.xml.in.h:375
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../rules/base.xml.in.h:376
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:377
+msgid "Thailand"
+msgstr "Thailand"
+
+#: ../rules/base.xml.in.h:378
+msgid "Third level choosers"
+msgstr "Third level choosers"
+
+#: ../rules/base.xml.in.h:379
+msgid "Tilde (~) variant"
+msgstr "Tilde (~) variant"
+
+#: ../rules/base.xml.in.h:380
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:381
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:382
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:383
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:384
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:385
+msgid "Turkish"
+msgstr "Turkish"
+
+#: ../rules/base.xml.in.h:386
+#, fuzzy
+msgid "Typewriter"
+msgstr "\"Typewriter\""
+
+#: ../rules/base.xml.in.h:387
+msgid "U.S. English"
+msgstr "U.S. English"
+
+#: ../rules/base.xml.in.h:388
+#, fuzzy
+msgid "US keyboard with Bosnian digraphs"
+msgstr "US keyboard with Romanian letters"
+
+#: ../rules/base.xml.in.h:389
+#, fuzzy
+msgid "US keyboard with Bosnian letters"
+msgstr "US keyboard with Romanian letters"
+
+#: ../rules/base.xml.in.h:390
+#, fuzzy
+msgid "US keyboard with Croatian digraphs"
+msgstr "US keyboard with Croatian letters"
+
+#: ../rules/base.xml.in.h:391
+msgid "US keyboard with Croatian letters"
+msgstr "US keyboard with Croatian letters"
+
+#: ../rules/base.xml.in.h:392
+msgid "US keyboard with Lithuanian letters"
+msgstr "US keyboard with Lithuanian letters"
+
+#: ../rules/base.xml.in.h:393
+msgid "US keyboard with Maltian letters"
+msgstr "US keyboard with Maltian letters"
+
+#: ../rules/base.xml.in.h:394
+#, fuzzy
+msgid "US keyboard with Slovenian digraphs"
+msgstr "US keyboard with Romanian letters"
+
+#: ../rules/base.xml.in.h:395
+#, fuzzy
+msgid "US keyboard with Slovenian letters"
+msgstr "US keyboard with Romanian letters"
+
+#: ../rules/base.xml.in.h:396
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.xml.in.h:397
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:398
+msgid "Ukraine"
+msgstr "Ukraine"
+
+#: ../rules/base.xml.in.h:399
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:400
+msgid "United Kingdom"
+msgstr "United Kingdom"
+
+#: ../rules/base.xml.in.h:401
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../rules/base.xml.in.h:402
+msgid "Use Bosnian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:403
+msgid "Use Croatian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:404
+msgid "Use Slovenian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:405
+msgid "Use guillemots for quotes"
+msgstr ""
+
+#: ../rules/base.xml.in.h:406
+msgid "Use keyboard LED to show alternative group."
+msgstr "Use keyboard LED to show alternative group."
+
+#: ../rules/base.xml.in.h:407
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:408
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+#: ../rules/base.xml.in.h:409
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../rules/base.xml.in.h:410
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:411
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:412
+msgid "Winkeys"
+msgstr "Winkeys"
+
+#: ../rules/base.xml.in.h:413
+msgid "With &lt;\\|&gt; key"
+msgstr "With &lt;\\|&gt; key"
+
+#: ../rules/base.xml.in.h:414
+msgid "With guillemots"
+msgstr "With guillemots"
+
+#: ../rules/base.xml.in.h:415
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:416
+msgid "Z and ZHE swapped"
+msgstr "Z and ZHE swapped"
+
+#: ../rules/base.xml.in.h:417
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:418
+msgid "azerty/digits"
+msgstr "azerty/digits"
+
+#: ../rules/base.xml.in.h:419
+msgid "digits"
+msgstr "digits"
+
+#: ../rules/base.xml.in.h:420
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:421
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:422
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, extended Backslash"
+
+#: ../rules/base.xml.in.h:423
+msgid "qwerty/digits"
+msgstr "qwerty/digits"
+
+#: ../rules/base.xml.in.h:424
+msgid "qwertz"
+msgstr "qwertz"
+
+#: ../rules/base.xml.in.h:425
+msgid "si1452"
+msgstr "si1452"
+
+#~ msgid "\"Standard\""
+#~ msgstr "\"Standard\""
+
+#, fuzzy
+#~ msgid "Romanian keyboard with MS layout"
+#~ msgstr "Romanian keyboard with German letters"
+
+#, fuzzy
+#~ msgid "Romanian standard keyboard"
+#~ msgstr "Ukrainian standard RSTU"
+
+#, fuzzy
+#~ msgid "Serbia"
+#~ msgstr "Serbian"
+
+#~ msgid "Srp"
+#~ msgstr "Srp"
+
+#, fuzzy
+#~ msgid "Tamil INSCRIPT"
+#~ msgstr "Bengali"
+
+#~ msgid "US keyboard with Romanian letters"
+#~ msgstr "US keyboard with Romanian letters"
+
+#~ msgid "CloGaelach Laptop"
+#~ msgstr "CloGaelach Laptop"
+
+#~ msgid "Laptop"
+#~ msgstr "Laptop"
+
+#, fuzzy
+#~ msgid "Ogham IS434 laptop"
+#~ msgstr "IS434 laptop"
+
+#, fuzzy
+#~ msgid "Sinhala phonetic"
+#~ msgstr "Russian"
+
+#, fuzzy
+#~ msgid "Malayalam with Malayalam digits"
+#~ msgstr "With Malayalam digits"
+
+#, fuzzy
+#~ msgid "Devanagari INSCRIPT"
+#~ msgstr "Devanagari"
+
+#~ msgid "Dzo"
+#~ msgstr "Dzo"
+
+#~ msgid "Dzongkha"
+#~ msgstr "Dzongkha"
+
+#~ msgid "Finish and Swedish"
+#~ msgstr "Finish and Swedish"
+
+#, fuzzy
+#~ msgid "Gurmukhi INSCRIPT"
+#~ msgstr "Gurmukhi"
+
+#, fuzzy
+#~ msgid "Kannada INSCRIPT"
+#~ msgstr "Kannada"
+
+#~ msgid "Smi"
+#~ msgstr "Smi"
+
+#~ msgid "Ben"
+#~ msgstr "Ben"
+
+#~ msgid "Deva"
+#~ msgstr "Deva"
+
+#~ msgid "Guj"
+#~ msgstr "Guj"
+
+#~ msgid "INSCRIPT layout"
+#~ msgstr "INSCRIPT layout"
+
+#~ msgid "Iku"
+#~ msgstr "Iku"
+
+#~ msgid "Ogam"
+#~ msgstr "Ogam"
+
+#~ msgid "Ori"
+#~ msgstr "Ori"
+
+#~ msgid "Sin"
+#~ msgstr "Sin"
+
+#~ msgid "Sinhala"
+#~ msgstr "Sinhala"
+
+#~ msgid "Tam"
+#~ msgstr "Tam"
+
+#~ msgid "Tel"
+#~ msgstr "Tel"
+
+#~ msgid "Typewrite-style keymap; TAB encoding"
+#~ msgstr "Typewrite-style keymap; TAB encoding"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; TSCII encoding"
+#~ msgstr "Typewrite-style keymap; TAB encoding"
+
+#~ msgid "Urd"
+#~ msgstr "Urd"
+
+#~ msgid "Typewrite-style keymap; Unicode encoding"
+#~ msgstr "Typewrite-style keymap; Unicode encoding"
diff --git a/xorg-server/xkbdata.src/po/es.po b/xorg-server/xkbdata.src/po/es.po
new file mode 100644
index 000000000..5548cd682
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/es.po
@@ -0,0 +1,1966 @@
+# translation of es.po to Spanish
+# Spanish trasnlation of xkbd
+# This file is distributed under the same license as the xkbdesk package.
+# Copyright (C) 2006 The free software foundation
+# Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: es\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-20 20:35+0200\n"
+"PO-Revision-Date: 2006-07-20 20:46+0200\n"
+"Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
+"Language-Team: Spanish <traductores@es.gnome.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2
+msgid "101/104 key Compatible"
+msgstr "101/104 teclas compatible"
+
+#: ../rules/base.xml.in.h:3
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/coma/Teclas muertas"
+
+#: ../rules/base.xml.in.h:4
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/coma/Eliminar teclas muertas"
+
+#: ../rules/base.xml.in.h:5
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/punto/Teclas muertas"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/punto/Eliminar teclas muertas"
+
+#: ../rules/base.xml.in.h:7
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/coma/Teclas muertas"
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/coma/Eliminar teclas muertas"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/punto/Teclas muertas"
+
+#: ../rules/base.xml.in.h:10
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/punto/Eliminar teclas muertas"
+
+#: ../rules/base.xml.in.h:11
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/coma/Teclas muertas"
+
+#: ../rules/base.xml.in.h:12
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/coma/Eliminar teclas muertas"
+
+#: ../rules/base.xml.in.h:13
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/punto/Teclas muertas"
+
+#: ../rules/base.xml.in.h:14
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/punto/Eliminar teclas muertas"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/coma/Teclas muertas"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/coma/Eliminar teclas muertas"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/punto/Teclas muertas"
+
+#: ../rules/base.xml.in.h:18
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/punto/Eliminar teclas muertas"
+
+#: ../rules/base.xml.in.h:19
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:20
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:21
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:22
+msgid "ACPI Standard"
+msgstr "ACPI Estándard"
+
+#: ../rules/base.xml.in.h:23
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:24
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:25
+msgid "Acer TravelMate 800"
+msgstr "Acer TravelMate 800"
+
+#: ../rules/base.xml.in.h:26
+msgid "Add the EuroSign to the 2 key."
+msgstr "Añadir el símbolo del Euro a la tecla 2."
+
+#: ../rules/base.xml.in.h:27
+msgid "Add the EuroSign to the 5 key."
+msgstr "Añadir el símbolo del Euro a la tecla 5."
+
+#: ../rules/base.xml.in.h:28
+msgid "Add the EuroSign to the E key."
+msgstr "Añadir el símbolo del Euro a la tecla E."
+
+#: ../rules/base.xml.in.h:29
+msgid "Add the standard behavior to Menu key."
+msgstr "Añadir el comportamiento estándar a la tecla Menú."
+
+#: ../rules/base.xml.in.h:30
+msgid "Adding the EuroSign to certain keys"
+msgstr "Añadir el símbolo del Euro a ciertas teclas"
+
+#: ../rules/base.xml.in.h:31
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:32
+msgid "Afg"
+msgstr "Afg"
+
+#: ../rules/base.xml.in.h:33
+msgid "Afghanistan"
+msgstr "Afganistán"
+
+#: ../rules/base.xml.in.h:34
+msgid "Akan"
+msgstr "Akan"
+
+#: ../rules/base.xml.in.h:35
+msgid "Alb"
+msgstr "Alb"
+
+#: ../rules/base.xml.in.h:36
+msgid "Albania"
+msgstr "Albania"
+
+#: ../rules/base.xml.in.h:37
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Alt y Meta están en las teclas Alt (predeterminado)."
+
+#: ../rules/base.xml.in.h:38
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt está mapeado a la tecla Windows derecha y Super a la tecla Menú."
+
+#: ../rules/base.xml.in.h:39
+msgid "Alt+Ctrl changes group."
+msgstr "Alt+Ctrl cambia el grupo."
+
+#: ../rules/base.xml.in.h:40
+msgid "Alt+Shift changes group."
+msgstr "Alt+Mayús cambia el grupo."
+
+#: ../rules/base.xml.in.h:41
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:42
+msgid "Alt/Win key behavior"
+msgstr "Comportamiento de la tecla Alt/Windows"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alternative"
+msgstr "Alternativa"
+
+#: ../rules/base.xml.in.h:44
+msgid "Alternative international (former us_intl)"
+msgstr "Alternativa internacional (antigua us_intl)"
+
+#: ../rules/base.xml.in.h:45
+msgid "Alternative, Sun dead keys"
+msgstr "Alternativa, teclas muertas de Sun"
+
+#: ../rules/base.xml.in.h:46
+msgid "Alternative, eliminate dead keys"
+msgstr "Alternativa, eliminar teclas muertas"
+
+#: ../rules/base.xml.in.h:47
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:48
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../rules/base.xml.in.h:49
+msgid "Apostrophe (') variant"
+msgstr "Variante apóstrofo (')"
+
+#: ../rules/base.xml.in.h:50
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:51
+msgid "Apple Laptop"
+msgstr "Portátil Apple"
+
+#: ../rules/base.xml.in.h:52
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:53
+msgid "Arabic"
+msgstr "�rabe"
+
+#: ../rules/base.xml.in.h:54
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:55
+msgid "Armenia"
+msgstr "Armenia"
+
+#: ../rules/base.xml.in.h:56
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:57
+msgid "Azerbaijan"
+msgstr "Azerbaiján"
+
+#: ../rules/base.xml.in.h:58
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet Keyboard"
+
+#: ../rules/base.xml.in.h:59
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:60
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:61
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:62
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:63
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:64
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:65
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:66
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: ../rules/base.xml.in.h:67
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:68
+msgid "Belarus"
+msgstr "Bielorusia"
+
+#: ../rules/base.xml.in.h:69
+msgid "Belgium"
+msgstr "Bélgica"
+
+#: ../rules/base.xml.in.h:70
+msgid "Bengali"
+msgstr "Bengalí"
+
+#: ../rules/base.xml.in.h:71
+msgid "Bengali Probhat"
+msgstr "Probhat Bengalí"
+
+#: ../rules/base.xml.in.h:72
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:73
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:74
+msgid "Bhutan"
+msgstr "Bhután"
+
+#: ../rules/base.xml.in.h:75
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:76
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:77
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnia y Herzegovina"
+
+#: ../rules/base.xml.in.h:78
+msgid "Both Alt keys together change group."
+msgstr "Ambas teclas Alt juntas cambian el grupo."
+
+#: ../rules/base.xml.in.h:79
+msgid "Both Ctrl keys together change group."
+msgstr "Ambas teclas Ctrl juntas cambian el grupo."
+
+#: ../rules/base.xml.in.h:80
+msgid "Both Shift keys together change group."
+msgstr "Ambas teclas Mayús juntas cambian el grupo."
+
+#: ../rules/base.xml.in.h:81
+msgid "Both Win-keys switch group while pressed."
+msgstr "Ambas teclas Windows juntas cambian el grupo."
+
+#: ../rules/base.xml.in.h:82
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:83
+msgid "Brazil"
+msgstr "Brasil"
+
+#: ../rules/base.xml.in.h:84
+msgid "Brazilian ABNT2"
+msgstr "ABNT2 brasileño"
+
+#: ../rules/base.xml.in.h:85
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:86
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+#: ../rules/base.xml.in.h:87
+msgid "Cambodia"
+msgstr "Camboya"
+
+#: ../rules/base.xml.in.h:88
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:89
+msgid "Canada"
+msgstr "Canadá"
+
+#: ../rules/base.xml.in.h:90
+msgid "Caps Lock is Compose."
+msgstr "BloqMayús es Componer"
+
+#: ../rules/base.xml.in.h:91
+msgid "CapsLock LED shows alternative group."
+msgstr "El LED de BloqMayús muestra el grupo alternativo."
+
+#: ../rules/base.xml.in.h:92
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "BloqMayús actúa como Mayús con bloqueo. Mayús. cancela el BloqMayús."
+
+#: ../rules/base.xml.in.h:93
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "BloqMayús actúa como Mayús con bloqueo. Mayús. no cancela el Bloq. Mayús."
+
+#: ../rules/base.xml.in.h:94
+msgid "CapsLock just locks the Shift modifier."
+msgstr "BloqMayús tan sólo bloquea el modificador Mayús."
+
+#: ../rules/base.xml.in.h:95
+msgid "CapsLock key behavior"
+msgstr "Comportamiento de BloqMayús"
+
+#: ../rules/base.xml.in.h:96
+msgid "CapsLock key changes group."
+msgstr "La tecla BloqMayús cambia el grupo."
+
+#: ../rules/base.xml.in.h:97
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "BloqMayús cambia Mayús de forma que todas las teclas están afectadas."
+
+#: ../rules/base.xml.in.h:98
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "BloqMayús cambia la capitalización normal de los caracteres alfabéticos."
+
+#: ../rules/base.xml.in.h:99
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr "BloqMayús usa la capitalización interna. Mayúsculas cancela el BloqMayús."
+
+#: ../rules/base.xml.in.h:100
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr "BloqMayús usa la capitalización interna. Mayúsculas no cancela el BloqMayús."
+
+#: ../rules/base.xml.in.h:101
+msgid "Catalan variant with middle-dot L"
+msgstr "Variante catalana con L de medio punto"
+
+#: ../rules/base.xml.in.h:102
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:103
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:104
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (opción alternativa)"
+
+#: ../rules/base.xml.in.h:105
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:106
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:107
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:108
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:109
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:110
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:111
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 teclas)"
+
+#: ../rules/base.xml.in.h:112
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 teclas)"
+
+#: ../rules/base.xml.in.h:113
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 teclas)"
+
+#: ../rules/base.xml.in.h:114
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:115
+msgid "Compose key position"
+msgstr "Posición de la tecla Componer"
+
+#: ../rules/base.xml.in.h:116
+msgid "Congo, Democratic Republic of the"
+msgstr "Congo, República Democrática del"
+
+#: ../rules/base.xml.in.h:117
+msgid "Croatia"
+msgstr "Croacia"
+
+#: ../rules/base.xml.in.h:118
+msgid "Ctrl key at bottom left"
+msgstr "Tecla Ctrl a la izquierda abajo"
+
+#: ../rules/base.xml.in.h:119
+msgid "Ctrl key at left of 'A'"
+msgstr "Tecla Ctrl a la izquierda de la «A»"
+
+#: ../rules/base.xml.in.h:120
+msgid "Ctrl key position"
+msgstr "Posición de la tecla Ctrl"
+
+#: ../rules/base.xml.in.h:121
+msgid "Ctrl+Shift changes group."
+msgstr "Ctrl+Mayús cambia el grupo."
+
+#: ../rules/base.xml.in.h:122
+msgid "Cyrillic"
+msgstr "Cirílico"
+
+#: ../rules/base.xml.in.h:123
+msgid "Cze"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:124
+msgid "Czechia"
+msgstr "Chequia"
+
+#: ../rules/base.xml.in.h:125
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:126
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:127
+msgid "Dead acute"
+msgstr "Acento muerto"
+
+#: ../rules/base.xml.in.h:128
+msgid "Dead grave acute"
+msgstr "Acento grave muerto"
+
+#: ../rules/base.xml.in.h:129
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:130
+msgid "Dell 101-key PC"
+msgstr "Dell PC 101 teclas"
+
+#: ../rules/base.xml.in.h:131
+msgid "Dell Latitude series laptop"
+msgstr "Portátil Dell Latitude"
+
+#: ../rules/base.xml.in.h:132
+msgid "Dell USB Multimedia Keybard"
+msgstr "Dell USB Multimedia Keybard"
+
+#: ../rules/base.xml.in.h:133
+msgid "Denmark"
+msgstr "Dinamarca"
+
+#: ../rules/base.xml.in.h:134
+msgid "Deu"
+msgstr "Deu"
+
+#: ../rules/base.xml.in.h:135
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:136
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 series"
+
+#: ../rules/base.xml.in.h:137
+msgid "Dnk"
+msgstr "Dnk"
+
+#: ../rules/base.xml.in.h:138
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:139
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak, comillas polacas en la tecla «1/!»"
+
+#: ../rules/base.xml.in.h:140
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, comillas polacas en la tecla de comillas"
+
+#: ../rules/base.xml.in.h:141
+msgid "Eliminate dead keys"
+msgstr "Eliminar teclas muertas"
+
+#: ../rules/base.xml.in.h:142
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:143
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:144
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:145
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:146
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:147
+msgid "Estonia"
+msgstr "Estonia"
+
+#: ../rules/base.xml.in.h:148
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:149
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:150
+msgid "Extended"
+msgstr "Extendido"
+
+#: ../rules/base.xml.in.h:151
+msgid "Extended Backslash"
+msgstr "Contrabarra extendida"
+
+#: ../rules/base.xml.in.h:152
+msgid "F-letter (F) variant"
+msgstr "Variante de letra F (F)"
+
+#: ../rules/base.xml.in.h:153
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:154
+msgid "Faroe Islands"
+msgstr "Islas Feroe"
+
+#: ../rules/base.xml.in.h:155
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:156
+msgid "Finland"
+msgstr "Finlandia"
+
+#: ../rules/base.xml.in.h:157
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:158
+msgid "France"
+msgstr "Francia"
+
+#: ../rules/base.xml.in.h:159
+msgid "French"
+msgstr "Francés"
+
+#: ../rules/base.xml.in.h:160
+msgid "French (Macintosh)"
+msgstr "Francés (Macintosh)"
+
+#: ../rules/base.xml.in.h:161
+msgid "French (legacy)"
+msgstr "Francés (heredado)"
+
+#: ../rules/base.xml.in.h:162
+msgid "French Dvorak"
+msgstr "Francés Dvorak"
+
+#: ../rules/base.xml.in.h:163
+msgid "French, Sun dead keys"
+msgstr "Francés, teclas muertas Sun"
+
+#: ../rules/base.xml.in.h:164
+msgid "French, eliminate dead keys"
+msgstr "Francés, eliminar teclas muertas"
+
+#: ../rules/base.xml.in.h:165
+msgid "Fula"
+msgstr "Fula"
+
+#: ../rules/base.xml.in.h:166
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:167
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:168
+msgid "Generic 101-key PC"
+msgstr "PC genérico 101 teclas"
+
+#: ../rules/base.xml.in.h:169
+msgid "Generic 102-key (Intl) PC"
+msgstr "PC genérico 102 teclas (intl)"
+
+#: ../rules/base.xml.in.h:170
+msgid "Generic 104-key PC"
+msgstr "PC genérico 104 teclas"
+
+#: ../rules/base.xml.in.h:171
+msgid "Generic 105-key (Intl) PC"
+msgstr "PC genérico 105 teclas (intl)"
+
+#: ../rules/base.xml.in.h:172
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:173
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:174
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:175
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:176
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:177
+msgid "Georgia"
+msgstr "Georgia"
+
+#: ../rules/base.xml.in.h:178
+msgid "German (Macintosh)"
+msgstr "Alemán (Macintosh)"
+
+#: ../rules/base.xml.in.h:179
+msgid "German, Sun dead keys"
+msgstr "Alemán, teclas muertas Sun"
+
+#: ../rules/base.xml.in.h:180
+msgid "German, eliminate dead keys"
+msgstr "Alemán, eliminar teclas muertas"
+
+#: ../rules/base.xml.in.h:181
+msgid "Germany"
+msgstr "Alemania"
+
+#: ../rules/base.xml.in.h:182
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:183
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../rules/base.xml.in.h:184
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:185
+msgid "Greece"
+msgstr "Grecia"
+
+#: ../rules/base.xml.in.h:186
+msgid "Group Shift/Lock behavior"
+msgstr "Comportamiento del grupo Mayús/Bloq"
+
+#: ../rules/base.xml.in.h:187
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../rules/base.xml.in.h:188
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../rules/base.xml.in.h:189
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:190
+msgid "Hausa"
+msgstr "Hausa"
+
+#: ../rules/base.xml.in.h:191
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:192
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:193
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:194
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:195
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:196
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:197
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:198
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:199
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:200
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:201
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:202
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:203
+msgid "Hun"
+msgstr "Hun"
+
+#: ../rules/base.xml.in.h:204
+msgid "Hungary"
+msgstr "Hungría"
+
+#: ../rules/base.xml.in.h:205
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper está mapeado a las teclas Windows."
+
+#: ../rules/base.xml.in.h:206
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:207
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:208
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (opción alternativa)"
+
+#: ../rules/base.xml.in.h:209
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:210
+msgid "ISO Alternate"
+msgstr "Alternativa ISO"
+
+#: ../rules/base.xml.in.h:211
+msgid "Iceland"
+msgstr "Islandia"
+
+#: ../rules/base.xml.in.h:212
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:213
+msgid "India"
+msgstr "India"
+
+#: ../rules/base.xml.in.h:214
+msgid "International (with dead keys)"
+msgstr "Internacional (con teclas muertas)"
+
+#: ../rules/base.xml.in.h:215
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: ../rules/base.xml.in.h:216
+msgid "Iran"
+msgstr "Irán"
+
+#: ../rules/base.xml.in.h:217
+msgid "Iraq"
+msgstr "Iraq"
+
+#: ../rules/base.xml.in.h:218
+msgid "Ireland"
+msgstr "Irlanda"
+
+#: ../rules/base.xml.in.h:219
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:220
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:221
+msgid "Irq"
+msgstr "Irq"
+
+#: ../rules/base.xml.in.h:222
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:223
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:224
+msgid "Israel"
+msgstr "Israel"
+
+#: ../rules/base.xml.in.h:225
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:226
+msgid "Italy"
+msgstr "Italia"
+
+#: ../rules/base.xml.in.h:227
+msgid "Japan"
+msgstr "Japón"
+
+#: ../rules/base.xml.in.h:228
+msgid "Japan (PC-98xx Series)"
+msgstr "Japón (Series PC-98xx)"
+
+#: ../rules/base.xml.in.h:229
+msgid "Japanese 106-key"
+msgstr "Japonés 106 teclas"
+
+#: ../rules/base.xml.in.h:230
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:231
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../rules/base.xml.in.h:232
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:233
+msgid "Kazakh with Russian"
+msgstr "Kazajo con ruso"
+
+#: ../rules/base.xml.in.h:234
+msgid "Kazakhstan"
+msgstr "Kazajstán"
+
+#: ../rules/base.xml.in.h:235
+msgid "Keypad"
+msgstr "Teclado numérico"
+
+#: ../rules/base.xml.in.h:236
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:237
+msgid "Khm"
+msgstr "Khm"
+
+#: ../rules/base.xml.in.h:238
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:239
+msgid "Korea, Republic of"
+msgstr "Corea, República de"
+
+#: ../rules/base.xml.in.h:240
+msgid "Korean 106-key"
+msgstr "Coreano 106 teclas"
+
+#: ../rules/base.xml.in.h:241
+msgid "Kotoistus"
+msgstr "Kotoistus"
+
+#: ../rules/base.xml.in.h:242
+msgid "Kurdish, (F)"
+msgstr "Kurdo, (F)"
+
+#: ../rules/base.xml.in.h:243
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Kurdo, Latino Alt-Q"
+
+#: ../rules/base.xml.in.h:244
+msgid "Kurdish, Latin Q"
+msgstr "Kurdo, Latino Q"
+
+#: ../rules/base.xml.in.h:245
+msgid "Kyr"
+msgstr "Kyr"
+
+#: ../rules/base.xml.in.h:246
+msgid "Kyrgyzstan"
+msgstr "Kirgizstán"
+
+#: ../rules/base.xml.in.h:247
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:248
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:249
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:250
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+
+#: ../rules/base.xml.in.h:251
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+
+#: ../rules/base.xml.in.h:252
+msgid "Laptop/notebook Dell Inspiron 6xxx/8xxx"
+msgstr "Laptop/notebook Dell Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:253
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Laptop/notebook eMachines m68xx"
+
+#: ../rules/base.xml.in.h:254
+msgid "Latin"
+msgstr "Latino"
+
+#: ../rules/base.xml.in.h:255
+msgid "Latin American"
+msgstr "Latino américa"
+
+#: ../rules/base.xml.in.h:256
+msgid "Latin Unicode"
+msgstr "Latino Unicode"
+
+#: ../rules/base.xml.in.h:257
+msgid "Latin Unicode qwerty"
+msgstr "Latino Unicode qwerty"
+
+#: ../rules/base.xml.in.h:258
+msgid "Latin qwerty"
+msgstr "Latino qwerty"
+
+#: ../rules/base.xml.in.h:259
+msgid "Latin with guillemots"
+msgstr "Latino con guillemots"
+
+#: ../rules/base.xml.in.h:260
+msgid "Latvia"
+msgstr "Letonia"
+
+#: ../rules/base.xml.in.h:261
+msgid "Left Alt key changes group."
+msgstr "La tecla Alt izquierda cambia el grupo."
+
+#: ../rules/base.xml.in.h:262
+msgid "Left Alt key switches group while pressed."
+msgstr "La tecla Alt izquierda cambia el grupo al pulsarla."
+
+#: ../rules/base.xml.in.h:263
+msgid "Left Ctrl key changes group."
+msgstr "La tecla Ctrl izquierda cambia el grupo."
+
+#: ../rules/base.xml.in.h:264
+msgid "Left Shift key changes group."
+msgstr "La tecla Mayús izquierda cambia el grupo."
+
+#: ../rules/base.xml.in.h:265
+msgid "Left Win-key changes group."
+msgstr "La tecla Windows izquierda cambia el grupo."
+
+#: ../rules/base.xml.in.h:266
+msgid "Left Win-key is Compose."
+msgstr "La tecla Windows izquierda es Componer."
+
+#: ../rules/base.xml.in.h:267
+msgid "Left Win-key switches group while pressed."
+msgstr "La tecla Windows izquierda cambia el grupo al pulsarla."
+
+#: ../rules/base.xml.in.h:268
+msgid "Left handed Dvorak"
+msgstr "Dvorak para zurdos"
+
+#: ../rules/base.xml.in.h:269
+msgid "Lithuania"
+msgstr "Lituania"
+
+#: ../rules/base.xml.in.h:270
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:271
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:272
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:273
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:274
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:275
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: ../rules/base.xml.in.h:276
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (opción alternativa)"
+
+#: ../rules/base.xml.in.h:277
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (opción alternativa 2)"
+
+#: ../rules/base.xml.in.h:278
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:279
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:280
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:281
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:282
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:283
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:284
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:285
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (modelo Y-RB6)"
+
+#: ../rules/base.xml.in.h:286
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:287
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+#: ../rules/base.xml.in.h:288
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:289
+msgid "Lva"
+msgstr "Lva"
+
+#: ../rules/base.xml.in.h:290
+msgid "Macedonia"
+msgstr "Macedonia"
+
+#: ../rules/base.xml.in.h:291
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:292
+msgid "Macintosh Old"
+msgstr "Macintosh antiguo"
+
+#: ../rules/base.xml.in.h:293
+msgid "Macintosh layout"
+msgstr "Distribución Macintosh"
+
+#: ../rules/base.xml.in.h:294
+msgid "Macintosh layout, eliminate dead keys"
+msgstr "Distribución Macintosh, eliminar teclas muertas"
+
+#: ../rules/base.xml.in.h:295
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Hacer de BloqMayús un Ctrl adicional."
+
+#: ../rules/base.xml.in.h:296
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:297
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../rules/base.xml.in.h:298
+msgid "Maldives"
+msgstr "Maldivas"
+
+#: ../rules/base.xml.in.h:299
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:300
+msgid "Maltese keyboard with US layout"
+msgstr "Teclado maltés con distribución EE. UU."
+
+#: ../rules/base.xml.in.h:301
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:302
+msgid "Maori"
+msgstr "Maorí"
+
+#: ../rules/base.xml.in.h:303
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:304
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:305
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:306
+msgid "Menu is Compose."
+msgstr "Menú es Componer."
+
+#: ../rules/base.xml.in.h:307
+msgid "Menu key changes group."
+msgstr "La tecla Menú cambia el grupo."
+
+#: ../rules/base.xml.in.h:308
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta está mapeado a las teclas Windows."
+
+#: ../rules/base.xml.in.h:309
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta está mapeado a la tecla Windows izquierda."
+
+#: ../rules/base.xml.in.h:310
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:311
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, sueco"
+
+#: ../rules/base.xml.in.h:312
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:313
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:314
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:315
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:316
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:317
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:318
+msgid "Miscellaneous compatibility options"
+msgstr "Opciones misceláneas de compatiblidad"
+
+#: ../rules/base.xml.in.h:319
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:320
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:321
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:322
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:323
+msgid "Mongolia"
+msgstr "Mongolia"
+
+#: ../rules/base.xml.in.h:324
+msgid "Multilingual"
+msgstr "Multilingüe"
+
+#: ../rules/base.xml.in.h:325
+msgid "Multilingual, first part"
+msgstr "Multilingüe, primera parte"
+
+#: ../rules/base.xml.in.h:326
+msgid "Multilingual, second part"
+msgstr "Multilingüe, segunda parte"
+
+#: ../rules/base.xml.in.h:327
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: ../rules/base.xml.in.h:328
+msgid "Neostyle"
+msgstr "Neostyle"
+
+#: ../rules/base.xml.in.h:329
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:330
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../rules/base.xml.in.h:331
+msgid "Netherlands"
+msgstr "Holanda"
+
+#: ../rules/base.xml.in.h:332
+msgid "Nld"
+msgstr "Hol"
+
+#: ../rules/base.xml.in.h:333
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:334
+msgid "Northern Saami"
+msgstr "Saami del norte"
+
+#: ../rules/base.xml.in.h:335
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Saami del norte, eliminar teclas muertas"
+
+#: ../rules/base.xml.in.h:336
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:337
+msgid "Norway"
+msgstr "Noruega"
+
+#: ../rules/base.xml.in.h:338
+msgid "NumLock LED shows alternative group."
+msgstr "El LED de BloqNum muestra el grupo alternativo."
+
+#: ../rules/base.xml.in.h:339
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:340
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:341
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/Internet keyboard"
+
+#: ../rules/base.xml.in.h:342
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../rules/base.xml.in.h:343
+msgid "PC-98xx Series"
+msgstr "PC-98xx Series"
+
+#: ../rules/base.xml.in.h:344
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:345
+msgid "Pakistan"
+msgstr "Pakistán"
+
+#: ../rules/base.xml.in.h:346
+msgid "Pashto"
+msgstr "Pashto"
+
+#: ../rules/base.xml.in.h:347
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:348
+msgid "Phonetic"
+msgstr "Fonético"
+
+#: ../rules/base.xml.in.h:349
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:350
+msgid "Poland"
+msgstr "Polonia"
+
+#: ../rules/base.xml.in.h:351
+msgid "Polytonic"
+msgstr "Politónico"
+
+#: ../rules/base.xml.in.h:352
+msgid "Portugal"
+msgstr "Portugal"
+
+#: ../rules/base.xml.in.h:353
+msgid "Power G5"
+msgstr "Power G5"
+
+#: ../rules/base.xml.in.h:354
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:355
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Pulsar la tecla Alt izquierda para elegir el 3er nivel."
+
+#: ../rules/base.xml.in.h:356
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Pulsar la tecla Windows izquierda para elegir el 3er nivel."
+
+#: ../rules/base.xml.in.h:357
+msgid "Press Menu key to choose 3rd level."
+msgstr "Pulsar la tecla Menú para elegir el 3er nivel."
+
+#: ../rules/base.xml.in.h:358
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Pulsar la tecla Alt derecha para elegir el 3er nivel."
+
+#: ../rules/base.xml.in.h:359
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Pulsar la tecla Ctrl derecha para elegir el 3er nivel."
+
+#: ../rules/base.xml.in.h:360
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Pulsar la tecla Windows derecha para elegir el 3er nivel."
+
+#: ../rules/base.xml.in.h:361
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Pulsar cualquiera de las teclas Alt para elegir el 3er nivel."
+
+#: ../rules/base.xml.in.h:362
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Pulsar cualquiera de las teclas Windows para elegir el 3er nivel."
+
+#: ../rules/base.xml.in.h:363
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:364
+msgid "Pro Keypad"
+msgstr "Pro Keypad"
+
+#: ../rules/base.xml.in.h:365
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:366
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:367
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:368
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:369
+msgid "R-Alt switches group while pressed."
+msgstr "Alt derecho cambia el grupo al pulsarse."
+
+#: ../rules/base.xml.in.h:370
+msgid "Right Alt is Compose."
+msgstr "Alt derecho es Componer"
+
+#: ../rules/base.xml.in.h:371
+msgid "Right Alt key changes group."
+msgstr "La tecla Alt derecha cambia el grupo."
+
+#: ../rules/base.xml.in.h:372
+msgid "Right Ctrl is Compose."
+msgstr "La tecla Ctrl derecha es Componer."
+
+#: ../rules/base.xml.in.h:373
+msgid "Right Ctrl key changes group."
+msgstr "La tecla Ctrl derecha cambia el grupo."
+
+#: ../rules/base.xml.in.h:374
+msgid "Right Ctrl key switches group while pressed."
+msgstr "La tecla Ctrl derecha cambia el grupo mientras está presionada."
+
+#: ../rules/base.xml.in.h:375
+msgid "Right Ctrl key works as Right Alt."
+msgstr "La tecla Ctrl derecha funciona como Alt derecha."
+
+#: ../rules/base.xml.in.h:376
+msgid "Right Shift key changes group."
+msgstr "La tecla Mayús derecha cambia el grupo."
+
+#: ../rules/base.xml.in.h:377
+msgid "Right Win-key changes group."
+msgstr "La tecla Windows derecha cambia el grupo."
+
+#: ../rules/base.xml.in.h:378
+msgid "Right Win-key is Compose."
+msgstr "La tecla Windows derecha es Componer."
+
+#: ../rules/base.xml.in.h:379
+msgid "Right Win-key switches group while pressed."
+msgstr "La tecla Windows derecha cambia el grupo mientras está presionada."
+
+#: ../rules/base.xml.in.h:380
+msgid "Right handed Dvorak"
+msgstr "Dvorak diestro"
+
+#: ../rules/base.xml.in.h:381
+msgid "Romania"
+msgstr "Rumanía"
+
+#: ../rules/base.xml.in.h:382
+msgid "Romanian keyboard with German letters"
+msgstr "Teclado rumano con letras alemanas"
+
+#: ../rules/base.xml.in.h:383
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Teclado rumano con teclas alemanas, eliminar teclas muertas"
+
+#: ../rules/base.xml.in.h:384
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:385
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:386
+msgid "Russia"
+msgstr "Rusia"
+
+#: ../rules/base.xml.in.h:387
+msgid "Russian"
+msgstr "Ruso"
+
+#: ../rules/base.xml.in.h:388
+msgid "Russian phonetic"
+msgstr "Ruso fonético"
+
+#: ../rules/base.xml.in.h:389
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Ruso fonético, eliminar teclas muertas"
+
+#: ../rules/base.xml.in.h:390
+msgid "Russian with Kazakh"
+msgstr "Ruso con kazajo"
+
+#: ../rules/base.xml.in.h:391
+msgid "SCG"
+msgstr "SCG"
+
+#: ../rules/base.xml.in.h:392
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:393
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:394
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:395
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:396
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:397
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:398
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:399
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:400
+msgid "ScrollLock LED shows alternative group."
+msgstr "El led de BloqDespl muestra el grupo alternativo."
+
+#: ../rules/base.xml.in.h:401
+msgid "Serbia and Montenegro"
+msgstr "Serbia y Montenegro"
+
+#: ../rules/base.xml.in.h:402
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Mayús con las teclas del teclado numérico funcionan como en MS Windows."
+
+#: ../rules/base.xml.in.h:403
+msgid "Shift+CapsLock changes group."
+msgstr "Mayús+BloqMayús cambia el grupo."
+
+#: ../rules/base.xml.in.h:404
+msgid "Slovakia"
+msgstr "Eslovaquia"
+
+#: ../rules/base.xml.in.h:405
+msgid "Slovenia"
+msgstr "Eslovenia"
+
+#: ../rules/base.xml.in.h:406
+msgid "South Africa"
+msgstr "Sudáfrica"
+
+#: ../rules/base.xml.in.h:407
+msgid "Southern Uzbek"
+msgstr "Uzbequia del sur"
+
+#: ../rules/base.xml.in.h:408
+msgid "Spain"
+msgstr "España"
+
+#: ../rules/base.xml.in.h:409
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Teclas especiales (Ctrl+Alt+«tecla») manipuladas en un servidor."
+
+#: ../rules/base.xml.in.h:410
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:411
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../rules/base.xml.in.h:412
+msgid "Standard"
+msgstr "Estándar"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:414
+msgid "Standard RSTU"
+msgstr "Standard RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:416
+msgid "Standard RSTU on Russian layout"
+msgstr "Standard RSTU con distribución rusa"
+
+#: ../rules/base.xml.in.h:417
+msgid "Sun dead keys"
+msgstr "Teclas muertas de Sun"
+
+#: ../rules/base.xml.in.h:418
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:419
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "Super está mapeada a las teclas Windows (predeterminado)"
+
+#: ../rules/base.xml.in.h:420
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:421
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:422
+msgid "Swap Ctrl and CapsLock."
+msgstr "Intercambiar Ctrl y BloqMayús"
+
+#: ../rules/base.xml.in.h:423
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:424
+msgid "Sweden"
+msgstr "Suecia"
+
+#: ../rules/base.xml.in.h:425
+msgid "Switzerland"
+msgstr "Suiza"
+
+#: ../rules/base.xml.in.h:426
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:427
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:428
+msgid "Syria"
+msgstr "Siria"
+
+#: ../rules/base.xml.in.h:429
+msgid "Syriac"
+msgstr "Sirio"
+
+#: ../rules/base.xml.in.h:430
+msgid "Syriac phonetic"
+msgstr "Sirio fonético"
+
+#: ../rules/base.xml.in.h:431
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:432
+msgid "Tajikistan"
+msgstr "Tajikistán"
+
+#: ../rules/base.xml.in.h:433
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../rules/base.xml.in.h:434
+msgid "Tamil TAB Typewriter"
+msgstr "Tamil TAB Typewriter"
+
+#: ../rules/base.xml.in.h:435
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamil TSCII Typewriter"
+
+#: ../rules/base.xml.in.h:436
+msgid "Tamil Unicode"
+msgstr "Tamil Unicode"
+
+#: ../rules/base.xml.in.h:437
+msgid "Tatar"
+msgstr "Tatar"
+
+#: ../rules/base.xml.in.h:438
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../rules/base.xml.in.h:439
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:440
+msgid "Thailand"
+msgstr "Tailandia"
+
+#: ../rules/base.xml.in.h:441
+msgid "Third level choosers"
+msgstr "Selectores de tercer nivel"
+
+#: ../rules/base.xml.in.h:442
+msgid "Tilde (~) variant"
+msgstr "Variante virgulilla (~)"
+
+#: ../rules/base.xml.in.h:443
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:444
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:445
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:446
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:447
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:448
+msgid "Turkey"
+msgstr "Turquía"
+
+#: ../rules/base.xml.in.h:449
+msgid "Typewriter"
+msgstr "Máquina de escribir"
+
+#: ../rules/base.xml.in.h:450
+msgid "U.S. English"
+msgstr "Inglés EEUU"
+
+#: ../rules/base.xml.in.h:451
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Teclado EEUU con digrafos bosnios"
+
+#: ../rules/base.xml.in.h:452
+msgid "US keyboard with Bosnian letters"
+msgstr "Teclado EEUU con letras bosnias"
+
+#: ../rules/base.xml.in.h:453
+msgid "US keyboard with Croatian digraphs"
+msgstr "Teclado EEUU con digrafos croatas"
+
+#: ../rules/base.xml.in.h:454
+msgid "US keyboard with Croatian letters"
+msgstr "Teclado EEUU con letras croatas"
+
+#: ../rules/base.xml.in.h:455
+msgid "US keyboard with Lithuanian letters"
+msgstr "Teclado EEUU con letras lituanas"
+
+#: ../rules/base.xml.in.h:456
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Teclado EEUU con digrafos eslovenos"
+
+#: ../rules/base.xml.in.h:457
+msgid "US keyboard with Slovenian letters"
+msgstr "Teclado EEUU con letras eslovenas"
+
+#: ../rules/base.xml.in.h:458
+msgid "USA"
+msgstr "EEUU"
+
+#: ../rules/base.xml.in.h:459
+msgid "Ukr"
+msgstr "Ucr"
+
+#: ../rules/base.xml.in.h:460
+msgid "Ukraine"
+msgstr "Ucrania"
+
+#: ../rules/base.xml.in.h:461
+msgid "UnicodeExpert"
+msgstr "UnicodeExperto"
+
+#: ../rules/base.xml.in.h:462
+msgid "United Kingdom"
+msgstr "Reino Unido"
+
+#: ../rules/base.xml.in.h:463
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../rules/base.xml.in.h:464
+msgid "Use Bosnian digraphs"
+msgstr "Usar digrafos bosnios"
+
+#: ../rules/base.xml.in.h:465
+msgid "Use Croatian digraphs"
+msgstr "Usar digrafos croatas"
+
+#: ../rules/base.xml.in.h:466
+msgid "Use Slovenian digraphs"
+msgstr "Usar digrafos eslovenos"
+
+#: ../rules/base.xml.in.h:467
+msgid "Use guillemots for quotes"
+msgstr "Usar guillemots para comillas"
+
+#: ../rules/base.xml.in.h:468
+msgid "Use keyboard LED to show alternative group."
+msgstr "Usar LED del teclado para mostrar el grupo alternativo."
+
+#: ../rules/base.xml.in.h:469
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:470
+msgid "Uzbekistan"
+msgstr "Uzbekistán"
+
+#: ../rules/base.xml.in.h:471
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../rules/base.xml.in.h:472
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:473
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:474
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:475
+msgid "Winkeys"
+msgstr "Teclas Windows"
+
+#: ../rules/base.xml.in.h:476
+msgid "With &lt;\\|&gt; key"
+msgstr "With tecla «\\|»"
+
+#: ../rules/base.xml.in.h:477
+msgid "With guillemots"
+msgstr "Con guillemots"
+
+#: ../rules/base.xml.in.h:478
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:479
+msgid "Z and ZHE swapped"
+msgstr "Z y ZHE intercambiados"
+
+#: ../rules/base.xml.in.h:480
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:481
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:482
+msgid "azerty/digits"
+msgstr "azerty/dígitos"
+
+#: ../rules/base.xml.in.h:483
+msgid "digits"
+msgstr "dígitos"
+
+#: ../rules/base.xml.in.h:484
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:485
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:486
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, contrabarra extendida"
+
+#: ../rules/base.xml.in.h:487
+msgid "qwerty/digits"
+msgstr "qwerty/dígitos"
+
+#: ../rules/base.xml.in.h:488
+msgid "qwertz"
+msgstr "qwertz"
+
diff --git a/xorg-server/xkbdata.src/po/fi.po b/xorg-server/xkbdata.src/po/fi.po
new file mode 100644
index 000000000..13f9679f2
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/fi.po
@@ -0,0 +1,2723 @@
+# Finnish translations for xkeyboard-config package.
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+# Tommi Vainikainen <Tommi.Vainikainen@iki.fi>, 2005, 2007.
+# Ilkka Tuohela <hile@iki.fi>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.1-pre1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-11 22:14+0100\n"
+"PO-Revision-Date: 2007-09-13 20:04+0300\n"
+"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
+"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(Perinteinen) vaihtoehtoinen"
+
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Perinteinen) vaihtoehtoinen, Sunin kuolleet näppäimet"
+
+#: ../rules/base.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Perinteinen) vaihtoehtoinen, ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:5
+msgid "(Legacy) Dvorak"
+msgstr "(Perinteinen) dvorak"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/104 key Compatible"
+msgstr "101/104-näppäiminen tai yhteensopiva"
+
+#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/pilkku/Kuolleet näppäimet"
+
+#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/pilkku/Ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/piste/Kuolleet näppäimet"
+
+#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/piste/Ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/pilkku/Kuolleet näppäimet"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/pilkku/Ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/piste/Kuolleet näppäimet"
+
+#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/piste/Ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/pilkku/Kuolleet näppäimet"
+
+#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/pilkku/Ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/piste/Kuolleet näppäimet"
+
+#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/piste/Ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/pilkku/Kuolleet näppäimet"
+
+#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/pilkku/Ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/piste/Kuolleet näppäimet"
+
+#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/piste/Ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:23
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:24
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:25
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech-langaton työpöytänäppäimistö RFKB-23"
+
+#: ../rules/base.xml.in.h:26
+msgid "ACPI Standard"
+msgstr "ACPI-standardi"
+
+#: ../rules/base.xml.in.h:27
+msgid "AZERTY Tskapo"
+msgstr "AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:28
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:29
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:30
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:31
+msgid "Acer Laptop"
+msgstr "Acer-kannettava"
+
+#: ../rules/base.xml.in.h:32
+msgid "Add the EuroSign to the 2 key."
+msgstr "Lisää euro-merkki 2-näppäimeen."
+
+#: ../rules/base.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "Lisää euro-merkki 5-näppäimeen."
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "Lisää euro-merkki E-näppäimeen."
+
+#: ../rules/base.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "Lisää standardi toiminta valikkonäppäimeen."
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Euro-merkin lisäys haluttuun näppäimeen"
+
+#: ../rules/base.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38
+msgid "Afg"
+msgstr "Afg"
+
+#: ../rules/base.xml.in.h:39
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+#: ../rules/base.xml.in.h:40
+msgid "Akan"
+msgstr "Akan"
+
+#: ../rules/base.xml.in.h:41
+msgid "Alb"
+msgstr "Alb"
+
+#: ../rules/base.xml.in.h:42
+msgid "Albania"
+msgstr "Albania"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt ja Meta ovat Alt-näppäimissä."
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt tulee oikeasta Win-näppäimestä ja Super valikkonäppäimestä."
+
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Alt+CapsLock vaihtaa asettelua."
+
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+Ctrl vaihtaa asettelua."
+
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Alt+Shift vaihtaa asettelua."
+
+#: ../rules/base.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Alt- ja Win-näppäinten toiminta"
+
+#: ../rules/base.xml.in.h:50
+msgid "Alternative"
+msgstr "Vaihtoehtoinen"
+
+#: ../rules/base.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "Vaihtoehtoinen itäinen"
+
+#: ../rules/base.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "Vaihtoehtoinen foneettinen"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "Vaihtoehtoinen kansainvälinen (aiempi us_intl)"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "Vaihtoehtoinen, Sunin kuolleet näppäimet"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "Vaihtoehtoinen, ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "Vaihtoehtoinen, vain latin-9"
+
+#: ../rules/base.xml.in.h:57
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:58
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../rules/base.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "Heittomerkkimuunnos (')"
+
+#: ../rules/base.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Apple-kannettava"
+
+#: ../rules/base.xml.in.h:62
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:63
+msgid "Arabic"
+msgstr "Arabia"
+
+#: ../rules/base.xml.in.h:64
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:65
+msgid "Armenia"
+msgstr "Armenia"
+
+#: ../rules/base.xml.in.h:66
+msgid "Asus Laptop"
+msgstr "Asus-kannettava"
+
+#: ../rules/base.xml.in.h:67
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:68
+msgid "Azerbaijan"
+msgstr "Azerbaidzan"
+
+#: ../rules/base.xml.in.h:69
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 -langaton Internet-näppäimistö"
+
+#: ../rules/base.xml.in.h:70
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:71
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:72
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:73
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:74
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:75
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:76
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:77
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:78
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: ../rules/base.xml.in.h:79 ../rules/sun.xml.in.h:22
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:80
+msgid "Belarus"
+msgstr "Valko-Venäjä"
+
+#: ../rules/base.xml.in.h:81
+msgid "Belgium"
+msgstr "Belgia"
+
+#: ../rules/base.xml.in.h:82
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:83
+msgid "Bengali"
+msgstr "Bengali"
+
+#: ../rules/base.xml.in.h:84
+msgid "Bengali Probhat"
+msgstr "Bengali probhat"
+
+#: ../rules/base.xml.in.h:85
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonominen, Dvorak-tavalla"
+
+#: ../rules/base.xml.in.h:86
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonominen, Dvorak-tavalla, pelkkä latin-9"
+
+#: ../rules/base.xml.in.h:87 ../rules/sun.xml.in.h:24
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:88
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: ../rules/base.xml.in.h:90
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Raamatullinen Heprea (Tiro)"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:92
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:93
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnia-Hertsegovina"
+
+#: ../rules/base.xml.in.h:94
+msgid "Both Alt keys together change layout."
+msgstr "Molemmat Alt-näppäimet yhdessä vaihtavat asettelua."
+
+#: ../rules/base.xml.in.h:95
+msgid "Both Ctrl keys together change layout."
+msgstr "Molemmat Ctrl-näppäimet yhdessä vaihtavat asettelua."
+
+#: ../rules/base.xml.in.h:96
+msgid "Both Shift keys together change layout."
+msgstr "Molemmat Shift-näppäimet yhdessä vaihtavat asettelua."
+
+#: ../rules/base.xml.in.h:97
+msgid "Both Win-keys switch layout while pressed."
+msgstr "Molemmat Win-näppäimet vaihtavat asettelua painettaessa."
+
+#: ../rules/base.xml.in.h:98
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:99
+msgid "Braille"
+msgstr "Braille"
+
+#: ../rules/base.xml.in.h:100
+msgid "Brazil"
+msgstr "Brasilia"
+
+#: ../rules/base.xml.in.h:101
+msgid "Brazilian ABNT2"
+msgstr "Brasilialainen ABNT2"
+
+#: ../rules/base.xml.in.h:102
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:103
+msgid "Brother Internet Keyboard"
+msgstr "Brother-Internet-näppäimistö"
+
+#: ../rules/base.xml.in.h:104
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:105
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+#: ../rules/base.xml.in.h:106
+msgid "Cambodia"
+msgstr "Kambodža"
+
+#: ../rules/base.xml.in.h:107 ../rules/sun.xml.in.h:29
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:108
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rules/base.xml.in.h:109
+msgid "Caps Lock is Compose."
+msgstr "Caps Lock on Compose."
+
+#: ../rules/base.xml.in.h:110
+msgid "CapsLock LED shows alternative layout."
+msgstr "CapsLock-ledi näyttää vaihtoehtoista asettelua."
+
+#: ../rules/base.xml.in.h:111
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "CapsLock toimii lukitsevana Shiftinä. Shift kumoaa CapsLockin."
+
+#: ../rules/base.xml.in.h:112
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "CapsLock toimii lukitsevana Shiftinä. Shift ei kumoa CapsLockia."
+
+#: ../rules/base.xml.in.h:113
+msgid "CapsLock just locks the Shift modifier."
+msgstr "CapsLock vain lukitsee Shift-muunnoksen."
+
+#: ../rules/base.xml.in.h:114 ../rules/sun.xml.in.h:33
+msgid "CapsLock key behavior"
+msgstr "CapsLock-näppäimen toiminta"
+
+#: ../rules/base.xml.in.h:115
+msgid "CapsLock key changes layout."
+msgstr "CapsLock-näppäin vaihtaa asettelua."
+
+#: ../rules/base.xml.in.h:116
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "CapsLock vaihtaa Shiftiä vaikuttaen kaikkiin näppäimiin."
+
+#: ../rules/base.xml.in.h:117
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "CapsLock vaihtaa normaalin suuraakkostuksen aakkosille."
+
+#: ../rules/base.xml.in.h:118
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "CapsLock käyttää sisäistä suuraakkostusta. Shift peruu CapsLockin."
+
+#: ../rules/base.xml.in.h:119
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "CapsLock käyttää sisäistä suuraakkostusta. Shift ei peru CapsLockia."
+
+#: ../rules/base.xml.in.h:120
+msgid "Catalan variant with middle-dot L"
+msgstr "Katalaani-vaihtoehto keskipilkullisella L-kirjaimella"
+
+#: ../rules/base.xml.in.h:121
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:122
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:123
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (vaihtoehtoinen valinta)"
+
+#: ../rules/base.xml.in.h:124
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:125
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:126
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:127
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony-Internet-näppäimistö"
+
+#: ../rules/base.xml.in.h:128
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:129
+msgid "China"
+msgstr "Kiina"
+
+#: ../rules/base.xml.in.h:130
+msgid "Chuvash"
+msgstr "Chuvash"
+
+#: ../rules/base.xml.in.h:131
+msgid "Chuvash Latin"
+msgstr "Chuvash latinalainen"
+
+#: ../rules/base.xml.in.h:132
+msgid "Classic Dvorak"
+msgstr "Perinteinen dvorak"
+
+#: ../rules/base.xml.in.h:133
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:134
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:135
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:136
+msgid "Commabelow"
+msgstr "Commabelow"
+
+#: ../rules/base.xml.in.h:137
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access -näppäimistö"
+
+#: ../rules/base.xml.in.h:138
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq-Internet-näppäimistö (13 näppäintä)"
+
+#: ../rules/base.xml.in.h:139
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq-Internet-näppäimistö (18 näppäintä)"
+
+#: ../rules/base.xml.in.h:140
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq-Internet-näppäimistö (7 näppäintä)"
+
+#: ../rules/base.xml.in.h:141
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq-näppäimistö"
+
+#: ../rules/base.xml.in.h:142
+msgid "Compose key position"
+msgstr "Compose-näppäimen sijainti"
+
+#: ../rules/base.xml.in.h:143
+msgid "Congo, Democratic Republic of the"
+msgstr "Kongon tasavalta"
+
+#: ../rules/base.xml.in.h:144
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "Contol on liitetty Win-näppäimiin (ja Control-näppäimiin)."
+
+#: ../rules/base.xml.in.h:145
+msgid "Croatia"
+msgstr "Kroatia"
+
+#: ../rules/base.xml.in.h:146
+msgid "Ctrl key at bottom left"
+msgstr "Ctrl-näppäin alhaalla vasemmalla"
+
+#: ../rules/base.xml.in.h:147
+msgid "Ctrl key at left of 'A'"
+msgstr "Ctrl-näppäin \"A\"-näppäimestä vasemmalla"
+
+#: ../rules/base.xml.in.h:148
+msgid "Ctrl key position"
+msgstr "Ctrl-näppäimen sijainti"
+
+#: ../rules/base.xml.in.h:149
+msgid "Ctrl+Shift change layout."
+msgstr "Ctrl+Shift vaihtaa asettelua."
+
+#: ../rules/base.xml.in.h:150
+msgid "Cyrillic"
+msgstr "Kyrillinen"
+
+#: ../rules/base.xml.in.h:151 ../rules/sun.xml.in.h:39
+msgid "Cze"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:152
+msgid "Czechia"
+msgstr "TÅ¡ekki"
+
+#: ../rules/base.xml.in.h:153
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:154
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:155 ../rules/sun.xml.in.h:42
+msgid "Dead acute"
+msgstr "Kuollut akuutti"
+
+#: ../rules/base.xml.in.h:156 ../rules/sun.xml.in.h:43
+msgid "Dead grave acute"
+msgstr "Kuollut gravis"
+
+#: ../rules/base.xml.in.h:157
+msgid "Default numeric keypad keys."
+msgstr "Oletussormionäppäimet."
+
+#: ../rules/base.xml.in.h:158
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:159
+msgid "Dell 101-key PC"
+msgstr "Dell 101-näppäiminen PC"
+
+#: ../rules/base.xml.in.h:160
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Kannettava Dell Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:161
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Kannettava Dell Precision M -sarja"
+
+#: ../rules/base.xml.in.h:162
+msgid "Dell Latitude series laptop"
+msgstr "Kannettava Dell Latitude-sarja"
+
+#: ../rules/base.xml.in.h:163
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:164
+msgid "Dell USB Multimedia Keybard"
+msgstr "Dell USB -multimedianäppäimistö"
+
+#: ../rules/base.xml.in.h:165
+msgid "Denmark"
+msgstr "Tanska"
+
+#: ../rules/base.xml.in.h:166 ../rules/sun.xml.in.h:44
+msgid "Deu"
+msgstr "Deu"
+
+#: ../rules/base.xml.in.h:167
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa-langaton työpöytänäppäimistö"
+
+#: ../rules/base.xml.in.h:168
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801/9802-sarja"
+
+#: ../rules/base.xml.in.h:169 ../rules/sun.xml.in.h:46
+msgid "Dnk"
+msgstr "Dnk"
+
+#: ../rules/base.xml.in.h:170 ../rules/sun.xml.in.h:48
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:171
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak, puolalaiset lainausmerkit \"1/!\"-näppäimistä"
+
+#: ../rules/base.xml.in.h:172
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, puolalaiset lainausmerkit lainausmerkkinäppäimestä"
+
+#: ../rules/base.xml.in.h:173
+msgid "Eastern"
+msgstr "Itäinen"
+
+#: ../rules/base.xml.in.h:174 ../rules/sun.xml.in.h:49
+msgid "Eliminate dead keys"
+msgstr "Ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:175
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:176
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:177
+msgid "Ergonomic"
+msgstr "ergonominen"
+
+#: ../rules/base.xml.in.h:178 ../rules/sun.xml.in.h:50
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:179
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:180
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:181
+msgid "Estonia"
+msgstr "Viro"
+
+#: ../rules/base.xml.in.h:182
+msgid "Eth"
+msgstr "Eth"
+
+#: ../rules/base.xml.in.h:183
+msgid "Ethiopia"
+msgstr "Etiopia"
+
+#: ../rules/base.xml.in.h:184
+msgid "Evdev-managed keyboard"
+msgstr "Evdev-hallittu näppäimistö"
+
+#: ../rules/base.xml.in.h:185
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:186
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:187
+msgid "Extended"
+msgstr "Laajennettu"
+
+#: ../rules/base.xml.in.h:188
+msgid "Extended Backslash"
+msgstr "Laajennettu kenoviiva"
+
+#: ../rules/base.xml.in.h:189
+msgid "F-letter (F) variant"
+msgstr "F-kirjainmuunnos (F)"
+
+#: ../rules/base.xml.in.h:190
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:191
+msgid "Faroe Islands"
+msgstr "Färsaaret"
+
+#: ../rules/base.xml.in.h:192 ../rules/sun.xml.in.h:51
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:193
+msgid "Finland"
+msgstr "Suomi"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:196
+msgid "Four-level key with abstract separators"
+msgstr ""
+
+#: ../rules/base.xml.in.h:197
+msgid "Four-level key with comma"
+msgstr ""
+
+#: ../rules/base.xml.in.h:198
+msgid "Four-level key with dot"
+msgstr ""
+
+#: ../rules/base.xml.in.h:199
+msgid "Four-level key with momayyez"
+msgstr ""
+
+#: ../rules/base.xml.in.h:200 ../rules/sun.xml.in.h:53
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:201
+msgid "France"
+msgstr "Ranska"
+
+#: ../rules/base.xml.in.h:202 ../rules/sun.xml.in.h:55
+msgid "French"
+msgstr "Ranskalainen"
+
+#: ../rules/base.xml.in.h:203
+msgid "French (Macintosh)"
+msgstr "Ranskalainen (Macintosh)"
+
+#: ../rules/base.xml.in.h:204 ../rules/sun.xml.in.h:56
+msgid "French (legacy)"
+msgstr "Ranskalainen (vanha)"
+
+#: ../rules/base.xml.in.h:205
+msgid "French Dvorak"
+msgstr "Ranskalainen dvorak"
+
+#: ../rules/base.xml.in.h:206
+msgid "French, Sun dead keys"
+msgstr "Ranskalainen, Sunin kuolleet näppäimet"
+
+#: ../rules/base.xml.in.h:207
+msgid "French, eliminate dead keys"
+msgstr "Ranskalainen, ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:208
+msgid "Fula"
+msgstr "Fula"
+
+#: ../rules/base.xml.in.h:209
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:210
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:211
+msgid "Generic 101-key PC"
+msgstr "Yleinen 101-näppäiminen PC"
+
+#: ../rules/base.xml.in.h:212
+msgid "Generic 102-key (Intl) PC"
+msgstr "Yleinen 102-näppäiminen (kansainvälinen) PC"
+
+#: ../rules/base.xml.in.h:213
+msgid "Generic 104-key PC"
+msgstr "Yleinen 104-näppäiminen PC"
+
+#: ../rules/base.xml.in.h:214
+msgid "Generic 105-key (Intl) PC"
+msgstr "Yleinen 105-näppäiminen (kansainvälinen) PC"
+
+#: ../rules/base.xml.in.h:215
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-21e"
+
+#: ../rules/base.xml.in.h:216
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM-näppäimistö KWD-910"
+
+#: ../rules/base.xml.in.h:217
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-rulla"
+
+#: ../rules/base.xml.in.h:218
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:219
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:220
+msgid "Georgia"
+msgstr "Georgia"
+
+#: ../rules/base.xml.in.h:221
+msgid "Georgian"
+msgstr "Georgia"
+
+#: ../rules/base.xml.in.h:222
+msgid "German (Macintosh)"
+msgstr "Saksalainen (Macintosh)"
+
+#: ../rules/base.xml.in.h:223
+msgid "German, Sun dead keys"
+msgstr "Saksalainen, Sunin kuolleet näppäimet"
+
+#: ../rules/base.xml.in.h:224
+msgid "German, eliminate dead keys"
+msgstr "Saksalainen, ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:225
+msgid "Germany"
+msgstr "Saksa"
+
+#: ../rules/base.xml.in.h:226
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:227
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../rules/base.xml.in.h:228
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:229
+msgid "Greece"
+msgstr "Kreikka"
+
+#: ../rules/base.xml.in.h:230
+msgid "Gui"
+msgstr "Gui"
+
+#: ../rules/base.xml.in.h:231
+msgid "Guinea"
+msgstr "Guinea"
+
+#: ../rules/base.xml.in.h:232
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../rules/base.xml.in.h:233
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+# Lienee merkki
+#: ../rules/base.xml.in.h:234
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:235
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking -näppäimistö"
+
+#: ../rules/base.xml.in.h:236
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking -näppäimistö, Mac-versio"
+
+#: ../rules/base.xml.in.h:237
+msgid "Hausa"
+msgstr "Hausa"
+
+#: ../rules/base.xml.in.h:238
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard-Internet-näppäimistö"
+
+#: ../rules/base.xml.in.h:239
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:240
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:241
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:242
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:243
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:244
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:245
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:246
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501-multimedianäppäimistö"
+
+#: ../rules/base.xml.in.h:247
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505-Internet-näppäimistö"
+
+#: ../rules/base.xml.in.h:248
+msgid "Hindi Bolnagri"
+msgstr "Hindi Bolnagri"
+
+#: ../rules/base.xml.in.h:249
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:250
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:251 ../rules/sun.xml.in.h:59
+msgid "Hun"
+msgstr "Hun"
+
+#: ../rules/base.xml.in.h:252
+msgid "Hungary"
+msgstr "Unkari"
+
+#: ../rules/base.xml.in.h:253
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper tulee Win-näppäimistä."
+
+#: ../rules/base.xml.in.h:254
+msgid "IBM (LST 1205-92)"
+msgstr "IMB (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:255
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:256
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:257
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (vaihtoehtoinen)"
+
+#: ../rules/base.xml.in.h:258
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:259
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, kansainvälinen"
+
+#: ../rules/base.xml.in.h:260 ../rules/sun.xml.in.h:61
+msgid "ISO Alternate"
+msgstr "ISO vaihtoehtoinen"
+
+#: ../rules/base.xml.in.h:261
+msgid "Iceland"
+msgstr "Islanti"
+
+#: ../rules/base.xml.in.h:262
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:263
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:264
+msgid "India"
+msgstr "Intia"
+
+#: ../rules/base.xml.in.h:265
+msgid "International (AltGr dead keys)"
+msgstr "Kansainvälinen (AltGr -kuolleet näppäimet)"
+
+#: ../rules/base.xml.in.h:266 ../rules/sun.xml.in.h:62
+msgid "International (with dead keys)"
+msgstr "Kansainvälinen (ilman kuolleita näppäimiä)"
+
+#: ../rules/base.xml.in.h:267
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: ../rules/base.xml.in.h:268
+msgid "Iran"
+msgstr "Iran"
+
+#: ../rules/base.xml.in.h:269
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../rules/base.xml.in.h:270
+msgid "Ireland"
+msgstr "Irlanti"
+
+#: ../rules/base.xml.in.h:271
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:272
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:273
+msgid "Irq"
+msgstr "Irq"
+
+#: ../rules/base.xml.in.h:274
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:275
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:276
+msgid "Israel"
+msgstr "Israel"
+
+#: ../rules/base.xml.in.h:277 ../rules/sun.xml.in.h:63
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:278
+msgid "Italy"
+msgstr "Italia"
+
+#: ../rules/base.xml.in.h:279
+msgid "Japan"
+msgstr "Japani"
+
+#: ../rules/base.xml.in.h:280
+msgid "Japan (PC-98xx Series)"
+msgstr "Japani (PC-98xx-sarja)"
+
+#: ../rules/base.xml.in.h:281
+msgid "Japanese 106-key"
+msgstr "Japanilainen 106-näppäiminen"
+
+#: ../rules/base.xml.in.h:282
+msgid "Japanese keyboard options"
+msgstr "japanilaisen näppäimistön valinnat"
+
+#: ../rules/base.xml.in.h:283 ../rules/sun.xml.in.h:66
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:284
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:285
+msgid "Kana Lock key is locking"
+msgstr "Kana, lukitusnäppäin lukitseva"
+
+#: ../rules/base.xml.in.h:286
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../rules/base.xml.in.h:287
+msgid "Kashubian"
+msgstr "Kashubia"
+
+#: ../rules/base.xml.in.h:288
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:289
+msgid "Kazakh with Russian"
+msgstr "Kazakstan venäjän kanssa"
+
+#: ../rules/base.xml.in.h:290
+msgid "Kazakhstan"
+msgstr "Kazakstan"
+
+#: ../rules/base.xml.in.h:291
+msgid "Keypad"
+msgstr "Sormio"
+
+#: ../rules/base.xml.in.h:292
+msgid "Keypad with unicode additions (arrows and math operators)"
+msgstr "Sormio unicode-lisäosilla (nuolet ja matematiikkatoiminnot)"
+
+#: ../rules/base.xml.in.h:293
+msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Sormio unicode-lisäosilla (nuolet ja matematiikkatoiminnot). Matematiikkatoiminnot oletustasolla."
+
+#: ../rules/base.xml.in.h:294
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:295
+msgid "Khm"
+msgstr "Khm"
+
+#: ../rules/base.xml.in.h:296
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:297
+msgid "Korea, Republic of"
+msgstr "Etelä-Korea"
+
+#: ../rules/base.xml.in.h:298
+msgid "Korean 106-key"
+msgstr "Korealainen 106-näppäiminen"
+
+#: ../rules/base.xml.in.h:299
+msgid "Kotoistus"
+msgstr "Kotoistus"
+
+#: ../rules/base.xml.in.h:300
+msgid "Kurdish, (F)"
+msgstr "Kurdi, (F)"
+
+#: ../rules/base.xml.in.h:301
+msgid "Kurdish, Arabic-Latin"
+msgstr "Kurdi, arabia-latinalainen"
+
+#: ../rules/base.xml.in.h:302
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Kurdi, latinalainen Alt-Q"
+
+#: ../rules/base.xml.in.h:303
+msgid "Kurdish, Latin Q"
+msgstr "Kurdi, latinalainen Q"
+
+#: ../rules/base.xml.in.h:304
+msgid "Kyr"
+msgstr "Kyr"
+
+#: ../rules/base.xml.in.h:305
+msgid "Kyrgyzstan"
+msgstr "Kirgisia"
+
+#: ../rules/base.xml.in.h:306
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:307
+msgid "LCtrl+LShift change layout."
+msgstr "LCtrl+LShift vaihtaa ryhmää"
+
+#: ../rules/base.xml.in.h:308
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:309
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:310
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Kannettava Compaq (esim. Armada) kannettavan näppäimistö "
+
+#: ../rules/base.xml.in.h:311
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Kannettava Compaq (esim. Armada) Internet-näppäimistö "
+
+#: ../rules/base.xml.in.h:312
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Kannettava eMachines m68xx"
+
+#: ../rules/base.xml.in.h:313
+msgid "Latin"
+msgstr "Latinalainen"
+
+#: ../rules/base.xml.in.h:314
+msgid "Latin American"
+msgstr "Latinalainen amerikka"
+
+#: ../rules/base.xml.in.h:315
+msgid "Latin Unicode"
+msgstr "Latinalainen Unicode"
+
+#: ../rules/base.xml.in.h:316
+msgid "Latin Unicode qwerty"
+msgstr "Latinalainen Unicode-qwerty"
+
+#: ../rules/base.xml.in.h:317
+msgid "Latin qwerty"
+msgstr "Latinalainen qwerty"
+
+#: ../rules/base.xml.in.h:318
+msgid "Latin with guillemets"
+msgstr "Latinalainen guillemot-lainausmerkeillä"
+
+#: ../rules/base.xml.in.h:319
+msgid "Latvia"
+msgstr "Latvia"
+
+#: ../rules/base.xml.in.h:320
+msgid "Layout switching"
+msgstr "Asettelun vaihto"
+
+#: ../rules/base.xml.in.h:321
+msgid "Left Alt is swapped with left Win-key."
+msgstr "Vaihda vasen Alt-näppän vasemman Win-näppäimen kanssa."
+
+#: ../rules/base.xml.in.h:322
+msgid "Left Alt key changes layout."
+msgstr "Vasen Alt-näppäin vaihtaa asettelua."
+
+#: ../rules/base.xml.in.h:323
+msgid "Left Alt key switches layout while pressed."
+msgstr "Vasen Alt-näppäin vaihtaa asettelua painettaessa."
+
+#: ../rules/base.xml.in.h:324
+msgid "Left Ctrl key changes layout."
+msgstr "Vasen Ctrl-näppäin vaihtaa asettelua."
+
+#: ../rules/base.xml.in.h:325
+msgid "Left Shift key changes layout."
+msgstr "Vasen Shift-näppäin vaihtaa asettelua."
+
+#: ../rules/base.xml.in.h:326
+msgid "Left Win-key changes layout."
+msgstr "Vasen Win-näppäin vaihtaa asettelua."
+
+#: ../rules/base.xml.in.h:327
+msgid "Left Win-key is Compose."
+msgstr "Vasen Win-näppäin on Compose."
+
+#: ../rules/base.xml.in.h:328
+msgid "Left Win-key switches layout while pressed."
+msgstr "Vasen Win-näppäin vaihtaa asettelua painettaessa."
+
+#: ../rules/base.xml.in.h:329
+msgid "Left hand"
+msgstr "Vasenkätinen"
+
+#: ../rules/base.xml.in.h:330
+msgid "Left handed Dvorak"
+msgstr "Vasenkätinen dvorak"
+
+#: ../rules/base.xml.in.h:331
+msgid "Legacy Wang 724 keypad"
+msgstr "Perinteinen Wang 724 -sormio"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:333
+msgid "Legacy key with comma"
+msgstr ""
+
+#: ../rules/base.xml.in.h:334
+msgid "Legacy key with dot"
+msgstr ""
+
+#: ../rules/base.xml.in.h:335
+msgid "Legacy keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:336
+msgid "Lithuania"
+msgstr "Liettua"
+
+#: ../rules/base.xml.in.h:337
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:338
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:339
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (vaihtoehtoinen)"
+
+#: ../rules/base.xml.in.h:340
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:341
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:342
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:343
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (vaihtoehtoinen2)"
+
+#: ../rules/base.xml.in.h:344
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:345
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 -lisänäppäimet G15daemon-ohjelmasta"
+
+#: ../rules/base.xml.in.h:346
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:347
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:348
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X-näppäimistö"
+
+#: ../rules/base.xml.in.h:349
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo-näppäimistö"
+
+#: ../rules/base.xml.in.h:350
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:351
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (malli Y-RB6)"
+
+#: ../rules/base.xml.in.h:352
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:353
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+#: ../rules/base.xml.in.h:354
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:355
+msgid "Lva"
+msgstr "Lva"
+
+#: ../rules/base.xml.in.h:356
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:357
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:358
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (kansainvälinen)"
+
+#: ../rules/base.xml.in.h:359
+msgid "Macedonia"
+msgstr "Makedonia"
+
+#: ../rules/base.xml.in.h:360
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:361
+msgid "Macintosh Old"
+msgstr "Macintosh vanha"
+
+#: ../rules/base.xml.in.h:362
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, Sunin kuolleet näppäimet"
+
+#: ../rules/base.xml.in.h:363
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:364
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Tee CapsLockista ylimääräinen Ctrl."
+
+#: ../rules/base.xml.in.h:365
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:366
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../rules/base.xml.in.h:367
+msgid "Maldives"
+msgstr "Malediivit"
+
+#: ../rules/base.xml.in.h:368
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:369
+msgid "Maltese keyboard with US layout"
+msgstr "Maltalainen näppäimistö US-asettelulla"
+
+#: ../rules/base.xml.in.h:370
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:371
+msgid "Maori"
+msgstr "Maori"
+
+#: ../rules/base.xml.in.h:372
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:373
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access-näppäimistö"
+
+#: ../rules/base.xml.in.h:374
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:375
+msgid "Menu is Compose."
+msgstr "Valikko on Compose."
+
+#: ../rules/base.xml.in.h:376
+msgid "Menu key changes layout."
+msgstr "Valikkonäppäin vaihtaa asettelua."
+
+#: ../rules/base.xml.in.h:377
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta tulee Win-näppäimistä."
+
+#: ../rules/base.xml.in.h:378
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta tulee vasemmasta Win-näppäimestä."
+
+#: ../rules/base.xml.in.h:379
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft-Internet-näppäimistö"
+
+#: ../rules/base.xml.in.h:380
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft-Internet-näppäimistö Pro, ruotsalainen"
+
+#: ../rules/base.xml.in.h:381
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:382
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural-näppäimistö Pro / Microsoft-Internet-näppäimistö Pro"
+
+#: ../rules/base.xml.in.h:383
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural-näppäimistö Pro OEM"
+
+#: ../rules/base.xml.in.h:384
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural-näppäimistö Pro USB / Microsoft-Internet-näppäimistö Pro"
+
+#: ../rules/base.xml.in.h:385
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office-näppäimistö"
+
+#: ../rules/base.xml.in.h:386
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft-langaton multimedianäppämistö 1.0A"
+
+#: ../rules/base.xml.in.h:387 ../rules/sun.xml.in.h:72
+msgid "Miscellaneous compatibility options"
+msgstr "Sekalaisia yhteensopivuusvalintoja"
+
+#: ../rules/base.xml.in.h:388
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:389
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:390
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:391
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:392
+msgid "Mongolia"
+msgstr "Mongolia"
+
+#: ../rules/base.xml.in.h:393
+msgid "Morocco"
+msgstr "Marokko"
+
+#: ../rules/base.xml.in.h:394 ../rules/sun.xml.in.h:73
+msgid "Multilingual"
+msgstr "Monikielinen"
+
+#: ../rules/base.xml.in.h:395
+msgid "Multilingual, first part"
+msgstr "Monikielinen, ensimmäinen osa"
+
+#: ../rules/base.xml.in.h:396 ../rules/sun.xml.in.h:74
+msgid "Multilingual, second part"
+msgstr "Monikielinen, toinen osa"
+
+#: ../rules/base.xml.in.h:397
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: ../rules/base.xml.in.h:398
+msgid "NICOLA-F style Backspace"
+msgstr "NICOLA-F-tyylin Backspace"
+
+#: ../rules/base.xml.in.h:399
+msgid "Neostyle"
+msgstr "Neostyle"
+
+#: ../rules/base.xml.in.h:400
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:401
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../rules/base.xml.in.h:402
+msgid "Netherlands"
+msgstr "Alankomaat"
+
+#: ../rules/base.xml.in.h:403
+msgid "Nig"
+msgstr "Nig"
+
+#: ../rules/base.xml.in.h:404
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#: ../rules/base.xml.in.h:405
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:406 ../rules/sun.xml.in.h:75
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:407
+msgid "Northern Saami"
+msgstr "Pohjoissaami"
+
+#: ../rules/base.xml.in.h:408
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Pohjoissaami, ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:409
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:410
+msgid "Norway"
+msgstr "Norja"
+
+#: ../rules/base.xml.in.h:411
+msgid "NumLock LED shows alternative layout."
+msgstr "Numlock-ledi näyttää vaihtoehtoista asettelua."
+
+#: ../rules/base.xml.in.h:412
+msgid "Numeric keypad delete key behaviour"
+msgstr "Numerosormion Del-näppäimen toiminta"
+
+#: ../rules/base.xml.in.h:413
+msgid "Numeric keypad keys work as with Mac."
+msgstr "Sormionäppäimet toimivat kuten Macissa."
+
+#: ../rules/base.xml.in.h:414
+msgid "Numeric keypad layout selection"
+msgstr "Sormion asettelun valinta"
+
+#: ../rules/base.xml.in.h:415
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:416
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:417
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:418
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../rules/base.xml.in.h:419
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet-näppäimistö"
+
+#: ../rules/base.xml.in.h:420
+msgid "Ossetian"
+msgstr "Ossetia"
+
+#: ../rules/base.xml.in.h:421
+msgid "Ossetian, Winkeys"
+msgstr "Ossetia, Win-näppäimet"
+
+#: ../rules/base.xml.in.h:422
+msgid "PC-98xx Series"
+msgstr "PC-98xx-sarja"
+
+#: ../rules/base.xml.in.h:423
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:424
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:425
+msgid "Pashto"
+msgstr "Pashto"
+
+#: ../rules/base.xml.in.h:426
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:427 ../rules/sun.xml.in.h:78
+msgid "Phonetic"
+msgstr "Foneettinen"
+
+#: ../rules/base.xml.in.h:428 ../rules/sun.xml.in.h:79
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:429
+msgid "Poland"
+msgstr "Puola"
+
+#: ../rules/base.xml.in.h:430
+msgid "Polytonic"
+msgstr "Polytoninen"
+
+#: ../rules/base.xml.in.h:431
+msgid "Portugal"
+msgstr "Portugali"
+
+#: ../rules/base.xml.in.h:432
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Paina vasenta Alt-näppäintä valitaksesi kolmannen tason."
+
+#: ../rules/base.xml.in.h:433
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Paina vasenta Win-näppäintä valitaksesi kolmannen tason."
+
+#: ../rules/base.xml.in.h:434
+msgid "Press Menu key to choose 3rd level."
+msgstr "Paina valikkonäppäintä valitaksesi kolmannen tason."
+
+#: ../rules/base.xml.in.h:435
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "Paina oikeaa Alt-näppäintä valitaksesi kolmannen tason, Shift-Oikea Alt on Multi_Key."
+
+#: ../rules/base.xml.in.h:436
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Paina oikeaa Alt-näppäintä valitaksesi kolmannen tason."
+
+#: ../rules/base.xml.in.h:437
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Paina oikeaa Ctrl-näppäintä valitaksesi kolmannen tason."
+
+#: ../rules/base.xml.in.h:438
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Paina oikeaa Win-näppäintä valitaksesi kolmannen tason."
+
+#: ../rules/base.xml.in.h:439
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Paina jotakin Alt-näppäintä valitaksesi kolmannen tason."
+
+#: ../rules/base.xml.in.h:440
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Paina jotakin Win-näppäintä valitaksesi kolmannen tason."
+
+#: ../rules/base.xml.in.h:441
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:442
+msgid "Pro Keypad"
+msgstr "Pro sormio"
+
+#: ../rules/base.xml.in.h:443
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:444
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:445 ../rules/sun.xml.in.h:88
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:446
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:447
+msgid "R-Alt switches layout while pressed."
+msgstr "Oikea Alt vaihtaa asettelua painettaessa."
+
+#: ../rules/base.xml.in.h:448
+msgid "Right Alt is Compose."
+msgstr "Oikea Alt on Compose."
+
+#: ../rules/base.xml.in.h:449
+msgid "Right Alt key changes layout."
+msgstr "Oikea Alt-näppäin vaihtaa asettelua."
+
+#: ../rules/base.xml.in.h:450 ../rules/sun.xml.in.h:90
+msgid "Right Alt key never chooses 3rd level."
+msgstr "Oikea Alt-näppäin ei koskaan valitse kolmatta tasoa."
+
+#: ../rules/base.xml.in.h:451
+msgid "Right Ctrl is Compose."
+msgstr "Oikea Ctrl on Compose."
+
+#: ../rules/base.xml.in.h:452
+msgid "Right Ctrl key changes layout."
+msgstr "Oikea Ctrl-näppäin vaihtaa asettelua."
+
+#: ../rules/base.xml.in.h:453
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "Oikea Ctrl-näppäin vaihtaa asettelua painettaessa."
+
+#: ../rules/base.xml.in.h:454
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Oikea Ctrl-näppäin toimii oikeana Alt-näppäimenä."
+
+#: ../rules/base.xml.in.h:455
+msgid "Right Shift key changes layout."
+msgstr "Oikea Shift-näppäin vaihtaa asettelua."
+
+#: ../rules/base.xml.in.h:456
+msgid "Right Win-key changes layout."
+msgstr "Oikea Win-näppäin vaihtaa asettelua."
+
+#: ../rules/base.xml.in.h:457
+msgid "Right Win-key is Compose."
+msgstr "Oikea Win-näppäin on Compose."
+
+#: ../rules/base.xml.in.h:458
+msgid "Right Win-key switches layout while pressed."
+msgstr "Oikea Win-näppäin vaihtaa asettelua painettaessa."
+
+#: ../rules/base.xml.in.h:459
+msgid "Right hand"
+msgstr "Oikeakätinen"
+
+#: ../rules/base.xml.in.h:460
+msgid "Right handed Dvorak"
+msgstr "Oikeakätinen dvorak"
+
+#: ../rules/base.xml.in.h:461
+msgid "Romania"
+msgstr "Romania"
+
+#: ../rules/base.xml.in.h:462
+msgid "Romanian keyboard with German letters"
+msgstr "Romanialainen näppäimistö saksalaisilla kirjaimilla"
+
+#: ../rules/base.xml.in.h:463
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Romanialainen näppäimistö saksalaisilla kirjaimilla, ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:464
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:465 ../rules/sun.xml.in.h:95
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:466
+msgid "Russia"
+msgstr "Venäjä"
+
+#: ../rules/base.xml.in.h:467 ../rules/sun.xml.in.h:96
+msgid "Russian"
+msgstr "Venäläinen"
+
+#: ../rules/base.xml.in.h:468
+msgid "Russian phonetic"
+msgstr "Venäläinen foneettinen"
+
+#: ../rules/base.xml.in.h:469
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Venäläinen foneettinen, ei kuolleita näppäimiä"
+
+#: ../rules/base.xml.in.h:470
+msgid "Russian with Kazakh"
+msgstr "Venäjä kazakhin kanssa"
+
+#: ../rules/base.xml.in.h:471
+msgid "SCG"
+msgstr "SCG"
+
+#: ../rules/base.xml.in.h:472
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST langaton multimedianäppäimistö"
+
+#: ../rules/base.xml.in.h:473
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:474
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:475
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:476
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:477
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:478
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:479
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:480
+msgid "ScrollLock LED shows alternative layout."
+msgstr "ScrollLock-ledi näyttää vaihtoehtoista asettelua."
+
+#: ../rules/base.xml.in.h:481
+msgid "Serbia and Montenegro"
+msgstr "Serbia ja Montenegro "
+
+#: ../rules/base.xml.in.h:482
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "Shift ja sormionäppäimet toimivat kuten MS Windowsissa."
+
+#: ../rules/base.xml.in.h:483
+msgid "Shift+CapsLock changes layout."
+msgstr "Shift+CapsLock vaihtaa asettelua."
+
+#: ../rules/base.xml.in.h:484
+msgid "Slovakia"
+msgstr "Slovakia"
+
+#: ../rules/base.xml.in.h:485
+msgid "Slovenia"
+msgstr "Slovenia"
+
+#: ../rules/base.xml.in.h:486
+msgid "South Africa"
+msgstr "Etelä-Afrikka"
+
+#: ../rules/base.xml.in.h:487
+msgid "Southern Uzbek"
+msgstr "Eteläinen uzbeekki"
+
+#: ../rules/base.xml.in.h:488
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Välilyönnistä tulee sitova välilyöntimerkki 4. tasolla ja kapea sitova välilyöntimerkki 6. tasolla"
+
+#: ../rules/base.xml.in.h:489
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr "Välilyönnistä tulee sitova välilyöntimerkki 4. tasolla."
+
+#: ../rules/base.xml.in.h:490
+msgid "Space key outputs non-breakable space character at second level."
+msgstr "Välilyönnistä tulee sitova välilyöntimerkki 2. tasolla."
+
+#: ../rules/base.xml.in.h:491
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr "Välilyönnistä tulee sitova välilyöntimerkki 3. tasolla eikä mitään 4. tasolla."
+
+#: ../rules/base.xml.in.h:492
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Välilyönnistä tulee sitova välilyöntimerkki 3. tasolla ja kapea sitova välilyöntimerkki 4. tasolla."
+
+#: ../rules/base.xml.in.h:493
+msgid "Space key outputs non-breakable space character at third level."
+msgstr "Välilyönnistä tulee sitova välilyöntimerkki 3. tasolla."
+
+#: ../rules/base.xml.in.h:494
+msgid "Space key outputs usual space at any level."
+msgstr "Välilyönnistä tulee tavallinen välilyönti kaikilla tasoilla."
+
+#: ../rules/base.xml.in.h:495
+msgid "Spain"
+msgstr "Espanja"
+
+#: ../rules/base.xml.in.h:496 ../rules/sun.xml.in.h:103
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Erikoisnäppäimet (Ctrl+Alt+&lt;näppäin&gt;) käsitellään palvelimessa."
+
+#: ../rules/base.xml.in.h:497
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:498
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../rules/base.xml.in.h:499 ../rules/sun.xml.in.h:104
+msgid "Standard"
+msgstr "Tavallinen"
+
+#: ../rules/base.xml.in.h:500
+msgid "Standard (Commabelow)"
+msgstr "Tavallinen (Pilkku alla)"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:502
+msgid "Standard RSTU"
+msgstr "Tavallinen RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:504
+msgid "Standard RSTU on Russian layout"
+msgstr "Tavallinen RSTU venäläisellä asettelulla"
+
+#: ../rules/base.xml.in.h:505 ../rules/sun.xml.in.h:112
+msgid "Sun dead keys"
+msgstr "Sunin kuolleet näppäimet"
+
+#: ../rules/base.xml.in.h:506
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power -multimedianäppäimistö"
+
+#: ../rules/base.xml.in.h:507
+msgid "Super is mapped to the Win-keys."
+msgstr "Super tulee Win-näppäimistä."
+
+#: ../rules/base.xml.in.h:508
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:509 ../rules/sun.xml.in.h:113
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:510
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:511
+msgid "Swap Ctrl and CapsLock."
+msgstr "Vaihda Ctrl ja CapsLock."
+
+#: ../rules/base.xml.in.h:512
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr "Vaihda kahden näppäimen näppäinkoodin, jos ydin tunnistaa väärin Mac-näppäimistön."
+
+#: ../rules/base.xml.in.h:513 ../rules/sun.xml.in.h:115
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:514
+msgid "Sweden"
+msgstr "Ruotsi"
+
+#: ../rules/base.xml.in.h:515
+msgid "Switzerland"
+msgstr "Sveitsi"
+
+#: ../rules/base.xml.in.h:516
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (lehtiö-PC)"
+
+#: ../rules/base.xml.in.h:517
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:518
+msgid "Syria"
+msgstr "Syyria"
+
+#: ../rules/base.xml.in.h:519
+msgid "Syriac"
+msgstr "Syyrialainen"
+
+#: ../rules/base.xml.in.h:520
+msgid "Syriac phonetic"
+msgstr "Syyrialainen foneettinen"
+
+#: ../rules/base.xml.in.h:521
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:522
+msgid "Tajikistan"
+msgstr "Tadžikistan"
+
+#: ../rules/base.xml.in.h:523
+msgid "Tamil"
+msgstr "Tamili"
+
+#: ../rules/base.xml.in.h:524
+msgid "Tamil TAB Typewriter"
+msgstr "Tamili TAB Typewriter"
+
+#: ../rules/base.xml.in.h:525
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamili TSCII Typewriter"
+
+#: ../rules/base.xml.in.h:526
+msgid "Tamil Unicode"
+msgstr "Tamili Unicode"
+
+#: ../rules/base.xml.in.h:527
+msgid "Tatar"
+msgstr "Tataari"
+
+#: ../rules/base.xml.in.h:528
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../rules/base.xml.in.h:529
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:530
+msgid "Thailand"
+msgstr "Thaimaa"
+
+#: ../rules/base.xml.in.h:531 ../rules/sun.xml.in.h:119
+msgid "Third level choosers"
+msgstr "Kolmannnen tason valitsimet"
+
+#: ../rules/base.xml.in.h:532
+msgid "Tibetan"
+msgstr "Tiibet"
+
+#: ../rules/base.xml.in.h:533
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tiibet (ASCII-numeroilla)"
+
+#: ../rules/base.xml.in.h:534
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#: ../rules/base.xml.in.h:535
+msgid "Tifinagh Alternative"
+msgstr "Tifinagh, vaihtoehtoinen"
+
+#: ../rules/base.xml.in.h:536
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Tifinagh, vaihtoehtoinen foneettinen"
+
+#: ../rules/base.xml.in.h:537
+msgid "Tifinagh Extended"
+msgstr "Tifinagh, laajennettu"
+
+#: ../rules/base.xml.in.h:538
+msgid "Tifinagh Extended Phonetic"
+msgstr "Tifinagh, laajennettu foneettinen"
+
+#: ../rules/base.xml.in.h:539
+msgid "Tifinagh Phonetic"
+msgstr "Tifinagh, foneettinen"
+
+#: ../rules/base.xml.in.h:540
+msgid "Tilde (~) variant"
+msgstr "Tildemuunnos (~)"
+
+#: ../rules/base.xml.in.h:541
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:542
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:543
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:544
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:545 ../rules/sun.xml.in.h:120
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:546
+msgid "Turkey"
+msgstr "Turkki"
+
+#: ../rules/base.xml.in.h:547
+msgid "Typewriter"
+msgstr "Kirjoituskone"
+
+#: ../rules/base.xml.in.h:548 ../rules/sun.xml.in.h:124
+msgid "U.S. English"
+msgstr "Amerikanenglanti"
+
+#: ../rules/base.xml.in.h:549
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Yhdysvaltalainen näppäimistö bosnialaisilla merkkipareilla"
+
+#: ../rules/base.xml.in.h:550
+msgid "US keyboard with Bosnian letters"
+msgstr "Yhdysvaltalainen näppäimistö bosnialaisilla kirjaimilla"
+
+#: ../rules/base.xml.in.h:551
+msgid "US keyboard with Croatian digraphs"
+msgstr "Yhdysvaltalainen näppäimistö kroatialaisilla merkkipareilla"
+
+#: ../rules/base.xml.in.h:552
+msgid "US keyboard with Croatian letters"
+msgstr "Yhdysvaltalainen näppäimistö kroatialaisilla kirjaimilla"
+
+#: ../rules/base.xml.in.h:553
+msgid "US keyboard with Lithuanian letters"
+msgstr "Yhdysvaltalainen näppäimistö liettualaisilla kirjaimilla"
+
+#: ../rules/base.xml.in.h:554
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Yhdysvaltalainen näppäimistö slovenialaisilla merkkipareilla"
+
+#: ../rules/base.xml.in.h:555
+msgid "US keyboard with Slovenian letters"
+msgstr "Yhdysvaltalainen näppäimistö slovenialaisilla kirjaimilla"
+
+#: ../rules/base.xml.in.h:556 ../rules/sun.xml.in.h:126
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.xml.in.h:557
+msgid "Udmurt"
+msgstr "Udmurt"
+
+#: ../rules/base.xml.in.h:558
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:559
+msgid "Ukraine"
+msgstr "Ukraina"
+
+#: ../rules/base.xml.in.h:560
+msgid "UnicodeExpert"
+msgstr "Unicode-asiantuntija"
+
+#: ../rules/base.xml.in.h:561 ../rules/sun.xml.in.h:127
+msgid "United Kingdom"
+msgstr "Iso-Britannia"
+
+#: ../rules/base.xml.in.h:562
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../rules/base.xml.in.h:563
+msgid "Use Bosnian digraphs"
+msgstr "Käytä bosnialaisia merkkipareja"
+
+#: ../rules/base.xml.in.h:564
+msgid "Use Croatian digraphs"
+msgstr "Käytä kroatialaisia merkkipareja"
+
+#: ../rules/base.xml.in.h:565
+msgid "Use Slovenian digraphs"
+msgstr "Käytä slovenialaisia merkkipareja"
+
+#: ../rules/base.xml.in.h:566
+msgid "Use guillemets for quotes"
+msgstr "Käytä guillemot-lainausmerkkejä"
+
+#: ../rules/base.xml.in.h:567
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Käytä näppäimistö-lediä näyttämään vaihtoehtoista asettelua."
+
+#: ../rules/base.xml.in.h:568
+msgid "Using space key to input non-breakable space character"
+msgstr "Sitovan välilyöntimerkin syöttäminen"
+
+#: ../rules/base.xml.in.h:569
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:570
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+#: ../rules/base.xml.in.h:571
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../rules/base.xml.in.h:572
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:573
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Wang 724 -sormio Unicode-lisäyksin (nuolet sekä matematiikkaoperaatiot)"
+
+#: ../rules/base.xml.in.h:574
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Wang 724 -sormio Unicode-lisäyksin (nuolet sekä matematiikkaoperaatiot). Matematiikkaoperaatiot oletustasolla."
+
+#: ../rules/base.xml.in.h:575
+msgid "Wang model 724 azerty"
+msgstr "Wang malli 724 azerty"
+
+#: ../rules/base.xml.in.h:576
+msgid "Western"
+msgstr "Läntinen"
+
+#: ../rules/base.xml.in.h:577
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:578
+msgid "Winkeys"
+msgstr "Win-näppäimet"
+
+#: ../rules/base.xml.in.h:579
+msgid "With &lt;\\|&gt; key"
+msgstr "&lt;\\|&gt;-näppäimillä"
+
+#: ../rules/base.xml.in.h:580
+msgid "With EuroSign on 5"
+msgstr "Euro-merkki 5-näppäimessä"
+
+#: ../rules/base.xml.in.h:581
+msgid "With guillemets"
+msgstr "Guillemot-lainausmerkeillä"
+
+#: ../rules/base.xml.in.h:582
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo!-Internet-näppäimistö"
+
+#: ../rules/base.xml.in.h:583
+msgid "Yoruba"
+msgstr "Yoruba"
+
+#: ../rules/base.xml.in.h:584
+msgid "Z and ZHE swapped"
+msgstr "Z ja ZHE vaihdettu"
+
+#: ../rules/base.xml.in.h:585
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:586
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:587
+msgid "azerty/digits"
+msgstr "azerty/numerot"
+
+#: ../rules/base.xml.in.h:588
+msgid "digits"
+msgstr "numerot"
+
+#: ../rules/base.xml.in.h:589
+msgid "displaced semicolon and quote (obsolete)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:590
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:591 ../rules/sun.xml.in.h:132
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:592
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, laajennettu Backslash"
+
+#: ../rules/base.xml.in.h:593
+msgid "qwerty/digits"
+msgstr "qwerty/numerot"
+
+#: ../rules/base.xml.in.h:594
+msgid "qwertz"
+msgstr "qwertz"
+
+#: ../rules/sun.xml.in.h:1
+msgid "\"Typewriter\""
+msgstr "\"Kirjoituskone\""
+
+#: ../rules/sun.xml.in.h:17
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr "Toimii lukitsevana Shiftinä. Shift kumoaa CapsLockin."
+
+#: ../rules/sun.xml.in.h:18
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "Toimii lukitsevana Shiftinä. Shift ei kumoa CapsLockia."
+
+#: ../rules/sun.xml.in.h:19
+msgid "Alt+Control changes group"
+msgstr "Alt+Ctrl vaihtaa ryhmää"
+
+#: ../rules/sun.xml.in.h:20
+msgid "Alt+Shift changes group"
+msgstr "Alt+Shift vaihtaa ryhmää"
+
+#: ../rules/sun.xml.in.h:21
+msgid "Basic"
+msgstr "Perus"
+
+#: ../rules/sun.xml.in.h:23
+msgid "Belgian"
+msgstr "belgialainen"
+
+#: ../rules/sun.xml.in.h:25
+msgid "Both Alt keys together change group"
+msgstr "Molemmat Alt-näppäimet yhdessä vaihtavat ryhmää"
+
+#: ../rules/sun.xml.in.h:26
+msgid "Both Ctrl keys together change group"
+msgstr "Molemmat Ctrl-näppäimet yhdessä vaihtavat ryhmää"
+
+#: ../rules/sun.xml.in.h:27
+msgid "Both Shift keys together change group"
+msgstr "Molemmat Shift-näppäimet yhdessä vaihtavat ryhmää"
+
+#: ../rules/sun.xml.in.h:28
+msgid "Bulgarian"
+msgstr "bulgarialainen"
+
+#: ../rules/sun.xml.in.h:30
+msgid "Canadian"
+msgstr "kanadalainen"
+
+#: ../rules/sun.xml.in.h:31
+msgid "Caps Lock is Compose"
+msgstr "Caps Lock on Compose"
+
+#: ../rules/sun.xml.in.h:32
+msgid "Caps Lock key changes group"
+msgstr "CapsLock-näppäin vaihtaa ryhmää"
+
+#: ../rules/sun.xml.in.h:34
+msgid "Caps_Lock LED shows alternative group"
+msgstr "CapsLock-ledi näyttää vaihtoehtoista ryhmää"
+
+#: ../rules/sun.xml.in.h:35
+msgid "Control Key Position"
+msgstr "Ctrl-näppäimen sijainti"
+
+#: ../rules/sun.xml.in.h:36
+msgid "Control key at bottom left"
+msgstr "Ctrl-näppäin alhaalla vasemmalla"
+
+#: ../rules/sun.xml.in.h:37
+msgid "Control key at left of 'A'"
+msgstr "Ctrl-näppäin \"A\"-näppäimestä vasemmalla"
+
+#: ../rules/sun.xml.in.h:38
+msgid "Control+Shift changes group"
+msgstr "Ctrl+Shift vaihtaa ryhmää"
+
+#: ../rules/sun.xml.in.h:40
+msgid "Czech"
+msgstr "tšekkiläinen"
+
+#: ../rules/sun.xml.in.h:41
+msgid "Danish"
+msgstr "tanskalainen"
+
+#: ../rules/sun.xml.in.h:45
+msgid "DeuCH"
+msgstr "DeuCH"
+
+#: ../rules/sun.xml.in.h:47
+msgid "Dvo"
+msgstr "Dvo"
+
+#: ../rules/sun.xml.in.h:52
+msgid "Finnish"
+msgstr "suomalainen"
+
+#: ../rules/sun.xml.in.h:54
+msgid "FraCH"
+msgstr "FraCH"
+
+#: ../rules/sun.xml.in.h:57
+msgid "German"
+msgstr "saksalainen"
+
+#: ../rules/sun.xml.in.h:58
+msgid "Group Shift/Lock behavior"
+msgstr "Ryhmien vaihto ja lukitus"
+
+#: ../rules/sun.xml.in.h:60
+msgid "Hungarian"
+msgstr "unkarilainen"
+
+#: ../rules/sun.xml.in.h:64
+msgid "Italian"
+msgstr "italialainen"
+
+#: ../rules/sun.xml.in.h:65
+msgid "Japanese"
+msgstr "japanilainen"
+
+#: ../rules/sun.xml.in.h:67
+msgid "Left Alt key changes group"
+msgstr "Vasen Alt-näppäin vaihtaa ryhmää"
+
+#: ../rules/sun.xml.in.h:68
+msgid "Left Alt key switches group while pressed"
+msgstr "Vasen Alt-näppäin vaihtaa ryhmää painettaessa"
+
+#: ../rules/sun.xml.in.h:69
+msgid "Left Ctrl key changes group"
+msgstr "Vasen Ctrl-näppäin vaihtaa ryhmää"
+
+#: ../rules/sun.xml.in.h:70
+msgid "Left Shift key changes group"
+msgstr "Vasen Shift-näppäin vaihtaa ryhmää"
+
+#: ../rules/sun.xml.in.h:71
+msgid "Make CapsLock an additional Control"
+msgstr "Tee CapsLockista ylimääräinen Ctrl"
+
+#: ../rules/sun.xml.in.h:76
+msgid "Norwegian"
+msgstr "norjalainen"
+
+#: ../rules/sun.xml.in.h:77
+msgid "Num_Lock LED shows alternative group"
+msgstr "Numlock-ledi näyttää vaihtoehtoista ryhmää"
+
+#: ../rules/sun.xml.in.h:80
+msgid "Polish"
+msgstr "puolalainen"
+
+#: ../rules/sun.xml.in.h:81
+msgid "Polish with Polish quotes on key \"1/!\""
+msgstr "puolalainen, puolalaiset lainausmerkit \"1/!\"-näppäimistä"
+
+#: ../rules/sun.xml.in.h:82
+msgid "Portuguese"
+msgstr "portugalilainen"
+
+#: ../rules/sun.xml.in.h:83
+msgid "Press Left Alt key to choose 3rd level"
+msgstr "Paina vasenta Alt-näppäintä valitaksesi kolmannen tason"
+
+#: ../rules/sun.xml.in.h:84
+msgid "Press Right Alt key to choose 3rd level"
+msgstr "Paina oikeaa Alt-näppäintä valitaksesi kolmannen tason"
+
+#: ../rules/sun.xml.in.h:85
+msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr "Paina oikeaa Alt-näppäintä valitaksesi kolmannen tason, Shift-Oikea Alt on Multi_Key"
+
+#: ../rules/sun.xml.in.h:86
+msgid "Press Right Control to choose 3rd level"
+msgstr "Paina oikeaa Ctrl-näppäintä valitaksesi kolmannen tason"
+
+#: ../rules/sun.xml.in.h:87
+msgid "Press any of Alt keys to choose 3rd level"
+msgstr "Paina jotakin Alt-näppäintä valitaksesi kolmannen tason"
+
+#: ../rules/sun.xml.in.h:89
+msgid "Right Alt key changes group"
+msgstr "Oikea Alt-näppäin vaihtaa ryhmää"
+
+#: ../rules/sun.xml.in.h:91
+msgid "Right Alt switches group while pressed"
+msgstr "Oikea Alt vaihtaa ryhmää painettaessa"
+
+#: ../rules/sun.xml.in.h:92
+msgid "Right Control key works as Right Alt"
+msgstr "Oikea Ctrl-näppäin toimii oikeana Alt-näppäimenä"
+
+#: ../rules/sun.xml.in.h:93
+msgid "Right Ctrl key changes group"
+msgstr "Oikea Ctrl-näppäin vaihtaa ryhmää"
+
+#: ../rules/sun.xml.in.h:94
+msgid "Right Shift key changes group"
+msgstr "Oikea Shift-näppäin vaihtaa ryhmää"
+
+#: ../rules/sun.xml.in.h:97
+msgid "Scroll Lock changes group"
+msgstr "Scrolllock vaihtaa ryhmää"
+
+#: ../rules/sun.xml.in.h:98
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "Scrolllock-ledi näyttää vaihtoehtoista ryhmää"
+
+#: ../rules/sun.xml.in.h:99
+msgid "Shift with numpad keys works as in MS Windows"
+msgstr "Shift ja sormionäppäimet toimivat kuten MS Windowsissa"
+
+#: ../rules/sun.xml.in.h:100
+msgid "Shift+CapsLock changes group"
+msgstr "Shift+CapsLock vaihtaa ryhmää"
+
+#: ../rules/sun.xml.in.h:101
+msgid "Slovak"
+msgstr "slovakialainen"
+
+#: ../rules/sun.xml.in.h:102
+msgid "Spanish"
+msgstr "espanjalainen"
+
+#: ../rules/sun.xml.in.h:105
+msgid "Sun Type 4"
+msgstr "Sun Type 4"
+
+#: ../rules/sun.xml.in.h:106
+msgid "Sun Type 5"
+msgstr "Sun Type 5"
+
+#: ../rules/sun.xml.in.h:107
+msgid "Sun Type 5 European"
+msgstr "Sun Type 5 eurooppalainen"
+
+#: ../rules/sun.xml.in.h:108
+msgid "Sun Type 5 Unix"
+msgstr "Sun Type 5 Unix"
+
+#: ../rules/sun.xml.in.h:109
+msgid "Sun Type 6"
+msgstr "Sun Type 6"
+
+#: ../rules/sun.xml.in.h:110
+msgid "Sun Type 6 Unix"
+msgstr "Sun Type 6 Unix"
+
+#: ../rules/sun.xml.in.h:111
+msgid "Sun Type 6 with Euro key"
+msgstr "Sun Type 6 Euro-näppäimellä"
+
+#: ../rules/sun.xml.in.h:114
+msgid "Swap Control and Caps Lock"
+msgstr "Vaihda Ctrl ja CapsLock"
+
+#: ../rules/sun.xml.in.h:116
+msgid "Swedish"
+msgstr "ruotsalainen"
+
+#: ../rules/sun.xml.in.h:117
+msgid "Swiss French"
+msgstr "sveitsinranskalainen"
+
+#: ../rules/sun.xml.in.h:118
+msgid "Swiss German"
+msgstr "sveitsinsaksalainen"
+
+#: ../rules/sun.xml.in.h:121
+msgid "Turkish"
+msgstr "turkkilainen"
+
+#: ../rules/sun.xml.in.h:122
+msgid "Turkish (F)"
+msgstr "turkkilainen (F)"
+
+#: ../rules/sun.xml.in.h:123
+msgid "Turkish Alt-Q Layout"
+msgstr "turkkilainen Alt-Q-asettelu"
+
+#: ../rules/sun.xml.in.h:125
+msgid "U.S. English w/ ISO9995-3"
+msgstr "Amerikanenglanti + ISO9995-3"
+
+#: ../rules/sun.xml.in.h:128
+msgid "Use keyboard LED to show alternative group"
+msgstr "Käytä näppäimistö-lediä näyttämään vaihtoehtoista ryhmää"
+
+#: ../rules/sun.xml.in.h:129
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr "Käyttää sisäistä suuraakkostusta. Shift kumoaa CapsLockin."
+
+#: ../rules/sun.xml.in.h:130
+msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+msgstr "Käyttää sisäistä suuraakkostusta. Shift ei kumoa CapsLockia."
+
+#: ../rules/sun.xml.in.h:131
+msgid "bksl"
+msgstr "bksl"
+
+#: ../rules/sun.xml.in.h:133
+msgid "type4"
+msgstr "type4"
+
+#~ msgid "Acer TravelMate 800"
+#~ msgstr "Acer TravelMate 800"
+
+#~ msgid "BenQ X-Touch 730"
+#~ msgstr "BenQ X-Touch 730"
+
+#~ msgid "BenQ X-Touch 800"
+#~ msgstr "BenQ X-Touch 800"
+
+#~ msgid "Dell SK-8125 USB Multimedia Keybard"
+#~ msgstr "Dell SK-8125 USB -multimedianäppäimistö"
+
+#~ msgid "Dell SK-8135 USB Multimedia Keybard"
+#~ msgstr "Dell SK-8135 USB -multimedianäppäimistö"
+
+#~ msgid "Force standard legacy keypad"
+#~ msgstr "Pakota standardi vanha sormio"
+
+#~ msgid "Logitech Cordless Desktop Optical"
+#~ msgstr "Logitech Cordless Desktop Optical"
+
+#~ msgid "Logitech Cordless Desktop Pro"
+#~ msgstr "Logitech Cordless Desktop Pro"
+
+#~ msgid "Logitech Cordless Desktop Pro (alternate option)"
+#~ msgstr "Logitech Cordless Desktop Pro (vaihtoehtoinen)"
+
+#~ msgid "Logitech Cordless Desktop iTouch"
+#~ msgstr "Logitech Cordless Desktop iTouch"
+
+#~ msgid "Use keypad with unicode additions (arrows and math operators)"
+#~ msgstr "Käytä sormiota unicodelisäyksin (nuolet sekä matematiikkaoperaattorit)"
+
+#~ msgid "Adding the nobreakspace keysym to space key"
+#~ msgstr "Sitovan välilyönnin lisäys välilyöntinäppäimeen"
+
+#~ msgid "PowerPC PS/2"
+#~ msgstr "PowerPC PS/2"
diff --git a/xorg-server/xkbdata.src/po/fr.po b/xorg-server/xkbdata.src/po/fr.po
new file mode 100644
index 000000000..123374554
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/fr.po
@@ -0,0 +1,2677 @@
+# Messages français pour GNU concernant xfree86_xkb_xml.
+# Copyright © 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+# Michel Robitaille <robitail@IRO.UMontreal.CA>, traducteur depuis/since 1996.
+# 2005, 2006 Denis Barbier <barbier@linuxfr.org>
+# 2008 Marc Veillet <scouigne@gmail.com>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.4-pre1\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2008-09-15 23:52+0100\n"
+"PO-Revision-Date: 2008-09-18 10:49-0500\n"
+"Last-Translator: Marc Veillet <scouigne@gmail.com>\n"
+"Language-Team: French <traduc@traduc.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: CANADA\n"
+
+#: ../rules/base.xml.in.h:1 ../rules/evdev.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2 ../rules/evdev.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(Obsolète) Autre"
+
+#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Obsolète) Autre, touches mortes Sun"
+
+#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Obsolète) Autre, sans touches mortes"
+
+#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
+msgid "101/104 key Compatible"
+msgstr "Compatible 101/104 touches"
+
+#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/virgule/touches mortes"
+
+#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/virgule/sans touches mortes"
+
+#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/point/touches mortes"
+
+#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/point/sans touches mortes"
+
+#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/virgule/touches mortes"
+
+#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/virgule/sans touches mortes"
+
+#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/point/touches mortes"
+
+#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/point/sans touches mortes"
+
+#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/virgule/touches mortes"
+
+#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/virgule/sans touches mortes"
+
+#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/point/touches mortes"
+
+#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/point/sans touches mortes"
+
+#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/virgule/touches mortes"
+
+#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/virgule/sans touches mortes"
+
+#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/point/touches mortes"
+
+#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/point/sans touches mortes"
+
+#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:23 ../rules/evdev.xml.in.h:23
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Desktop RFKB-23 sans fil"
+
+#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
+msgid "ACPI Standard"
+msgstr "ACPI standard"
+
+#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
+msgid "ATM/phone-style hexadecimal keypad"
+msgstr "ATM/clavier hexadécimal de style téléphonique"
+
+#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
+msgid "Acer Laptop"
+msgstr "Portable Acer"
+
+#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
+msgid "Add the EuroSign to the 2 key."
+msgstr "Ajouter le signe Euro sur la touche 2."
+
+#: ../rules/base.xml.in.h:32 ../rules/evdev.xml.in.h:32
+msgid "Add the EuroSign to the 4 key."
+msgstr "Ajouter le signe Euro sur la touche 4."
+
+#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "Ajouter le signe Euro sur la touche 5."
+
+#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "Ajouter le signe Euro sur la touche E."
+
+#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "Ajouter le comportement standard sur la touche Menu."
+
+#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Ajout du signe Euro sur certaines touches"
+
+#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38 ../rules/evdev.xml.in.h:38
+msgid "Afg"
+msgstr "Afg"
+
+#: ../rules/base.xml.in.h:39 ../rules/evdev.xml.in.h:39
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+#: ../rules/base.xml.in.h:40 ../rules/evdev.xml.in.h:40
+msgid "Akan"
+msgstr "Akan"
+
+#: ../rules/base.xml.in.h:41 ../rules/evdev.xml.in.h:41
+msgid "Alb"
+msgstr "Alb"
+
+#: ../rules/base.xml.in.h:42 ../rules/evdev.xml.in.h:42
+msgid "Albania"
+msgstr "Albanie"
+
+#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt et Meta sont sur les touches Alt."
+
+#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt est obtenu avec la touche Logo de droite, et Super avec Menu."
+
+#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Les touches Alt.+Verr. maj. changent de configuration."
+
+#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+Ctrl change de configuration."
+
+#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Alt+Maj. change de configuration."
+
+#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Comportement des touches Alt/Logo"
+
+#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
+msgid "Alternative"
+msgstr "Autre"
+
+#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "Orientale, variante"
+
+#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "Autre, phonétique"
+
+#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "International (auparavant us_intl)"
+
+#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "Autre, touches mortes Sun"
+
+#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "Autre, sans touches mortes"
+
+#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "Autre, latin-9 seulement"
+
+#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
+msgid "Andorra"
+msgstr "Andorre"
+
+#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "Variante apostrophe"
+
+#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Portable Apple"
+
+#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
+msgid "Arabic"
+msgstr "Arabe"
+
+#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
+msgid "Armenia"
+msgstr "Arménie"
+
+#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "Variante asturienne avec H point bas et L point bas"
+
+#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
+msgid "Asus Laptop"
+msgstr "Portable Asus"
+
+#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
+msgid "Azerbaijan"
+msgstr "Azerbaïdjan"
+
+#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 Internet sans fil"
+
+#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
+
+#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
+msgid "Baltic+"
+msgstr "Baltic+"
+
+#: ../rules/base.xml.in.h:80 ../rules/evdev.xml.in.h:80
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
+msgid "Belarus"
+msgstr "Bélarus"
+
+#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
+msgid "Belgium"
+msgstr "Belgique"
+
+#: ../rules/base.xml.in.h:85 ../rules/evdev.xml.in.h:85
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
+msgid "Bengali"
+msgstr "Bengali"
+
+#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
+msgid "Bengali Probhat"
+msgstr "Bengali Probhat"
+
+#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonomc, modèle Dvorak"
+
+#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonomic, modèle Dvorak, latin-9 seulement"
+
+#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
+msgid "Bhutan"
+msgstr "Bhoutan"
+
+#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Hébreu biblique (Tiro)"
+
+#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnie-Herzégovine"
+
+#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
+msgid "Both Alt keys together change layout."
+msgstr "Les touches Alt ensemble changent de disposition."
+
+#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
+msgid "Both Ctrl keys together change layout."
+msgstr "Les touches Ctrl ensemble changent de disposition."
+
+#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
+msgid "Both Shift keys together change layout."
+msgstr "Les touches Maj. ensemble changent de disposition."
+
+#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
+msgid "Both Win-keys switch layout while pressed."
+msgstr "Les deux touches Logo ensemble changent de disposition."
+
+#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
+msgid "Braille"
+msgstr "Braille"
+
+#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+msgid "Brazil"
+msgstr "Brésil"
+
+#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
+msgid "Brazilian ABNT2"
+msgstr "ABNT2 brésilien"
+
+#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet"
+
+#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
+msgid "Bulgaria"
+msgstr "Bulgarie"
+
+#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
+msgid "Cambodia"
+msgstr "Cambodge"
+
+#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
+msgid "Canada"
+msgstr "Canada"
+
+#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
+msgid "Caps Lock is Compose."
+msgstr "Verr. maj. est Compose."
+
+#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
+msgid "CapsLock LED shows alternative layout."
+msgstr "Le témoins lumineux du Verr. maj. indique un groupe autre que le premier."
+
+#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "Verr. maj. agit comme Maj. verrouillé. Maj. l'annule temporairement."
+
+#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "Verr. maj. agit comme Maj. verrouillé. Maj. n'a pas d'effet."
+
+#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
+msgid "CapsLock just locks the Shift modifier."
+msgstr "Verr. maj. verrouille le modificateur de majuscules."
+
+#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
+msgid "CapsLock key behavior"
+msgstr "Comportement de la touche Verrouillage majuscule"
+
+#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
+msgid "CapsLock key changes layout."
+msgstr "La touche Verr. maj. change de disposition."
+
+#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
+msgid "CapsLock switch to first layout, Shift+CapsLock switch to last layout."
+msgstr "Verr. Maj. change vers la première disposition, Maj.+Verr. Maj. change vers la dernière disposition."
+
+#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "Verr. maj. agit comme Maj. verrouillé, pour toutes les touches."
+
+#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "Verr. maj. permet la mise en majuscule usuelle des caractères alphabétiques."
+
+#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "Verr. maj. permet la mise en majuscule interne. Maj. l'annule temporairement."
+
+#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "Verr. maj. permet la mise en majuscule interne. Maj. n'a pas d'effet dessus."
+
+#: ../rules/base.xml.in.h:126 ../rules/evdev.xml.in.h:126
+msgid "Catalan variant with middle-dot L"
+msgstr "Catalan avec L point médian"
+
+#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
+msgid "Cedilla"
+msgstr "Cédille"
+
+#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+msgid "Cherokee"
+msgstr "Cherokee"
+
+#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (autre option)"
+
+#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet"
+
+#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
+msgid "China"
+msgstr "Chine"
+
+#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+msgid "Chuvash"
+msgstr "Chuvash"
+
+#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
+msgid "Chuvash Latin"
+msgstr "Latin Chuvash"
+
+#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
+msgid "Classic"
+msgstr "Classique"
+
+#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
+msgid "Classic Dvorak"
+msgstr "Dvorak classique"
+
+#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access"
+
+#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet (13 touches)"
+
+#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet (18 touches)"
+
+#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet (7 touches)"
+
+#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq"
+
+#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
+msgid "Compose key position"
+msgstr "Position de la touche Compose"
+
+#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
+msgid "Congo, Democratic Republic of the"
+msgstr "République démocratique du Congo"
+
+#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "La touche Ctrl est obtenue avec la touche Logo (et les touches Ctrl habituelles)."
+
+#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
+msgid "Croatia"
+msgstr "Croatie"
+
+#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
+msgid "Ctrl key at bottom left"
+msgstr "Touche Ctrl en bas à gauche"
+
+#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
+msgid "Ctrl key at left of 'A'"
+msgstr "Touche Ctrl à la gauche du « A »"
+
+#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
+msgid "Ctrl key position"
+msgstr "Position de la touche Ctrl"
+
+#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
+msgid "Ctrl+Shift change layout."
+msgstr "Ctrl+Maj. change de disposition."
+
+#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
+msgid "Cyrillic"
+msgstr "Cyrillique"
+
+#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
+msgid "Cyrillic with guillemets"
+msgstr "Cyrillique avec guillemets"
+
+#: ../rules/base.xml.in.h:161 ../rules/evdev.xml.in.h:161
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Cyrillique, Z et ZHE permutés"
+
+#: ../rules/base.xml.in.h:162 ../rules/evdev.xml.in.h:162
+msgid "Cze"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
+msgid "Czechia"
+msgstr "République tchèque"
+
+#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
+msgid "DRC"
+msgstr "RDC"
+
+#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
+msgid "Dan"
+msgstr "Dan"
+
+#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
+msgid "Dead acute"
+msgstr "Touche morte d'accent aigu"
+
+#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
+msgid "Dead grave acute"
+msgstr "Touche morte d'accent grave"
+
+#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
+msgid "Default numeric keypad keys."
+msgstr "Touches du pavé numérique par défaut."
+
+#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
+msgid "Dell 101-key PC"
+msgstr "Dell PC 101 touches"
+
+#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Portable Dell Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Portable Dell Precision série M"
+
+#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
+msgid "Dell Latitude series laptop"
+msgstr "Portable Latitude Dell"
+
+#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Clavier multimédia USB Dell"
+
+#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
+msgid "Denmark"
+msgstr "Danemark"
+
+#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
+msgid "Deu"
+msgstr "Deu"
+
+#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Desktop sans fil"
+
+#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 series"
+
+#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+msgid "Dvorak (UK Punctuation)"
+msgstr "Dvorak (ponctuation britannique)"
+
+#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+msgid "Dvorak international"
+msgstr "Dvorak international"
+
+#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak, guillemets polonais sur la touche « 1/! »"
+
+#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, guillemets polonais sur la touche des guillemets"
+
+#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
+msgid "Eastern"
+msgstr "Orientale"
+
+#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
+msgid "Eliminate dead keys"
+msgstr "Éliminer les touches mortes"
+
+#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
+msgid "Ergonomic"
+msgstr "Ergonomique"
+
+#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
+msgid "Estonia"
+msgstr "Estonie"
+
+#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
+msgid "Eth"
+msgstr "Eth"
+
+#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+msgid "Ethiopia"
+msgstr "Ethiopie"
+
+#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
+msgid "Evdev-managed keyboard"
+msgstr "Clavier piloté par evdev"
+
+#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
+msgid "Extended"
+msgstr "Étendue"
+
+#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
+msgid "Extended Backslash"
+msgstr "Barre contre-oblique étendue"
+
+#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
+msgid "F-letter (F) variant"
+msgstr "Variante (F)"
+
+#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
+msgid "Faroe Islands"
+msgstr "Îles Féroé"
+
+#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
+msgid "Finland"
+msgstr "Finlande"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
+msgid "Four-level key with abstract separators"
+msgstr "Touches à quatre niveaux avec séparateurs abstraits"
+
+#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
+msgid "Four-level key with comma"
+msgstr "Touches à quatre niveaux avec virgule"
+
+#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
+msgid "Four-level key with dot"
+msgstr "Touches à quatre niveaux avec point"
+
+#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+msgid "Four-level key with momayyez"
+msgstr "Touches à quatre niveaux avec momayyez"
+
+#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
+msgid "France"
+msgstr "France"
+
+#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
+msgid "French"
+msgstr "Français"
+
+#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
+msgid "French (Macintosh)"
+msgstr "Français (Apple-Macintosh)"
+
+#: ../rules/base.xml.in.h:219 ../rules/evdev.xml.in.h:219
+msgid "French (legacy)"
+msgstr "Français (obsolète)"
+
+#: ../rules/base.xml.in.h:220 ../rules/evdev.xml.in.h:220
+msgid "French Dvorak"
+msgstr "Dvorak français"
+
+#: ../rules/base.xml.in.h:221 ../rules/evdev.xml.in.h:221
+msgid "French, Sun dead keys"
+msgstr "Français, touches mortes Sun"
+
+#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
+msgid "French, eliminate dead keys"
+msgstr "Français, sans touches mortes"
+
+#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
+msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
+msgstr "Portable Fujitsu-Siemens Computers AMILO A1667G"
+
+#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
+msgid "Fula"
+msgstr "Peul"
+
+#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
+msgid "Generic 101-key PC"
+msgstr "PC générique 101 touches"
+
+#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
+msgid "Generic 102-key (Intl) PC"
+msgstr "PC générique 102 touches (intl)"
+
+#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
+msgid "Generic 104-key PC"
+msgstr "PC générique 104 touches"
+
+#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
+msgid "Generic 105-key (Intl) PC"
+msgstr "PC générique 105 touches (intl)"
+
+#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM KWD-910"
+
+#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
+msgid "Georgia"
+msgstr "Géorgie"
+
+#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
+msgid "Georgian"
+msgstr "Géorgien"
+
+#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
+msgid "Georgian AZERTY Tskapo"
+msgstr "AZERTY géorgien Tskapo"
+
+#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
+msgid "German (Macintosh)"
+msgstr "Allemand (Apple-Macintosh)"
+
+#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
+msgid "German, Sun dead keys"
+msgstr "Allemand, touches mortes Sun"
+
+#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
+msgid "German, eliminate dead keys"
+msgstr "Allemand, sans touches mortes"
+
+#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
+msgid "Germany"
+msgstr "Allemagne"
+
+#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
+msgid "Greece"
+msgstr "Grèce"
+
+#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
+msgid "Group toggle on multiply/divide key"
+msgstr "Les touches Multiplier/Diviser basculent d'un groupe à l'autre"
+
+#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
+msgid "Gui"
+msgstr "Gui"
+
+#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
+msgid "Guinea"
+msgstr "Guinée"
+
+#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
+msgid "Gurmukhi Jhelum"
+msgstr "Gurmukhi Jhelum"
+
+#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
+msgid "Happy Hacking Keyboard"
+msgstr "Clavier Happy Hacking"
+
+#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Clavier Happy Hacking pour Mac"
+
+#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
+msgid "Hausa"
+msgstr "Haoussa"
+
+#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet"
+
+#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
+msgid "Hewlett-Packard Internet Keyboard 5181"
+msgstr "Hewlett-Packard avec clavier Internet 5181"
+
+#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
+msgid "Hewlett-Packard Internet Keyboard 5185"
+msgstr "Hewlett-Packard avec clavier Internet 5185"
+
+#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia"
+
+#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet"
+
+#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
+msgid "Hindi Bolnagri"
+msgstr "Hindi Bolnagri"
+
+#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
+msgid "Homophonic"
+msgstr "Homophone"
+
+#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
+msgid "Hun"
+msgstr "Hun"
+
+#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
+msgid "Hungary"
+msgstr "Hongrie"
+
+#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper est obtenu avec n'importe quelle touche Logo."
+
+#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (autre option)"
+
+#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
+
+#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E (Intl)"
+
+#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+msgid "ISO Alternate"
+msgstr "Autre ISO"
+
+#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
+msgid "Iceland"
+msgstr "Islande"
+
+#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+msgid "India"
+msgstr "Inde"
+
+#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
+msgid "International (AltGr dead keys)"
+msgstr "International (AltCar et touches mortes)"
+
+#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
+msgid "International (with dead keys)"
+msgstr "International (avec touches mortes)"
+
+#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+msgid "Iran"
+msgstr "Iran"
+
+#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
+msgid "Ireland"
+msgstr "Irlande"
+
+#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
+msgid "Irq"
+msgstr "Irq"
+
+#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
+msgid "Israel"
+msgstr "Israël"
+
+#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
+msgid "Italy"
+msgstr "Italie"
+
+#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
+msgid "Japan"
+msgstr "Japon"
+
+#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
+msgid "Japan (PC-98xx Series)"
+msgstr "PC-98xx japonais"
+
+#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
+msgid "Japanese 106-key"
+msgstr "Japonais 106 touches"
+
+#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
+msgid "Japanese keyboard options"
+msgstr "Options de clavier japonais"
+
+#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
+msgid "Kana Lock key is locking"
+msgstr "La touche de verrouillage Kana agit comme touche de verrouillage"
+
+#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
+msgid "Kashubian"
+msgstr "Kachoube"
+
+#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
+msgid "Kazakh with Russian"
+msgstr "Kazakh avec russe"
+
+#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
+msgid "Kazakhstan"
+msgstr "Kazakhstan"
+
+#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
+msgid "Keypad"
+msgstr "Pavé numérique"
+
+#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
+msgid "Keypad with unicode additions (arrows and math operators)"
+msgstr "Clavier avec ajouts Unicode (touches fléchées et opérateurs mathématiques)"
+
+#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
+msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Clavier avec ajouts Unicode (touches fléchées et opérateurs mathématiques). Les opérateurs mathématiques se trouvent sur le niveau par défaut."
+
+#: ../rules/base.xml.in.h:320 ../rules/evdev.xml.in.h:320
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
+msgid "Khm"
+msgstr "Khm"
+
+#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
+msgid "Kir"
+msgstr "Kir"
+
+#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
+msgid "Komi"
+msgstr "Komi"
+
+#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
+msgid "Korea, Republic of"
+msgstr "République de Corée"
+
+#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
+msgid "Korean 106-key"
+msgstr "Coréen 106 touches"
+
+#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
+msgid "Ktunaxa"
+msgstr "Ktunaxa"
+
+#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+msgid "Kurdish, (F)"
+msgstr "Kurde, (F)"
+
+#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+msgid "Kurdish, Arabic-Latin"
+msgstr "Kurde, Arabe-latin"
+
+#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Kurde, Latin Alt-Q"
+
+#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
+msgid "Kurdish, Latin Q"
+msgstr "Kurde, Latin Q"
+
+#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
+msgid "Kyrgyzstan"
+msgstr "Kirghizistan"
+
+#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
+msgid "LCtrl+LShift change layout."
+msgstr "Ctrl gauche+Maj. gauche change de disposition."
+
+#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
+msgid "LEKP"
+msgstr "LEKP"
+
+#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
+msgid "LEKPa"
+msgstr "LEKPa"
+
+#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Compaq portable (p.e. Armada)"
+
+#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Compaq portable Internet (p.e. Presario)"
+
+#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "eMachines m68xx"
+
+#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
+msgid "Latin"
+msgstr "Latin"
+
+#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
+msgid "Latin American"
+msgstr "Amérique latine"
+
+#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
+msgid "Latin Unicode"
+msgstr "Latin Unicode"
+
+#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
+msgid "Latin Unicode qwerty"
+msgstr "Latin Unicode qwerty"
+
+#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
+msgid "Latin qwerty"
+msgstr "Latin qwerty"
+
+#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
+msgid "Latin unicode"
+msgstr "Unicode Latin"
+
+#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
+msgid "Latin unicode qwerty"
+msgstr "Unicode Latin QWERTY"
+
+#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
+msgid "Latin with guillemets"
+msgstr "Latin avec guillemets"
+
+#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
+msgid "Latvia"
+msgstr "Lettonie"
+
+#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
+msgid "Lav"
+msgstr "Lav"
+
+#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
+msgid "Layout switching"
+msgstr "Changement de disposition"
+
+#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
+msgid "Left Alt is swapped with left Win-key."
+msgstr "La touche Alt de gauche est échangée avec la touche Logo de gauche."
+
+#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
+msgid "Left Alt key changes layout."
+msgstr "La touche Alt de gauche change de disposition."
+
+#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
+msgid "Left Alt key switches layout while pressed."
+msgstr "Maintenir la touche Alt de gauche enfoncée change de disposition."
+
+#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
+msgid "Left Ctrl key changes layout."
+msgstr "La touche Ctrl de gauche change de disposition."
+
+#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
+msgid "Left Shift key changes layout."
+msgstr "La touche Maj. de gauche change de disposition."
+
+#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
+msgid "Left Win-key changes layout."
+msgstr "La touche Logo de gauche change de disposition."
+
+#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
+msgid "Left Win-key is Compose."
+msgstr "La touche Logo de gauche est Compose."
+
+#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
+msgid "Left Win-key switches layout while pressed."
+msgstr "Maintenir la touche Logo de gauche enfoncée change de disposition."
+
+#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
+msgid "Left hand"
+msgstr "Main gauche"
+
+#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
+msgid "Left handed Dvorak"
+msgstr "Dvorak pour gaucher"
+
+#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+msgid "Legacy"
+msgstr "Obsolète"
+
+#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
+msgid "Legacy Wang 724 keypad"
+msgstr "Clavier Wang 724 obsolète"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+msgid "Legacy key with comma"
+msgstr "Touche obsolète avec virgule"
+
+#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+msgid "Legacy key with dot"
+msgstr "Touche obsolète avec point"
+
+#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
+msgid "Legacy keypad"
+msgstr "Clavier obsolète"
+
+#: ../rules/base.xml.in.h:369 ../rules/evdev.xml.in.h:369
+msgid "Less-than/Greater-than is Compose."
+msgstr "Plus petit que/Plus grand que est Compose."
+
+#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+msgid "Lithuania"
+msgstr "Lituanie"
+
+#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
+msgid "Logitech Access Keyboard"
+msgstr "Clavier Logitech Access"
+
+#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (autre option)"
+
+#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:375 ../rules/evdev.xml.in.h:375
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (autre option 2)"
+
+#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Touches supplémentaires pour Logitech G15 via le démon G15"
+
+#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
+msgid "Logitech Generic Keyboard"
+msgstr "Clavier Logitech générique"
+
+#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Clavier Logitech Internet 350"
+
+#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
+msgid "Logitech Internet Keyboard"
+msgstr "Clavier Logitech Internet"
+
+#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Clavier Logitech Internet Navigator"
+
+#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
+msgid "Logitech Media Elite Keyboard"
+msgstr "Clavier Logitech Media Elite"
+
+#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Clavier Logitech sans-fil Ultra-X Media"
+
+#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Clavier Logitech Ultra-X"
+
+#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Clavier Logitech diNovo Edge"
+
+#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
+msgid "Logitech diNovo Keyboard"
+msgstr "Clavier Logitech diNovo"
+
+#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless (modèle Y-RB6)"
+
+#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech Internet Navigator iTouch SE"
+
+#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech Internet Navigator iTouch SE (USB)"
+
+#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
+msgid "MNE"
+msgstr "MNE"
+
+#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
+
+#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
+msgid "Macedonia"
+msgstr "Macédoine"
+
+#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
+msgid "Macintosh"
+msgstr "Apple-Macintosh"
+
+#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
+msgid "Macintosh Old"
+msgstr "Apple-Macintosh ancien"
+
+#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, touches mortes Sun"
+
+#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, sans touches mortes"
+
+#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Faire de la touche Verr. maj. une touche Ctrl supplémentaire."
+
+#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
+msgid "Malayalam Lalitha"
+msgstr "Malayalam Lalitha"
+
+#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
+msgid "Maldives"
+msgstr "Maldives"
+
+#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
+msgid "Malta"
+msgstr "Malte"
+
+#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
+msgid "Maltese keyboard with US layout"
+msgstr "Clavier maltais avec disposition US"
+
+#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
+msgid "Maori"
+msgstr "Maori"
+
+#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access"
+
+#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
+msgid "Menu is Compose."
+msgstr "Menu est Compose."
+
+#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
+msgid "Menu key changes layout."
+msgstr "La touche Menu change de disposition."
+
+#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
+msgid "Meta is mapped to the Win-keys."
+msgstr "Méta est obtenu avec n'importe quelle touche Logo."
+
+#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
+msgid "Meta is mapped to the left Win-key."
+msgstr "Méta est obtenu avec la touche Logo de gauche."
+
+#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
+msgid "Microsoft Internet Keyboard"
+msgstr "Clavier Microsoft Internet"
+
+#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Clavier Microsoft Internet Pro, suédois"
+
+#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Clavier Microsoft Natural Elite"
+
+#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Clavier Microsoft Natural Pro / Clavier Microsoft Internet Pro"
+
+#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Clavier Microsoft Natural Pro OEM"
+
+#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Clavier Microsoft Natural Pro USB / Clavier Microsoft Internet Pro"
+
+#: ../rules/base.xml.in.h:428 ../rules/evdev.xml.in.h:428
+msgid "Microsoft Office Keyboard"
+msgstr "Clavier Microsoft Office"
+
+#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Clavier Microsoft Multimedia sans fil 1.0A"
+
+#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+msgid "Miscellaneous compatibility options"
+msgstr "Diverses options de compatibilité"
+
+#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
+msgid "Mongolia"
+msgstr "Mongolie"
+
+#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
+msgid "Montenegro"
+msgstr "Serbie-et-Monténégro"
+
+#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
+msgid "Morocco"
+msgstr "Maroc"
+
+#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
+msgid "Multilingual"
+msgstr "Multilingue"
+
+#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
+msgid "Multilingual, first part"
+msgstr "Multilingue, partie 1"
+
+#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
+msgid "Multilingual, second part"
+msgstr "Multilingue, partie 2"
+
+#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
+msgid "NICOLA-F style Backspace"
+msgstr "Ret. Arr. de style NICOLA-F"
+
+#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
+msgid "Neostyle"
+msgstr "Neostyle"
+
+#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
+msgid "Nepal"
+msgstr "Népal"
+
+#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
+msgid "Netherlands"
+msgstr "Pays-Bas"
+
+#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
+msgid "Nig"
+msgstr "Nig"
+
+#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
+msgid "Northern Saami"
+msgstr "Sami du Nord"
+
+#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Sami du Nord, sans touches mortes"
+
+#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
+msgid "Norway"
+msgstr "Norvège"
+
+#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
+msgid "NumLock LED shows alternative layout."
+msgstr "Le témoin lumineux de verrouillage numérique indique une disposition alternative."
+
+#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
+msgid "Numeric keypad delete key behaviour"
+msgstr "Comportement de la touche de suppression du clavier numérique"
+
+#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
+msgid "Numeric keypad keys work as with Mac."
+msgstr "Les touches du pavé numérique se comportent comme sur Mac."
+
+#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
+msgid "Numeric keypad layout selection"
+msgstr "Sélection de groupe du clavier numérique"
+
+#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
+msgid "OLPC"
+msgstr "OLPC"
+
+#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
+msgid "OLPC Dari"
+msgstr "OLPC Dari"
+
+#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
+msgid "OLPC Pashto"
+msgstr "OLPC Pashto"
+
+#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
+msgid "OLPC Southern Uzbek"
+msgstr "OLPC Ouzbek du Sud"
+
+#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Clavier Internet Ortek MCK-800 MM"
+
+#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+msgid "Ossetian"
+msgstr "Ossétie"
+
+#: ../rules/base.xml.in.h:469 ../rules/evdev.xml.in.h:469
+msgid "Ossetian, Winkeys"
+msgstr "Ossétie avec touches Logo"
+
+#: ../rules/base.xml.in.h:470 ../rules/evdev.xml.in.h:470
+msgid "Ossetian, legacy"
+msgstr "(Obsolète) Ossétie"
+
+#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+msgid "PC-98xx Series"
+msgstr "PC-98xx Series"
+
+#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:473 ../rules/evdev.xml.in.h:473
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:474 ../rules/evdev.xml.in.h:474
+msgid "Pashto"
+msgstr "Pashto"
+
+#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
+msgid "Phonetic"
+msgstr "Phonétique"
+
+#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
+msgid "Poland"
+msgstr "Pologne"
+
+#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
+msgid "Polytonic"
+msgstr "Polytonique"
+
+#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+msgid "Portugal"
+msgstr "Portugal"
+
+#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "La touche Alt de gauche sélectionne le 3e niveau."
+
+#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "La touche Logo de gauche sélectionne le 3e niveau."
+
+#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
+msgid "Press Menu key to choose 3rd level."
+msgstr "La touche Menu sélectionne le 3e niveau."
+
+#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "La touche Alt de droite (AltGr) sélectionne le 3e niveau, une touche Maj. et la touche Atl de droite est la touche Compose."
+
+#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "La touche Alt de droite (AltGr) sélectionne le 3e niveau."
+
+#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "La touche Ctrl de droite sélectionne le 3e niveau."
+
+#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "La touche Logo de droite sélectionne le 3e niveau."
+
+#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "N'importe quelle touche Alt sélectionne le 3e niveau."
+
+#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "N'importe quelle touche Logo sélectionne le 3e niveau."
+
+#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
+msgid "Pro Keypad"
+msgstr "Pavé Pro"
+
+#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
+msgid "Programmer Dvorak"
+msgstr "Programmeur Dvorak"
+
+#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
+msgid "R-Alt switches layout while pressed."
+msgstr "Maintenir la touche Alt de droite enfoncée change de disposition."
+
+#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
+msgid "Right Alt is Compose."
+msgstr "La touche Alt de droite est Compose."
+
+#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
+msgid "Right Alt key changes layout."
+msgstr "La touche Alt de droite change de disposition."
+
+#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
+msgid "Right Alt key never chooses 3rd level."
+msgstr "La touche Alt de droite ne sélectionne jamais le 3e niveau."
+
+#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
+msgid "Right Ctrl is Compose."
+msgstr "La touche Ctrl de droite est Compose."
+
+#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
+msgid "Right Ctrl key changes layout."
+msgstr "La touche Ctrl de droite change de disposition."
+
+#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "Maintenir la touche Ctrl de droite enfoncée change de disposition."
+
+#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
+msgid "Right Ctrl key works as Right Alt."
+msgstr "La touche Ctrl de droite se comporte comme la touche Alt de droite."
+
+#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
+msgid "Right Shift key changes layout."
+msgstr "La touche Maj. de droite change de disposition."
+
+#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
+msgid "Right Win-key changes layout."
+msgstr "La touche Logo de droite change de disposition."
+
+#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
+msgid "Right Win-key is Compose."
+msgstr "La touche Logo de droite est Compose."
+
+#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
+msgid "Right Win-key switches layout while pressed."
+msgstr "Maintenir la touche Logo de droite enfoncée change de disposition."
+
+#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+msgid "Right hand"
+msgstr "Main droite"
+
+#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
+msgid "Right handed Dvorak"
+msgstr "Dvorak pour droitier"
+
+#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
+msgid "Romania"
+msgstr "Roumanie"
+
+#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
+msgid "Romanian keyboard with German letters"
+msgstr "Clavier roumain avec lettres allemandes"
+
+#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Clavier roumain avec lettres allemandes, sans touches mortes"
+
+#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+msgid "Russia"
+msgstr "Russie"
+
+#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+msgid "Russian"
+msgstr "Russe"
+
+#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+msgid "Russian phonetic"
+msgstr "Phonétique russe"
+
+#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+msgid "Russian phonetic Dvorak"
+msgstr "Dvorak phonétique russe"
+
+#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Phonétique russe, sans lettres mortes"
+
+#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+msgid "Russian with Kazakh"
+msgstr "Russe avec kazakh"
+
+#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia sans fil"
+
+#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
+msgid "ScrollLock LED shows alternative layout."
+msgstr "Le témoin lumineux d'Arrêt défil. indique une disposition différente."
+
+#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
+msgid "Serbia"
+msgstr "Serbie"
+
+#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
+msgid "Shift cancels CapsLock."
+msgstr "Interchanger Ctrl et Verr. maj."
+
+#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "La touche Maj. avec le pavé numérique se comporte comme dans MS Windows."
+
+#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
+msgid "Shift+CapsLock changes layout."
+msgstr "Les touches Maj.+Verr. maj. changent de disposition."
+
+#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
+msgid "Simple"
+msgstr "Simple"
+
+#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
+msgid "Slovakia"
+msgstr "Slovaquie"
+
+#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
+msgid "Slovenia"
+msgstr "Slovénie"
+
+#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
+msgid "South Africa"
+msgstr "Afrique du Sud"
+
+#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
+msgid "Southern Uzbek"
+msgstr "Ouzbek du Sud"
+
+#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "La barre d'espacement renvoie une espace insécable au 4e niveau et une espace fine insécable au 6e niveau"
+
+#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift"
+msgstr "La barre d'espacement renvoie une espace insécable au 4e niveau et une espace fine insécable au 6e niveau (par les touches Ctrl+Maj.)"
+
+#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr "La barre d'espacement renvoie une espace insécable au 4e niveau."
+
+#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
+msgid "Space key outputs non-breakable space character at second level."
+msgstr "La barre d'espacement renvoie une espace insécable au 2e niveau."
+
+#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr "La barre d'espacement renvoie une espace insécable au 3e niveau et rien au 4e niveau."
+
+#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "La barre d'espacement renvoie une espace insécable au 3e niveau et une espace fine insécable au 4e niveau"
+
+#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
+msgid "Space key outputs non-breakable space character at third level."
+msgstr "La barre d'espacement renvoie une espace insécable au 3e niveau."
+
+#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
+msgid "Space key outputs usual space at any level."
+msgstr "La barre d'espacement renvoie une espace ordinaire à tous les niveaux."
+
+#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+msgid "Spain"
+msgstr "Espagne"
+
+#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Les combinaisons spéciales (Ctrl+Alt+&lt;touche&gt;) sont traitées par un serveur."
+
+#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
+msgid "Standard"
+msgstr "Standard"
+
+#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
+msgid "Standard (Cedilla)"
+msgstr "Standard (cédille)"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
+msgid "Standard RSTU"
+msgstr "Standard RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:560 ../rules/evdev.xml.in.h:560
+msgid "Standard RSTU on Russian layout"
+msgstr "Standard RSTU avec une disposition russe"
+
+#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
+msgid "Sun Type 5/6"
+msgstr "Sun Type 5/6"
+
+#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
+msgid "Sun dead keys"
+msgstr "Touches mortes Sun"
+
+#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
+msgid "Super Power Multimedia Keyboard"
+msgstr "Multimedia Super Power"
+
+#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
+msgid "Super is mapped to the Win-keys."
+msgstr "Super est obtenu avec n'importe quelle touche Logo."
+
+#: ../rules/base.xml.in.h:565 ../rules/evdev.xml.in.h:565
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:567 ../rules/evdev.xml.in.h:567
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
+msgid "Swap Ctrl and CapsLock."
+msgstr "Interchanger Ctrl et Verr. maj."
+
+#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
+msgid "Swap ESC and CapsLock."
+msgstr "Interchanger ESC et Verr. maj."
+
+#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr "Échange les codes de deux touches pour les claviers Mac mal reconnus par le noyau."
+
+#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
+msgid "Swe"
+msgstr "Sué"
+
+#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+msgid "Sweden"
+msgstr "Suède"
+
+#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
+msgid "Switzerland"
+msgstr "Suisse"
+
+#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+msgid "Syria"
+msgstr "Syrie"
+
+#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+msgid "Syriac"
+msgstr "Syriaque"
+
+#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
+msgid "Syriac phonetic"
+msgstr "Phonétique syriaque"
+
+#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
+msgid "Tajikistan"
+msgstr "Tadjikistan"
+
+#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
+msgid "Tamil"
+msgstr "Tamoul"
+
+#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
+msgid "Tamil TAB Typewriter"
+msgstr "Machine à écrire tamoule TAB"
+
+#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
+msgid "Tamil TSCII Typewriter"
+msgstr "Machine à écrire tamoule TSCII"
+
+#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
+msgid "Tamil Unicode"
+msgstr "Unicode tamoul"
+
+#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
+msgid "Tatar"
+msgstr "Tatar"
+
+#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
+msgid "Thailand"
+msgstr "Thaïlande"
+
+#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
+msgid "Third level choosers"
+msgstr "Sélecteur du 3e niveau"
+
+#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
+msgid "Tibetan"
+msgstr "Tibétain"
+
+#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibétain (avec touches numériques ASCII)"
+
+#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
+msgid "Tifinagh Alternative"
+msgstr "Tifinagh alternatif"
+
+#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Tifinagh avec phonétique alternative"
+
+#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
+msgid "Tifinagh Extended"
+msgstr "Tifinagh étendu"
+
+#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
+msgid "Tifinagh Extended Phonetic"
+msgstr "Tifinagh avec phonétique étendue"
+
+#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
+msgid "Tifinagh Phonetic"
+msgstr "Tifinagh phonétique"
+
+#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
+msgid "Tilde (~) variant"
+msgstr "Variante avec tilde"
+
+#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access"
+
+#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Classic"
+
+#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
+msgid "Turkey"
+msgstr "Turquie"
+
+#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
+msgid "Typewriter"
+msgstr "Machine à écrire"
+
+#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
+msgid "UCW layout (accented letters only)"
+msgstr "Disposition UCW (lettres accentuées seulement)"
+
+#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Clavier US avec digraphes bosniaques"
+
+#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
+msgid "US keyboard with Bosnian letters"
+msgstr "Clavier US avec lettres bosniaques"
+
+#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
+msgid "US keyboard with Croatian digraphs"
+msgstr "Clavier US avec digraphes croates"
+
+#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
+msgid "US keyboard with Croatian letters"
+msgstr "Clavier US avec lettres croates"
+
+#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
+msgid "US keyboard with Estonian letters"
+msgstr "Clavier US avec lettres estoniennes"
+
+#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
+msgid "US keyboard with Lithuanian letters"
+msgstr "Clavier US avec lettres lituaniennes"
+
+#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Clavier US avec digraphes slovènes"
+
+#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
+msgid "US keyboard with Slovenian letters"
+msgstr "Clavier US avec lettres slovènes"
+
+#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
+msgid "Udmurt"
+msgstr "Oudmourte"
+
+#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
+msgid "Ukraine"
+msgstr "Ukraine"
+
+#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
+msgid "United Kingdom"
+msgstr "Royaume-Uni"
+
+#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
+msgid "Urdu"
+msgstr "Ourdou"
+
+#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
+msgid "Use Bosnian digraphs"
+msgstr "Avec digraphes bosniaques"
+
+#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
+msgid "Use Croatian digraphs"
+msgstr "Avec digraphes croates"
+
+#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
+msgid "Use Slovenian digraphs"
+msgstr "Avec digraphes slovènes"
+
+#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
+msgid "Use guillemets for quotes"
+msgstr "Remplacer les guillemets droits avec les guillements français"
+
+#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Utiliser les voyants lumineux du clavier pour afficher une disposition alternative."
+
+#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
+msgid "Using space key to input non-breakable space character"
+msgstr "Utiliser la barre d'espacement pout insérer un espace insécable"
+
+#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+msgid "Uzbekistan"
+msgstr "Ouzbékistan"
+
+#: ../rules/base.xml.in.h:630 ../rules/evdev.xml.in.h:630
+msgid "Vietnam"
+msgstr "Viêt Nam"
+
+#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "Clavier Internet ViewSonic KU-306"
+
+#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Clavier Wang 724 avec ajouts Unicode (touches fléchées et opérateurs mathématiques)"
+
+#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Clavier Wang 724 avec ajouts Unicode (touches fléchées et opérateurs mathématiques). Les opérateurs mathématiques se trouvent sur le niveau par défaut."
+
+#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+msgid "Wang model 724 azerty"
+msgstr "Modèle Wang 724 azerty"
+
+#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+msgid "Western"
+msgstr "Occidentale"
+
+#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
+msgid "Winkeys"
+msgstr "Touches Logo"
+
+#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
+msgid "With &lt;\\|&gt; key"
+msgstr "Avec la touche &lt;\\|&gt;"
+
+#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
+msgid "With EuroSign on 5"
+msgstr "Avec le signe Euro sur la touche 5."
+
+#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+msgid "With guillemets"
+msgstr "Avec guillemets"
+
+#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
+msgid "Yahoo! Internet Keyboard"
+msgstr "Clavier Yahoo! Internet"
+
+#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+msgid "Yakut"
+msgstr "Yacoute"
+
+#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
+msgid "Yoruba"
+msgstr "Yoruba"
+
+#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
+msgid "Z and ZHE swapped"
+msgstr "Z et ZHE permutés"
+
+#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
+msgid "azerty/digits"
+msgstr "azerty/chiffres"
+
+#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
+msgid "digits"
+msgstr "chiffres"
+
+#: ../rules/base.xml.in.h:650 ../rules/evdev.xml.in.h:650
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "(Obsolète) Point-virgule et guillemets droits déplacés"
+
+#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, contre-oblique étendue"
+
+#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
+msgid "qwerty/digits"
+msgstr "qwerty/chiffres"
+
+#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
+msgid "qwertz"
+msgstr "qwertz"
+
+#~ msgid "(Legacy) Dvorak"
+#~ msgstr "(Obsolète) Dvorak"
+
+#~ msgid "Acer TravelMate 800"
+#~ msgstr "Acer TravelMate 800"
+
+#~ msgid "Adding the nobreakspace keysym to space key"
+#~ msgstr "Ajout de l'espace insécable sur la barre d'espace"
+
+#~ msgid "Dnk"
+#~ msgstr "Dnk"
+
+#~ msgid "Group Shift/Lock behavior"
+#~ msgstr "Combinaisons pour changer de groupe"
+
+#~ msgid "Kotoistus"
+#~ msgstr "Kotoistus"
+
+#~ msgid "Kyr"
+#~ msgstr "Kyr"
+
+#~ msgid "Lva"
+#~ msgstr "Lva"
+
+#~ msgid "PowerPC PS/2"
+#~ msgstr "PowerPC PS/2"
+
+#~ msgid "SCG"
+#~ msgstr "SCG"
+
+#~ msgid "U.S. English"
+#~ msgstr "Anglais U.S."
+
+#~ msgid "Macintosh layout"
+#~ msgstr "Disposition Apple-Macintosh"
+
+#~ msgid "Logitech Deluxe Access Keyboard"
+#~ msgstr "Logitech Deluxe Access"
+
+#~ msgid "Logitech iTouch keyboard Internet Navigator"
+#~ msgstr "Logitech iTouch Internet Navigator"
+
+#~ msgid "Power G5"
+#~ msgstr "Power G5"
+
+#~ msgid "US keyboard with Maltian letters"
+#~ msgstr "Clavier US avec lettres maltaises"
+
+#~ msgid "si1452"
+#~ msgstr "si1452"
diff --git a/xorg-server/xkbdata.src/po/hu.po b/xorg-server/xkbdata.src/po/hu.po
new file mode 100644
index 000000000..f52c67bd5
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/hu.po
@@ -0,0 +1,2625 @@
+# translation of xkeyboard-config to Hungarian
+# Copyright (C) 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+#
+# Andras Timar <timar@fsf.hu>, 2004.
+# Szilveszter Farkas <Szilveszter.Farkas@gmail.com>, 2006.
+# Gabor Kelemen <kelemeng@gnome.hu>, 2006, 2007, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.4-pre1\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2008-09-15 23:52+0100\n"
+"PO-Revision-Date: 2008-09-20 23:37+0200\n"
+"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
+"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#: ../rules/base.xml.in.h:1 ../rules/evdev.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2 ../rules/evdev.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(Hagyományos) Alternatív"
+
+#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Hagyományos) Alternatív, Sun halott billentyűk"
+
+#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Hagyományos) Alternatív, halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
+msgid "101/104 key Compatible"
+msgstr "101/104 gomb kompatibilis"
+
+#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/vessző/Halott billentyűk"
+
+#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/vessző/Halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/pont/Halott billentyűk"
+
+#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/pont/Halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/vessző/Halott billentyűk"
+
+#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/vessző/Halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/pont/Halott billentyűk"
+
+#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/pont/Halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/vessző/Halott billentyűk"
+
+#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/vessző/Halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/pont/Halott billentyűk"
+
+#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/pont/Halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/vessző/Halott billentyűk"
+
+#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/vessző/Halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/pont/Halott billentyűk"
+
+#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/pont/Halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:23 ../rules/evdev.xml.in.h:23
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
+msgid "ACPI Standard"
+msgstr "ACPI szabvány"
+
+#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
+msgid "ATM/phone-style hexadecimal keypad"
+msgstr "ATM/telefon stílusú hexadecimális billentyűzet"
+
+#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
+msgid "Acer Laptop"
+msgstr "Acer noteszgép"
+
+#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
+msgid "Add the EuroSign to the 2 key."
+msgstr "Az Euro jel hozzáadása a 2 billentyűhöz."
+
+#: ../rules/base.xml.in.h:32 ../rules/evdev.xml.in.h:32
+msgid "Add the EuroSign to the 4 key."
+msgstr "Az Euro jel hozzáadása a 4 billentyűhöz."
+
+#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "Az Euro jel hozzáadása az 5 billentyűhöz."
+
+#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "Az Euro jel hozzáadása az E billentyűhöz."
+
+#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "A standard funkcionalitás hozzáadása a Menü gombhoz."
+
+#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Az Euro jel hozzáadása bizonyos billentyűkhöz"
+
+#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38 ../rules/evdev.xml.in.h:38
+msgid "Afg"
+msgstr "Afg"
+
+#: ../rules/base.xml.in.h:39 ../rules/evdev.xml.in.h:39
+msgid "Afghanistan"
+msgstr "Afganisztán"
+
+#: ../rules/base.xml.in.h:40 ../rules/evdev.xml.in.h:40
+msgid "Akan"
+msgstr "akan"
+
+#: ../rules/base.xml.in.h:41 ../rules/evdev.xml.in.h:41
+msgid "Alb"
+msgstr "Alb"
+
+#: ../rules/base.xml.in.h:42 ../rules/evdev.xml.in.h:42
+msgid "Albania"
+msgstr "Albánia"
+
+#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Az Alt és Meta az Alt billentyűkön."
+
+#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Az Alt a jobb Win billentyűhöz van rendelve és a Super a menühöz."
+
+#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Az Alt+CapsLock kombináció megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Az Alt+Ctrl kombináció kiosztást vált."
+
+#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Az Alt+Shift kombináció kiosztást vált."
+
+#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Az Alt/Win billentyűk viselkedése"
+
+#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
+msgid "Alternative"
+msgstr "Alternatív"
+
+#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "Alternatív keleti"
+
+#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "Alternatív fonetikus"
+
+#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "Alternatív nemzetközi (korábban us_intl)"
+
+#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "Alternatív, Sun halott billentyűk"
+
+#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "Alternatív, halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "Alternatív, csak latin-9"
+
+#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "Aposztróf (') változat"
+
+#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Apple noteszgép"
+
+#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
+msgid "Arabic"
+msgstr "Arab"
+
+#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
+msgid "Armenia"
+msgstr "Örményország"
+
+#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "Asztúri változat középső pontos H és L karakterrel"
+
+#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
+msgid "Asus Laptop"
+msgstr "Asus noteszgép"
+
+#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
+msgid "Azerbaijan"
+msgstr "Azerbajdzsán"
+
+#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet billentyűzet"
+
+#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
+
+#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
+msgid "Baltic+"
+msgstr "Balti+"
+
+#: ../rules/base.xml.in.h:80 ../rules/evdev.xml.in.h:80
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
+msgid "Bangladesh"
+msgstr "Banglades"
+
+#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
+msgid "Belarus"
+msgstr "Fehéroroszország"
+
+#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
+msgid "Belgium"
+msgstr "Belgium"
+
+#: ../rules/base.xml.in.h:85 ../rules/evdev.xml.in.h:85
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
+msgid "Bengali"
+msgstr "Bengáli"
+
+#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
+msgid "Bengali Probhat"
+msgstr "Bengáli probhat"
+
+#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonomikus, Dvorak kiosztás"
+
+#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonomikus, Dvorak kiosztás, csak latin-9"
+
+#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
+msgid "Bhutan"
+msgstr "Bhután"
+
+#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Bibliai héber (Tiro)"
+
+#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
+msgid "Bosnia and Herzegovina"
+msgstr "Bosznia és Hercegovina"
+
+#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
+msgid "Both Alt keys together change layout."
+msgstr "A két Alt billentyű együtt változtatja meg a kiosztást."
+
+#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
+msgid "Both Ctrl keys together change layout."
+msgstr "A két Ctrl billentyű együtt változtatja meg a kiosztást."
+
+#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
+msgid "Both Shift keys together change layout."
+msgstr "A két Shift billentyű együtt változtatja meg a kiosztást."
+
+#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
+msgid "Both Win-keys switch layout while pressed."
+msgstr "A két Win billentyű lenyomva tartva megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
+msgid "Braille"
+msgstr "Braille"
+
+#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+msgid "Brazil"
+msgstr "Brazília"
+
+#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
+msgid "Brazilian ABNT2"
+msgstr "Brazil ABNT2"
+
+#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet billentyűzet"
+
+#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
+msgid "Bulgaria"
+msgstr "Bulgária"
+
+#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
+msgid "Cambodia"
+msgstr "Kambodzsa"
+
+#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
+msgid "Caps Lock is Compose."
+msgstr "Caps Lock Compose-ként működik."
+
+#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
+msgid "CapsLock LED shows alternative layout."
+msgstr "A CapsLock LED-je mutassa az alternatív csoportot."
+
+#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "A CapsLock Shiftként működik zárolással. A Shift szünetelteti a nagybetűsítést."
+
+#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "A CapsLock Shiftként működik zárolással. A Shift nem befolyásolja a nagybetűsítést."
+
+#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
+msgid "CapsLock just locks the Shift modifier."
+msgstr "A CapsLock csak zárolja a Shift módosítót."
+
+#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
+msgid "CapsLock key behavior"
+msgstr "A CapsLock billentyű használati módja"
+
+#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
+msgid "CapsLock key changes layout."
+msgstr "A CapsLock billentyű megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
+msgid "CapsLock switch to first layout, Shift+CapsLock switch to last layout."
+msgstr "A CapsLock vált az első kiosztásra, a Shift+CapsLock az utolsó kiosztásra."
+
+#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "A CapsLock átváltja a Shift-et, így minden billentyű érintett."
+
+#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "A CapsLock átváltja az ábécé szerinti karakterek nagybetűsítését."
+
+#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "A CapsLock belső nagybetűkre váltást használ. A Shift szünetelteti a nagybetűsítést."
+
+#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "A CapsLock belső nagybetűkre váltást használ. A Shift nem befolyásolja a nagybetűsítést."
+
+#: ../rules/base.xml.in.h:126 ../rules/evdev.xml.in.h:126
+msgid "Catalan variant with middle-dot L"
+msgstr "Katalán változat középső pontos L karakterrel"
+
+#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
+msgid "Cedilla"
+msgstr "Cedilla"
+
+#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+msgid "Cherokee"
+msgstr "Cherokee"
+
+#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (másik lehetőség)"
+
+#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet billentyűzet"
+
+#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
+msgid "China"
+msgstr "Kína"
+
+#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+msgid "Chuvash"
+msgstr "Csuvas"
+
+#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
+msgid "Chuvash Latin"
+msgstr "Csuvas latin"
+
+#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
+msgid "Classic"
+msgstr "Klasszikus"
+
+#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
+msgid "Classic Dvorak"
+msgstr "Klasszikus Dvorak"
+
+#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access billentyűzet"
+
+#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet billentyűzet (13 gombos)"
+
+#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet billentyűzet (18 gombos)"
+
+#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet billentyűzet (7 gombos)"
+
+#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq billentyűzet"
+
+#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
+msgid "Compose key position"
+msgstr "A kombináló (Compose) billentyű helyzete"
+
+#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
+msgid "Congo, Democratic Republic of the"
+msgstr "Kongói Demokratikus Köztársaság"
+
+#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "A Control billentyű a Win billentyűkhöz van rendelve (és a szokásos Ctrl billentyűkhöz)."
+
+#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
+msgid "Croatia"
+msgstr "Horvátország"
+
+#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
+msgid "Ctrl key at bottom left"
+msgstr "Ctrl billentyű bal oldalt, alul"
+
+#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
+msgid "Ctrl key at left of 'A'"
+msgstr "Ctrl billentyű az \"A\"-tól balra"
+
+#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
+msgid "Ctrl key position"
+msgstr "Ctrl billentyű helyzete"
+
+#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
+msgid "Ctrl+Shift change layout."
+msgstr "A Ctrl+Shift kombináció kiosztást vált."
+
+#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
+msgid "Cyrillic"
+msgstr "Cirill"
+
+#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
+msgid "Cyrillic with guillemets"
+msgstr "Cirill, »csúcsos« idézőjelekkel"
+
+#: ../rules/base.xml.in.h:161 ../rules/evdev.xml.in.h:161
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Cirill, a Z és a ZHE felcserélve"
+
+#: ../rules/base.xml.in.h:162 ../rules/evdev.xml.in.h:162
+msgid "Cze"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
+msgid "Czechia"
+msgstr "Csehország"
+
+#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
+msgid "Dan"
+msgstr "Dan"
+
+#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
+msgid "Dead acute"
+msgstr "Halott vessző (´) ékezet"
+
+#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
+msgid "Dead grave acute"
+msgstr "Halott grave (`) ékezet"
+
+#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
+msgid "Default numeric keypad keys."
+msgstr "Alapértelmezett számbillentyűk."
+
+#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
+msgid "Dell 101-key PC"
+msgstr "Dell 101-gombos PC"
+
+#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Inspiron 6xxx/8xxx noteszgép"
+
+#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Precision M sorozatú noteszgép"
+
+#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude sorozatú noteszgép"
+
+#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB multimédia-billentyűzet"
+
+#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
+msgid "Denmark"
+msgstr "Dánia"
+
+#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
+msgid "Deu"
+msgstr "Deu"
+
+#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop billentyűzet"
+
+#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 sorozat"
+
+#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+msgid "Dvorak"
+msgstr "Dvorak-féle"
+
+#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+msgid "Dvorak (UK Punctuation)"
+msgstr "Dvorak (UK központozás)"
+
+#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+msgid "Dvorak international"
+msgstr "Nemzetközi Dvorak"
+
+#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak, lengyel idézőjelek az \"1/!\" billentyűn"
+
+#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, lengyel idézőjelek az idézőjel billentyűn"
+
+#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
+msgid "Eastern"
+msgstr "Keleti"
+
+#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
+msgid "Eliminate dead keys"
+msgstr "Halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
+msgid "Ergonomic"
+msgstr "Ergonomikus"
+
+#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
+msgid "Esperanto"
+msgstr "eszperantó"
+
+#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
+msgid "Estonia"
+msgstr "Észtország"
+
+#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
+msgid "Eth"
+msgstr "Eth"
+
+#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+msgid "Ethiopia"
+msgstr "Etiópia"
+
+#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
+msgid "Evdev-managed keyboard"
+msgstr "Evdev által felügyelt billentyűzet"
+
+#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
+msgid "Ewe"
+msgstr "ewe"
+
+#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
+msgid "Extended"
+msgstr "Kibővített"
+
+#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
+msgid "Extended Backslash"
+msgstr "Kibővített visszaper"
+
+#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
+msgid "F-letter (F) variant"
+msgstr "F-betűs (F) változat"
+
+#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
+msgid "Faroe Islands"
+msgstr "Feröer szigetek"
+
+#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
+msgid "Finland"
+msgstr "Finnország"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
+msgid "Four-level key with abstract separators"
+msgstr "Negyedik szintű billentyű absztrakt elválasztókkal"
+
+#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
+msgid "Four-level key with comma"
+msgstr "Negyedik szintű billentyű vesszővel"
+
+#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
+msgid "Four-level key with dot"
+msgstr "Negyedik szintű billentyű ponttal"
+
+#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+msgid "Four-level key with momayyez"
+msgstr "Negyedik szintű billentyű momayyez-val"
+
+#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
+msgid "France"
+msgstr "Franciaország"
+
+#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
+msgid "French"
+msgstr "Francia"
+
+#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
+msgid "French (Macintosh)"
+msgstr "Francia (Macintosh)"
+
+#: ../rules/base.xml.in.h:219 ../rules/evdev.xml.in.h:219
+msgid "French (legacy)"
+msgstr "Francia (hagyományos)"
+
+#: ../rules/base.xml.in.h:220 ../rules/evdev.xml.in.h:220
+msgid "French Dvorak"
+msgstr "Francia Dvorak"
+
+#: ../rules/base.xml.in.h:221 ../rules/evdev.xml.in.h:221
+msgid "French, Sun dead keys"
+msgstr "Francia, Sun halott billentyűk"
+
+#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
+msgid "French, eliminate dead keys"
+msgstr "Francia, halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
+msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
+msgstr "Fujitsu-Siemens Computers AMILO A1667G noteszgép"
+
+#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
+msgid "Fula"
+msgstr "Fula"
+
+#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
+msgid "Ga"
+msgstr "ga"
+
+#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
+msgid "Generic 101-key PC"
+msgstr "�ltalános 101 gombos PC"
+
+#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
+msgid "Generic 102-key (Intl) PC"
+msgstr "�ltalános 102 gombos (nemzetközi) PC"
+
+#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
+msgid "Generic 104-key PC"
+msgstr "�ltalános 104 gombos PC"
+
+#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
+msgid "Generic 105-key (Intl) PC"
+msgstr "�ltalános 105 gombos (nemzetközi) PC"
+
+#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
+msgid "Georgia"
+msgstr "Grúzia"
+
+#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
+msgid "Georgian"
+msgstr "Grúz"
+
+#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
+msgid "Georgian AZERTY Tskapo"
+msgstr "Grúz AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
+msgid "German (Macintosh)"
+msgstr "Német (Macintosh)"
+
+#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
+msgid "German, Sun dead keys"
+msgstr "Német, Sun halott billentyűk"
+
+#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
+msgid "German, eliminate dead keys"
+msgstr "Német, halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
+msgid "Germany"
+msgstr "Németország"
+
+#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
+msgid "Ghana"
+msgstr "Ghána"
+
+#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
+msgid "Greece"
+msgstr "Görögország"
+
+#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
+msgid "Group toggle on multiply/divide key"
+msgstr "Csoport átváltása a szorzás/osztás billentyűn"
+
+#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
+msgid "Gui"
+msgstr "Gui"
+
+#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
+msgid "Guinea"
+msgstr "Guinea"
+
+#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
+msgid "Gujarati"
+msgstr "Gudzsarati"
+
+#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
+msgid "Gurmukhi Jhelum"
+msgstr "Gurmukhi Jhelum"
+
+#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
+msgid "Gyration"
+msgstr "Forgás"
+
+#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking billentyűzet"
+
+#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking billenytűzet Mac-hez"
+
+#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
+msgid "Hausa"
+msgstr "hausza"
+
+#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet billentyűzet"
+
+#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
+msgid "Hewlett-Packard Internet Keyboard 5181"
+msgstr "Hewlett-Packard Internet billentyűzet 5181"
+
+#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
+msgid "Hewlett-Packard Internet Keyboard 5185"
+msgstr "Hewlett-Packard Internet billentyűzet 5185"
+
+#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 multimédia billentyűzet"
+
+#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet billentyűzet"
+
+#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
+msgid "Hindi Bolnagri"
+msgstr "Hindi Bolnagri"
+
+#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
+msgid "Homophonic"
+msgstr "Homofon"
+
+#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
+msgid "Hun"
+msgstr "Hun"
+
+#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
+msgid "Hungary"
+msgstr "Magyarország"
+
+#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
+msgid "Hyper is mapped to the Win-keys."
+msgstr "A Hyper a Win billentyűkhöz van rendelve."
+
+#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (másik lehetőség)"
+
+#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
+msgid "IBM Space Saver"
+msgstr "IBM helytakarékos"
+
+#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, nemzetközi"
+
+#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+msgid "ISO Alternate"
+msgstr "ISO Alternate"
+
+#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
+msgid "Iceland"
+msgstr "Izland"
+
+#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+msgid "India"
+msgstr "India"
+
+#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
+msgid "International (AltGr dead keys)"
+msgstr "Nemzetközi (AltGr halott billentyűkkel)"
+
+#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
+msgid "International (with dead keys)"
+msgstr "Nemzetközi (halott billentyűkkel)"
+
+#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+msgid "Iran"
+msgstr "Irán"
+
+#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
+msgid "Ireland"
+msgstr "�rország"
+
+#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
+msgid "Irq"
+msgstr "Irq"
+
+#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
+msgid "Israel"
+msgstr "Izrael"
+
+#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
+msgid "Italy"
+msgstr "Olaszország"
+
+#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
+msgid "Japan"
+msgstr "Japán"
+
+#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
+msgid "Japan (PC-98xx Series)"
+msgstr "Japán (PC-98xx sorozat)"
+
+#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
+msgid "Japanese 106-key"
+msgstr "Japán 106 gombos"
+
+#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
+msgid "Japanese keyboard options"
+msgstr "Japán billentyűzet-beállítások"
+
+#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
+msgid "Kana Lock key is locking"
+msgstr "A Kana zárolásbillentyű zárol"
+
+#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
+msgid "Kashubian"
+msgstr "Kasub"
+
+#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
+msgid "Kazakh with Russian"
+msgstr "kazah orosszal"
+
+#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
+msgid "Kazakhstan"
+msgstr "Kazahsztán"
+
+#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
+msgid "Keypad"
+msgstr "Számbillentyűzet"
+
+#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
+msgid "Keypad with unicode additions (arrows and math operators)"
+msgstr "Számbillentyűzet Unicode kiegészítésekkel (nyilak és műveleti jelek)"
+
+#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
+msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Számbillentyűzet Unicode kiegészítésekkel (nyilak és műveleti jelek). A műveleti jelek bekapcsolva az alapértelmezett szinten."
+
+#: ../rules/base.xml.in.h:320 ../rules/evdev.xml.in.h:320
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
+msgid "Khm"
+msgstr "Khm"
+
+#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
+msgid "Kir"
+msgstr "Kir"
+
+#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
+msgid "Komi"
+msgstr "Komi"
+
+#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
+msgid "Korea, Republic of"
+msgstr "Koreai köztársaság"
+
+#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
+msgid "Korean 106-key"
+msgstr "Koreai 106 gombos"
+
+#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
+msgid "Ktunaxa"
+msgstr "Ktunaxa"
+
+#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+msgid "Kurdish, (F)"
+msgstr "Kurd, (F)"
+
+#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+msgid "Kurdish, Arabic-Latin"
+msgstr "Kurd, arab-latin"
+
+#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Kurd, latin Alt-Q"
+
+#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
+msgid "Kurdish, Latin Q"
+msgstr "Kurd, latin Q"
+
+#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
+msgid "Kyrgyzstan"
+msgstr "Kirgizisztán"
+
+#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
+msgid "LCtrl+LShift change layout."
+msgstr "A bal Ctrl + bal Shift kombináció kiosztást vált."
+
+#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
+msgid "LEKP"
+msgstr "LEKP"
+
+#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
+msgid "LEKPa"
+msgstr "LEKPa"
+
+#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
+msgid "Laos"
+msgstr "Laosz"
+
+#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Compaq noteszgép (pl. Armada) noteszgép-billentyűzet"
+
+#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Compaq noteszgép (pl. Presario) Internet billentyűzet"
+
+#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "eMachines m68xx noteszgép"
+
+#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
+msgid "Latin"
+msgstr "Latin"
+
+#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
+msgid "Latin American"
+msgstr "Latin-amerikai"
+
+#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
+msgid "Latin Unicode"
+msgstr "Latin Unicode"
+
+#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
+msgid "Latin Unicode qwerty"
+msgstr "Latin Unicode qwerty"
+
+#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
+msgid "Latin qwerty"
+msgstr "Latin qwerty"
+
+#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
+msgid "Latin unicode"
+msgstr "Latin unicode"
+
+#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
+msgid "Latin unicode qwerty"
+msgstr "Latin unicode qwerty"
+
+#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
+msgid "Latin with guillemets"
+msgstr "Latin, »csúcsos« idézőjelekkel"
+
+#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
+msgid "Latvia"
+msgstr "Lettország"
+
+#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
+msgid "Lav"
+msgstr "Lav"
+
+#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
+msgid "Layout switching"
+msgstr "Kiosztásváltás"
+
+#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
+msgid "Left Alt is swapped with left Win-key."
+msgstr "A bal Alt fel van cserélve a bal Win billentyűvel."
+
+#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
+msgid "Left Alt key changes layout."
+msgstr "A bal Alt billentyű megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
+msgid "Left Alt key switches layout while pressed."
+msgstr "A bal Alt billentyű lenyomva tartva megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
+msgid "Left Ctrl key changes layout."
+msgstr "A bal Ctrl billentyű megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
+msgid "Left Shift key changes layout."
+msgstr "A bal Shift billentyű megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
+msgid "Left Win-key changes layout."
+msgstr "A bal Win billentyű megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
+msgid "Left Win-key is Compose."
+msgstr "A bal Win billentyű a kombináló (Compose)."
+
+#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
+msgid "Left Win-key switches layout while pressed."
+msgstr "A bal Win billentyű lenyomva tartva megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
+msgid "Left hand"
+msgstr "Balkezes"
+
+#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
+msgid "Left handed Dvorak"
+msgstr "Balkezes Dvorák"
+
+#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+msgid "Legacy"
+msgstr "Örökölt"
+
+#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
+msgid "Legacy Wang 724 keypad"
+msgstr "Hagyományos Wang 724 számbillentyűzet"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+msgid "Legacy key with comma"
+msgstr "Hagyományos számbillentyűzet vesszővel"
+
+#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+msgid "Legacy key with dot"
+msgstr "Hagyományos számbillentyűzet ponttal"
+
+#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
+msgid "Legacy keypad"
+msgstr "Hagyományos számbillentyűzet"
+
+#: ../rules/base.xml.in.h:369 ../rules/evdev.xml.in.h:369
+msgid "Less-than/Greater-than is Compose."
+msgstr "A kisebb mint/nagyobb mint a kombináló (Compose)."
+
+#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+msgid "Lithuania"
+msgstr "Litvánia"
+
+#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access billentyűzet"
+
+#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (másik lehetőség)"
+
+#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:375 ../rules/evdev.xml.in.h:375
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (harmadik lehetőség)"
+
+#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15, extra billentyűk a G15daemon közvetítésével"
+
+#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech általános billentyűzet"
+
+#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 billentyűzet"
+
+#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet billentyűzet"
+
+#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator billentyűzet"
+
+#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite billentyűzet"
+
+#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X vezeték nélküli asztali médiabillentyűzet"
+
+#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X billentyűzet"
+
+#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge billentyűzet"
+
+#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo billentyűzet"
+
+#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless billentyűzet (modell: Y-RB6)"
+
+#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
+msgid "MNE"
+msgstr "MNE"
+
+#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
+
+#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
+msgid "Macedonia"
+msgstr "Macedónia"
+
+#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
+msgid "Macintosh Old"
+msgstr "Macintosh Old"
+
+#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, Sun halott billentyűk"
+
+#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Caps Lock használata egy másik Ctrl-ként."
+
+#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
+msgid "Malayalam"
+msgstr "Malajalam"
+
+#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
+msgid "Malayalam Lalitha"
+msgstr "Malajalam lalitha"
+
+#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
+msgid "Maldives"
+msgstr "Maldív-szigetek"
+
+#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
+msgid "Malta"
+msgstr "Málta"
+
+#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
+msgid "Maltese keyboard with US layout"
+msgstr "Máltai billentyűzet egyesült államokbeli kiosztással"
+
+#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
+msgid "Maori"
+msgstr "Maori"
+
+#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access billentyűzet"
+
+#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
+msgid "Menu is Compose."
+msgstr "A Menü a kombináló (Compose)."
+
+#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
+msgid "Menu key changes layout."
+msgstr "A menü billentyű megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
+msgid "Meta is mapped to the Win-keys."
+msgstr "A Meta a Win billentyűkhöz van rendelve."
+
+#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
+msgid "Meta is mapped to the left Win-key."
+msgstr "A Meta a bal Win billentyűhöz van rendelve."
+
+#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet billentyűzet"
+
+#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, svéd"
+
+#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
+
+#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:428 ../rules/evdev.xml.in.h:428
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office billentyűzet"
+
+#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft vezeték nélküli multimédia billentyűzet 1.0A"
+
+#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+msgid "Miscellaneous compatibility options"
+msgstr "Egyéb kompatibilitási beállítások"
+
+#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
+msgid "Mongolia"
+msgstr "Mongólia"
+
+#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
+msgid "Montenegro"
+msgstr "Montenegró"
+
+#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
+msgid "Morocco"
+msgstr "Marokkó"
+
+#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
+msgid "Multilingual"
+msgstr "Többnyelvű"
+
+#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
+msgid "Multilingual, first part"
+msgstr "Többnyelvű, első rész"
+
+#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
+msgid "Multilingual, second part"
+msgstr "Többnyelvű, második rész"
+
+#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
+msgid "NICOLA-F style Backspace"
+msgstr "NICOLA-F stílusú backspace"
+
+#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
+msgid "Neostyle"
+msgstr "Neostyle"
+
+#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
+msgid "Nepal"
+msgstr "Nepál"
+
+#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
+msgid "Netherlands"
+msgstr "Hollandia"
+
+#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
+msgid "Nig"
+msgstr "Nig"
+
+#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
+msgid "Nigeria"
+msgstr "Nigéria"
+
+#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
+msgid "Northern Saami"
+msgstr "Északi szami"
+
+#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Északi szami, halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
+msgid "Norway"
+msgstr "Norvégia"
+
+#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
+msgid "NumLock LED shows alternative layout."
+msgstr "A NumLock LED mutatja az alternatív kiosztást."
+
+#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
+msgid "Numeric keypad delete key behaviour"
+msgstr "Számbillentyűzet Delete billentyűjének viselkedése"
+
+#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
+msgid "Numeric keypad keys work as with Mac."
+msgstr "A számbillentyűk úgy működjenek, mint Macen."
+
+#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
+msgid "Numeric keypad layout selection"
+msgstr "Számbillentyűzet kiosztásválasztása"
+
+#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
+msgid "OLPC"
+msgstr "OLPC"
+
+#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
+msgid "OLPC Dari"
+msgstr "OLPC Dari"
+
+#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
+msgid "OLPC Pashto"
+msgstr "OLPC Pastu"
+
+#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
+msgid "OLPC Southern Uzbek"
+msgstr "OLPC déli üzbég"
+
+#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
+msgid "Oriya"
+msgstr "Orija"
+
+#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet billentyűzet"
+
+#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+msgid "Ossetian"
+msgstr "Oszét"
+
+#: ../rules/base.xml.in.h:469 ../rules/evdev.xml.in.h:469
+msgid "Ossetian, Winkeys"
+msgstr "Oszét, win gombok"
+
+#: ../rules/base.xml.in.h:470 ../rules/evdev.xml.in.h:470
+msgid "Ossetian, legacy"
+msgstr "Oszét, örökölt"
+
+#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+msgid "PC-98xx Series"
+msgstr "PC-98xx Series"
+
+#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:473 ../rules/evdev.xml.in.h:473
+msgid "Pakistan"
+msgstr "Pakisztán"
+
+#: ../rules/base.xml.in.h:474 ../rules/evdev.xml.in.h:474
+msgid "Pashto"
+msgstr "Pastu"
+
+#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
+msgid "Phonetic"
+msgstr "Fonetikus"
+
+#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
+msgid "Poland"
+msgstr "Lengyelország"
+
+#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
+msgid "Polytonic"
+msgstr "Polytonic"
+
+#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+msgid "Portugal"
+msgstr "Portugália"
+
+#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "A bal Alt billentyűvel lehet a harmadik szintet választani."
+
+#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "A bal Win billentyűvel lehet a harmadik szintet választani."
+
+#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
+msgid "Press Menu key to choose 3rd level."
+msgstr "A Menü billentyűvel lehet a harmadik szintet választani."
+
+#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "A jobb Alt billentyűvel lehet a harmadik szintet választani, a Shift+jobb Alt kombináció a Multi_Key."
+
+#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "A jobb Win billentyűvel lehet a harmadik szintet választani."
+
+#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Jobb Ctrl választja ki a 3. szintet."
+
+#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "A jobb Win billentyűvel lehet a harmadik szintet választani."
+
+#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Bármelyik Alt billentyűvel lehet a harmadik szintet választani."
+
+#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Bármelyik Win billentyűvel lehet a harmadik szintet választani."
+
+#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
+msgid "Pro Keypad"
+msgstr "Pro számbillentyűzet"
+
+#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
+msgid "Programmer Dvorak"
+msgstr "Programozói Dvorak"
+
+#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
+msgid "R-Alt switches layout while pressed."
+msgstr "A jobb Alt billentyű lenyomva tartva megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
+msgid "Right Alt is Compose."
+msgstr "A jobb Alt a kombináló (Compose)."
+
+#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
+msgid "Right Alt key changes layout."
+msgstr "A jobb Alt billentyű megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
+msgid "Right Alt key never chooses 3rd level."
+msgstr "A jobb Alt billentyű sohasem választ harmadik szintet."
+
+#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
+msgid "Right Ctrl is Compose."
+msgstr "A jobb Ctrl a kombináló (Compose)."
+
+#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
+msgid "Right Ctrl key changes layout."
+msgstr "A jobb Ctrl billentyű megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "A jobb Ctrl billentyű lenyomva tartva megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Jobb Ctrl használata jobb Alt-ként."
+
+#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
+msgid "Right Shift key changes layout."
+msgstr "A jobb Shift billentyű megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
+msgid "Right Win-key changes layout."
+msgstr "A jobb Win billentyű megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
+msgid "Right Win-key is Compose."
+msgstr "A jobb Win billentyű a kombináló (Compose)."
+
+#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
+msgid "Right Win-key switches layout while pressed."
+msgstr "A jobb Win billentyű lenyomva tartva megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+msgid "Right hand"
+msgstr "Jobbkezes"
+
+#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
+msgid "Right handed Dvorak"
+msgstr "Jobbkezes Dvorák"
+
+#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
+msgid "Romania"
+msgstr "Románia"
+
+#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
+msgid "Romanian keyboard with German letters"
+msgstr "Román billentyűzet német betűkkel"
+
+#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Román billentyűzet német betűkkel, halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+msgid "Russia"
+msgstr "Oroszország"
+
+#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+msgid "Russian"
+msgstr "Orosz"
+
+#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+msgid "Russian phonetic"
+msgstr "Orosz fonetikus"
+
+#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+msgid "Russian phonetic Dvorak"
+msgstr "Orosz fonetikus Dvorak"
+
+#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Orosz fonetikus, halott billentyűk tiltása"
+
+#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+msgid "Russian with Kazakh"
+msgstr "orosz kazahhal"
+
+#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
+msgid "ScrollLock LED shows alternative layout."
+msgstr "A ScrollLock LED mutatja az alternatív kiosztást."
+
+#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
+msgid "Serbia"
+msgstr "Szerbia"
+
+#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
+msgid "Shift cancels CapsLock."
+msgstr "A Shift megszakítja a Caps Lock-ot."
+
+#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "A Shift+számbillentyűk úgy működjenek, mint az MS Windowsban."
+
+#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
+msgid "Shift+CapsLock changes layout."
+msgstr "A Shift+Caps Lock kombináció megváltoztatja a kiosztást."
+
+#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
+msgid "Simple"
+msgstr "Egyszerű"
+
+#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
+msgid "Slovakia"
+msgstr "Szlovákia"
+
+#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
+msgid "Slovenia"
+msgstr "Szlovénia"
+
+#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
+msgid "South Africa"
+msgstr "Dél-Afrika"
+
+#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
+msgid "Southern Uzbek"
+msgstr "déli üzbég"
+
+#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "A szóköz billentyű nem törhető szóközt ad a negyedik szinten, keskeny nem törhető szóközt a hatodik szinten"
+
+#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift"
+msgstr "A szóköz billentyű nem törhető szóközt ad a negyedik szinten, keskeny nem törhető szóközt a hatodik szinten (a Ctrl+Shift segítségével)"
+
+#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr "A szóköz billentyű nem törhető szóközt ad a negyedik szinten."
+
+#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
+msgid "Space key outputs non-breakable space character at second level."
+msgstr "A szóköz billenytű nem törhető szóközt ad a második szinten."
+
+#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr "A szóköz billenytű nem törhető szóközt ad a harmadik szinten és semmit nem ad a negyediken."
+
+#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "A szóköz billentyű nem törhető szóközt ad a harmadik szinten, keskeny nem törhető szóközt a negyedik szinten"
+
+#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
+msgid "Space key outputs non-breakable space character at third level."
+msgstr "A szóköz billentyű nem törhető szóközt ad a harmadik szinten."
+
+#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
+msgid "Space key outputs usual space at any level."
+msgstr "A szóköz hagyományos szóközt ad bármely szinten."
+
+#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+msgid "Spain"
+msgstr "Spanyolország"
+
+#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "A speciális billentyűket (Ctrl+Alt+&lt;billentyű&gt;) a kiszolgáló kezeli."
+
+#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
+msgid "Standard"
+msgstr "Szabványos"
+
+#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
+msgid "Standard (Cedilla)"
+msgstr "Szabványos (cédille)"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
+msgid "Standard RSTU"
+msgstr "Szabványos RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:560 ../rules/evdev.xml.in.h:560
+msgid "Standard RSTU on Russian layout"
+msgstr "Szabványos RSTU orosz kiosztáson"
+
+#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
+msgid "Sun Type 5/6"
+msgstr "Sun Type 5/6"
+
+#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
+msgid "Sun dead keys"
+msgstr "Sun halott billentyűk"
+
+#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power multimédia billentyűzet"
+
+#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
+msgid "Super is mapped to the Win-keys."
+msgstr "A Super a Win billentyűkhöz van rendelve."
+
+#: ../rules/base.xml.in.h:565 ../rules/evdev.xml.in.h:565
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:567 ../rules/evdev.xml.in.h:567
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
+msgid "Swap Ctrl and CapsLock."
+msgstr "Ctrl és Caps Lock felcserélése."
+
+#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
+msgid "Swap ESC and CapsLock."
+msgstr "ESC és Caps Lock felcserélése."
+
+#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr "Két billentyű kódjának felcserélése, ha a kernel rosszul észleli a Mac billentyűzetet."
+
+#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+msgid "Sweden"
+msgstr "Svédország"
+
+#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
+msgid "Switzerland"
+msgstr "Svájc"
+
+#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+msgid "Syria"
+msgstr "Szíria"
+
+#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+msgid "Syriac"
+msgstr "Szír"
+
+#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
+msgid "Syriac phonetic"
+msgstr "Szír fonetikus"
+
+#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
+msgid "Tajikistan"
+msgstr "Tádzsikisztán"
+
+#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
+msgid "Tamil TAB Typewriter"
+msgstr "Tamil TAB írógép"
+
+#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamil TSCII írógép"
+
+#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
+msgid "Tamil Unicode"
+msgstr "Tamil Unicode"
+
+#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
+msgid "Tatar"
+msgstr "tatár"
+
+#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
+msgid "Thailand"
+msgstr "Thaiföld"
+
+#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
+msgid "Third level choosers"
+msgstr "Harmadik szintű választók"
+
+#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
+msgid "Tibetan"
+msgstr "Tibeti"
+
+#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibeti (ASCII számjegyekkel)"
+
+#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
+msgid "Tifinagh Alternative"
+msgstr "Alternatív Tifinagh"
+
+#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Alternatív fonetikus Tifinagh"
+
+#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
+msgid "Tifinagh Extended"
+msgstr "Kibővített Tifinagh"
+
+#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
+msgid "Tifinagh Extended Phonetic"
+msgstr "Kibővített fonetikus Tifinagh"
+
+#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
+msgid "Tifinagh Phonetic"
+msgstr "Fonetikus Tifinagh"
+
+#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
+msgid "Tilde (~) variant"
+msgstr "Tilde (~) változat"
+
+#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access billentyűzet"
+
+#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
+msgid "Turkey"
+msgstr "Törökország"
+
+#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
+msgid "Typewriter"
+msgstr "�rógép"
+
+#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
+msgid "UCW layout (accented letters only)"
+msgstr "UCW kiosztás (csak ékezetes betűk)"
+
+#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
+msgid "US keyboard with Bosnian digraphs"
+msgstr "US billentyűzet bosnyák billentyűkombinációkkal"
+
+#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
+msgid "US keyboard with Bosnian letters"
+msgstr "US billentyűzet bosnyák betűkkel"
+
+#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
+msgid "US keyboard with Croatian digraphs"
+msgstr "US billentyűzet horvát billentyűkombinációkkal"
+
+#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
+msgid "US keyboard with Croatian letters"
+msgstr "US billentyűzet horvát betűkkel"
+
+#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
+msgid "US keyboard with Estonian letters"
+msgstr "US billentyűzet észt betűkkel"
+
+#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
+msgid "US keyboard with Lithuanian letters"
+msgstr "US billentyűzet litván betűkkel"
+
+#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
+msgid "US keyboard with Slovenian digraphs"
+msgstr "US billentyűzet szlovén billentyűkombinációkkal"
+
+#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
+msgid "US keyboard with Slovenian letters"
+msgstr "US billentyűzet szlovén betűkkel"
+
+#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
+msgid "Udmurt"
+msgstr "Udmurt"
+
+#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
+msgid "Ukraine"
+msgstr "Ukrajna"
+
+#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
+msgid "United Kingdom"
+msgstr "Egyesült Királyság"
+
+#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
+msgid "Use Bosnian digraphs"
+msgstr "Bosnyák billentyűkombinációk használata"
+
+#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
+msgid "Use Croatian digraphs"
+msgstr "Horvát billentyűkombinációk használata"
+
+#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
+msgid "Use Slovenian digraphs"
+msgstr "Szlovén billentyűkombinációk használata"
+
+#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
+msgid "Use guillemets for quotes"
+msgstr "»Csúcsos« idézőjelek használata idézetekhez"
+
+#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Az alternatív kiosztás mutatása a billentyűzet LED-ek használatával."
+
+#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
+msgid "Using space key to input non-breakable space character"
+msgstr "A szóköz billenytű használata nem törhető szóköz bevitelére"
+
+#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+msgid "Uzbekistan"
+msgstr "Üzbegisztán"
+
+#: ../rules/base.xml.in.h:630 ../rules/evdev.xml.in.h:630
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet billentyűzet"
+
+#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Wang 724 numerikus billentyűzet unicode bővítésekkel (nyilak és műveleti jelek)"
+
+#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Wang 724 numerikus billentyűzet unicode bővítésekkel (nyilak és műveleti jelek). A műveleti jelek az alapértelmezett szinten."
+
+#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+msgid "Wang model 724 azerty"
+msgstr "Wang 724-es modell, azerty"
+
+#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+msgid "Western"
+msgstr "Nyugati"
+
+#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
+msgid "Winkeys"
+msgstr "Winkeys"
+
+#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
+msgid "With &lt;\\|&gt; key"
+msgstr "Az &lt;\\|&gt; billentyűvel"
+
+#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
+msgid "With EuroSign on 5"
+msgstr "Euro jel az 5-ös billentyűn"
+
+#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+msgid "With guillemets"
+msgstr "»Csúcsos« idézőjelekkel"
+
+#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet billentyűzet"
+
+#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+msgid "Yakut"
+msgstr "Jakut"
+
+#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
+msgid "Yoruba"
+msgstr "Joruba"
+
+#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
+msgid "Z and ZHE swapped"
+msgstr "A Z és a ZHE felcserélve"
+
+#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+msgid "azerty"
+msgstr "Azerty"
+
+#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
+msgid "azerty/digits"
+msgstr "Azerty/számjegyek"
+
+#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
+msgid "digits"
+msgstr "Számjegyek"
+
+#: ../rules/base.xml.in.h:650 ../rules/evdev.xml.in.h:650
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "elcsúszott pontosvessző és idézőjel (elavult)"
+
+#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, kibővített visszaper"
+
+#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
+msgid "qwerty/digits"
+msgstr "qwerty/számjegyek"
+
+#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
+msgid "qwertz"
+msgstr "qwertz"
diff --git a/xorg-server/xkbdata.src/po/it.po b/xorg-server/xkbdata.src/po/it.po
new file mode 100644
index 000000000..a128f32fc
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/it.po
@@ -0,0 +1,3050 @@
+# Italian translation for xkeyboard-config
+# Copyright (C) Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+# Luca Ferretti <elle.uca@infinito.it>, 2005-2008.
+#
+# legacy --> vecchia maniera
+# dead keys --> tasti muti
+# eliminate dead keys --> tasti muti esclusi
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.2-pre1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-01-15 21:41+0000\n"
+"PO-Revision-Date: 2008-01-16 16:40+0100\n"
+"Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+# variante turca
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+# 1.2
+#: ../rules/base.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "Alternativa (vecchia maniera)"
+
+# 1.2
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "Alternativa, tasti muti Sun (vecchia maniera)"
+
+# 1.2
+#: ../rules/base.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "Alternativa, tasti muti rimossi (vecchia maniera)"
+
+#: ../rules/base.xml.in.h:5
+msgid "(Legacy) Dvorak"
+msgstr "Dvorak (vecchia maniera)"
+
+# 1.2
+#: ../rules/base.xml.in.h:6
+msgid "101/104 key Compatible"
+msgstr "Compatibile 101/104 tasti"
+
+#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/virgola/tasti muti"
+
+#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/virgola/tasti muti esclusi"
+
+#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/punto/tasti muti"
+
+#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/punto/tasti muti esclusi"
+
+#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/virgola/tasti muti"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/virgola/tasti muti esclusi"
+
+#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/punto/tasti muti"
+
+#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/punto/tasti muti esclusi"
+
+#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/virgola/tasti muti"
+
+#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/virgola/tasti muti esclusi"
+
+#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/punto/tasti muti"
+
+#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/punto/tasti muti esclusi"
+
+#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/virgola/tasti muti"
+
+#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/virgola/tasti muti esclusi"
+
+#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertyz/punto/tasti muti"
+
+#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertyz/punto/tasti muti esclusi"
+
+#: ../rules/base.xml.in.h:23
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:24
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:25
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:26
+msgid "ACPI Standard"
+msgstr "Standard ACPI"
+
+#: ../rules/base.xml.in.h:27
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:28
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:29
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:30
+msgid "Acer Laptop"
+msgstr "Portatile Acer"
+
+#: ../rules/base.xml.in.h:31
+msgid "Add the EuroSign to the 2 key."
+msgstr "Aggiungere il simbolo € al tasto 2."
+
+#: ../rules/base.xml.in.h:32
+msgid "Add the EuroSign to the 4 key."
+msgstr "Aggiungere il simbolo € al tasto 4."
+
+#: ../rules/base.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "Aggiungere il simbolo € al tasto 5."
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "Aggiungere il simbolo € al tasto E."
+
+#: ../rules/base.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "Aggiungere il comportamento standard al tasto Menu."
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Aggiunta del simbolo € a determinati tasti"
+
+#: ../rules/base.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38
+msgid "Afg"
+msgstr "AFG"
+
+# UE
+#: ../rules/base.xml.in.h:39
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+# variante per Ghana
+#: ../rules/base.xml.in.h:40
+msgid "Akan"
+msgstr "Akan"
+
+#: ../rules/base.xml.in.h:41
+msgid "Alb"
+msgstr "ALB"
+
+# UE
+#: ../rules/base.xml.in.h:42
+msgid "Albania"
+msgstr "Albania"
+
+# 1.2
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt e Meta sono sui tasti Alt."
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt è mappato sul tasto Win destro e Super su Menu."
+
+# 1.2
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Alt+BlocMaiusc cambia la disposizione."
+
+# 1.2
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+Ctrl cambia la dispozizione."
+
+# 1.2
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Alt+Maiusc cambia la disposizione."
+
+#: ../rules/base.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+# Using special PC keys (Win, Menu) to work as standard X keys
+# (Super, Hyper, etc.) 
+#: ../rules/base.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Comportamento tasto Alt/Win"
+
+#: ../rules/base.xml.in.h:50
+msgid "Alternative"
+msgstr "Alternativa"
+
+# 1.2
+#: ../rules/base.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "Alternativa orientale"
+
+# 1.2
+#: ../rules/base.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "Alternativa fonetica"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "Internazionale alternativa (in precedenza us_intl)"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "Alternativa, tasti muti Sun"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "Alternativa, tasti muti rimossi"
+
+# 1.2
+#: ../rules/base.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "Alternativa, solo latin-9"
+
+# Andorra
+#: ../rules/base.xml.in.h:57
+msgid "And"
+msgstr "AND"
+
+#: ../rules/base.xml.in.h:58
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../rules/base.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "Variante apostrofo (')"
+
+#: ../rules/base.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Portatile Apple"
+
+#: ../rules/base.xml.in.h:62
+msgid "Ara"
+msgstr "Ara"
+
+# nel senso di layout/disposizione e usato nell'elenco di nazioni.
+#: ../rules/base.xml.in.h:63
+msgid "Arabic"
+msgstr "Araba"
+
+#: ../rules/base.xml.in.h:64
+msgid "Arm"
+msgstr "ARM"
+
+# UE
+#: ../rules/base.xml.in.h:65
+msgid "Armenia"
+msgstr "Armenia"
+
+#: ../rules/base.xml.in.h:66
+msgid "Asus Laptop"
+msgstr "Portatile Asus"
+
+#: ../rules/base.xml.in.h:67
+msgid "Aze"
+msgstr "AZE"
+
+# UE
+#: ../rules/base.xml.in.h:68
+msgid "Azerbaijan"
+msgstr "Azerbaigian"
+
+#: ../rules/base.xml.in.h:69
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 Internet Keyboard wireless"
+
+#: ../rules/base.xml.in.h:70
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:71
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:72
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:73
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
+
+#: ../rules/base.xml.in.h:74
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:75
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:76
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:77
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+# codice 3 lettere per bangladesh
+#: ../rules/base.xml.in.h:78
+msgid "Ban"
+msgstr "BGD"
+
+# UE
+#: ../rules/base.xml.in.h:79
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+# codice tre lettere per belgio
+#: ../rules/base.xml.in.h:80 ../rules/sun.xml.in.h:22
+msgid "Bel"
+msgstr "BEL"
+
+# UE
+#: ../rules/base.xml.in.h:81
+msgid "Belarus"
+msgstr "Bielorussia"
+
+# UE
+#: ../rules/base.xml.in.h:82
+msgid "Belgium"
+msgstr "Belgio"
+
+#: ../rules/base.xml.in.h:83
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+# variante per india
+#: ../rules/base.xml.in.h:84
+msgid "Bengali"
+msgstr "Bengali"
+
+# variante per bengali, credo sia fonetico (crf ww.bengalinux.org)
+#: ../rules/base.xml.in.h:85
+msgid "Bengali Probhat"
+msgstr "Bengali probhat"
+
+# variante francese
+#: ../rules/base.xml.in.h:86
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonomica, tipo Dvorak"
+
+# variante francese
+#: ../rules/base.xml.in.h:87
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonomica, tipo Dvorak, solo latin-9"
+
+# codice tre lettere per bulgaria
+#: ../rules/base.xml.in.h:88 ../rules/sun.xml.in.h:24
+msgid "Bgr"
+msgstr "BGR"
+
+# Codice tre lettere per buthan
+#: ../rules/base.xml.in.h:89
+msgid "Bhu"
+msgstr "BTN"
+
+# UE
+#: ../rules/base.xml.in.h:90
+msgid "Bhutan"
+msgstr "Bhutan"
+
+# 1.2
+#: ../rules/base.xml.in.h:91
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Ebreo biblico (Tiro)"
+
+# codice tre lettere per bosnia-erz
+#: ../rules/base.xml.in.h:92
+msgid "Bih"
+msgstr "BIH"
+
+# codice tre lettere per bielorussia
+#: ../rules/base.xml.in.h:93
+msgid "Blr"
+msgstr "BLR"
+
+# UE
+#: ../rules/base.xml.in.h:94
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnia-Erzegovina"
+
+# 1.2
+#: ../rules/base.xml.in.h:95
+msgid "Both Alt keys together change layout."
+msgstr "I tasti Alt insieme cambiano la disposizione."
+
+# 1.2
+#: ../rules/base.xml.in.h:96
+msgid "Both Ctrl keys together change layout."
+msgstr "I tasti Ctrl insieme cambiano la disposizione."
+
+# 1.2
+#: ../rules/base.xml.in.h:97
+msgid "Both Shift keys together change layout."
+msgstr "I tasti Maiusc insieme cambiano la disposizione."
+
+# 1.2
+#: ../rules/base.xml.in.h:98
+msgid "Both Win-keys switch layout while pressed."
+msgstr "I tasti Win commutano la disposizione mentre premuti."
+
+#: ../rules/base.xml.in.h:99
+msgid "Bra"
+msgstr "BRA"
+
+#: ../rules/base.xml.in.h:100
+msgid "Braille"
+msgstr "Braille"
+
+# UE
+#: ../rules/base.xml.in.h:101
+msgid "Brazil"
+msgstr "Brasile"
+
+#: ../rules/base.xml.in.h:102
+msgid "Brazilian ABNT2"
+msgstr "Brasiliana ABNT2"
+
+# Braille, shortDesc
+#: ../rules/base.xml.in.h:103
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:104
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+# variante araba
+#: ../rules/base.xml.in.h:105
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+# UE
+#: ../rules/base.xml.in.h:106
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+# 1.2
+#: ../rules/base.xml.in.h:107
+msgid "Cambodia"
+msgstr "Cambogia"
+
+#: ../rules/base.xml.in.h:108 ../rules/sun.xml.in.h:29
+msgid "Can"
+msgstr "CAN"
+
+# UE
+#: ../rules/base.xml.in.h:109
+msgid "Canada"
+msgstr "Canada"
+
+# 1.2
+#: ../rules/base.xml.in.h:110
+msgid "Caps Lock is Compose."
+msgstr "BlocMaiusc è Compose."
+
+# 1.2
+#: ../rules/base.xml.in.h:111
+msgid "CapsLock LED shows alternative layout."
+msgstr "Il LED BlocMaiusc mostra la disposizione alternativa."
+
+# 1.2
+#: ../rules/base.xml.in.h:112
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "BlocMaiusc agisce come Maiusc con il blocco. Maiusc \"mette in pausa\" BlocMaiusc."
+
+# 1.2
+#: ../rules/base.xml.in.h:113
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "BlocMaiusc agisce come Maiusc con il blocco. Maiusc non ha effetto su BlocMaiusc."
+
+#: ../rules/base.xml.in.h:114
+msgid "CapsLock just locks the Shift modifier."
+msgstr "BlocMaiusc semplicemente blocca il modificatore Maiusc."
+
+#: ../rules/base.xml.in.h:115 ../rules/sun.xml.in.h:33
+msgid "CapsLock key behavior"
+msgstr "Comportamento tasto BlocMaiusc"
+
+# 1.2
+#: ../rules/base.xml.in.h:116
+msgid "CapsLock key changes layout."
+msgstr "Il tasto BlocMaiusc cambia la disposizione."
+
+#: ../rules/base.xml.in.h:117
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "BlocMaiusc commuta Maiusc cosicché tutti i tasti ne sono modificati."
+
+#: ../rules/base.xml.in.h:118
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "BlocMaiusc commuta l'uso normale delle lettere maiuscole dei caratteri alfabetici."
+
+# 1.2
+#
+# "Internal" capitalization means capitalization using some internal tables.
+#            Otherwise "as Shift" - means using next group.
+#: ../rules/base.xml.in.h:119
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "BlocMaiusc attiva l'uso interno delle lettere maiuscole. Maiusc \"mette in pausa\" BlocMaiusc."
+
+# 1.2
+#: ../rules/base.xml.in.h:120
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "BlocMaiusc attiva l'uso interno delle lettere maiuscole. Maiusc non ha effetto su BlocMaiusc."
+
+# FIXME... trovare traduzione middle-dot
+#: ../rules/base.xml.in.h:121
+msgid "Catalan variant with middle-dot L"
+msgstr "Variante catalano con L middle-dot"
+
+# codice tre lettere per la svizzera
+#: ../rules/base.xml.in.h:122
+msgid "Che"
+msgstr "CHE"
+
+#: ../rules/base.xml.in.h:123
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:124
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (opzione alternativa)"
+
+#: ../rules/base.xml.in.h:125
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:126
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:127
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:128
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:129
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:130
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+# UE
+#: ../rules/base.xml.in.h:131
+msgid "China"
+msgstr "Cina"
+
+# variante russa
+#: ../rules/base.xml.in.h:132
+msgid "Chuvash"
+msgstr "Chuvash"
+
+# variante russa
+#: ../rules/base.xml.in.h:133
+msgid "Chuvash Latin"
+msgstr "Chuvash latin"
+
+#: ../rules/base.xml.in.h:134
+msgid "Classic"
+msgstr "Classica"
+
+#: ../rules/base.xml.in.h:135
+msgid "Classic Dvorak"
+msgstr "Dvorak classica"
+
+#: ../rules/base.xml.in.h:136
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:137
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+# variante USA
+#: ../rules/base.xml.in.h:138
+msgid "Colemak"
+msgstr "Colemak"
+
+# variante romena (da tradurre??)
+#: ../rules/base.xml.in.h:139
+msgid "Commabelow"
+msgstr "Commabelow"
+
+#: ../rules/base.xml.in.h:140
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq tastiera Easy Access"
+
+#: ../rules/base.xml.in.h:141
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 tasti)"
+
+#: ../rules/base.xml.in.h:142
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 tasti)"
+
+#: ../rules/base.xml.in.h:143
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 tasti)"
+
+#: ../rules/base.xml.in.h:144
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq tastiera iPaq"
+
+#: ../rules/base.xml.in.h:145
+msgid "Compose key position"
+msgstr "Posizione tasto Compose"
+
+#: ../rules/base.xml.in.h:146
+msgid "Congo, Democratic Republic of the"
+msgstr "Congo, Repubblica Democratica del"
+
+# 1.2
+#: ../rules/base.xml.in.h:147
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "Control è mappato sul tasto Win (a sui tipici tasti Ctrl)."
+
+# UE
+#: ../rules/base.xml.in.h:148
+msgid "Croatia"
+msgstr "Croazia"
+
+# 1.2
+#: ../rules/base.xml.in.h:149
+msgid "Ctrl key at bottom left"
+msgstr "Il tasto Ctrl è in basso a sinistra."
+
+# 1.2
+#: ../rules/base.xml.in.h:150
+msgid "Ctrl key at left of 'A'"
+msgstr "Il tasto Ctrl è a sinistra di «A»"
+
+# 1.2
+#: ../rules/base.xml.in.h:151
+msgid "Ctrl key position"
+msgstr "Posizione tasto Ctrl"
+
+# 1.2
+#: ../rules/base.xml.in.h:152
+msgid "Ctrl+Shift change layout."
+msgstr "Ctrl+Maiusc cambia la disposizione."
+
+# UE
+#: ../rules/base.xml.in.h:153
+msgid "Cyrillic"
+msgstr "Cirillico"
+
+# 1.2
+#: ../rules/base.xml.in.h:154
+msgid "Cyrillic with guillemets"
+msgstr "Cirillico con caporali («»)"
+
+#: ../rules/base.xml.in.h:155
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Cirillico, Z e ZHE invertiti"
+
+#: ../rules/base.xml.in.h:156 ../rules/sun.xml.in.h:39
+msgid "Cze"
+msgstr "CZE"
+
+# UE
+#: ../rules/base.xml.in.h:157
+msgid "Czechia"
+msgstr "Repubblica ceca"
+
+# shortDesc per Congo, usato codice ISO
+#: ../rules/base.xml.in.h:158
+msgid "DRC"
+msgstr "COD"
+
+#: ../rules/base.xml.in.h:159
+msgid "DTK2000"
+msgstr "DTK2000"
+
+# variante tedesca... any info?
+#: ../rules/base.xml.in.h:160 ../rules/sun.xml.in.h:42
+msgid "Dead acute"
+msgstr ""
+
+# variante tedesce... any info?
+#: ../rules/base.xml.in.h:161 ../rules/sun.xml.in.h:43
+msgid "Dead grave acute"
+msgstr ""
+
+# in Misc Compat Options
+#: ../rules/base.xml.in.h:162
+msgid "Default numeric keypad keys."
+msgstr "Tasti predefiniti nel tastierino numerico."
+
+#: ../rules/base.xml.in.h:163
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:164
+msgid "Dell 101-key PC"
+msgstr "Dell 101 tasti PC"
+
+#: ../rules/base.xml.in.h:165
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell portatile Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:166
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell portatile serie Precision M"
+
+#: ../rules/base.xml.in.h:167
+msgid "Dell Latitude series laptop"
+msgstr "Dell portatile serie Latitude"
+
+#: ../rules/base.xml.in.h:168
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:169
+msgid "Dell USB Multimedia Keybard"
+msgstr "Dell tastiera USB multimediale"
+
+# UE
+#: ../rules/base.xml.in.h:170
+msgid "Denmark"
+msgstr "Danimarca"
+
+# codice tre lettere per germania<
+#: ../rules/base.xml.in.h:171 ../rules/sun.xml.in.h:44
+msgid "Deu"
+msgstr "DEU"
+
+#: ../rules/base.xml.in.h:172
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa tastiera Wireless Desktop"
+
+#: ../rules/base.xml.in.h:173
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond serie 9801/9802"
+
+# codice tre lettere per danimarca
+#: ../rules/base.xml.in.h:174 ../rules/sun.xml.in.h:46
+msgid "Dnk"
+msgstr "DNK"
+
+#: ../rules/base.xml.in.h:175 ../rules/sun.xml.in.h:48
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:176
+msgid "Dvorak international"
+msgstr "Dvorak internazionale"
+
+#: ../rules/base.xml.in.h:177
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr ""
+
+#: ../rules/base.xml.in.h:178
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:179
+msgid "Eastern"
+msgstr "Orientale"
+
+#: ../rules/base.xml.in.h:180 ../rules/sun.xml.in.h:49
+msgid "Eliminate dead keys"
+msgstr "Tasti muti rimossi"
+
+#: ../rules/base.xml.in.h:181
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+# codice tre lettere per esperanto
+#: ../rules/base.xml.in.h:182
+msgid "Epo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:183
+msgid "Ergonomic"
+msgstr "Ergonomica"
+
+# codice tre lettere per spagna
+#: ../rules/base.xml.in.h:184 ../rules/sun.xml.in.h:50
+msgid "Esp"
+msgstr "ESP"
+
+#: ../rules/base.xml.in.h:185
+msgid "Esperanto"
+msgstr "Esperanto"
+
+# codice tre lettere per estonia
+#: ../rules/base.xml.in.h:186
+msgid "Est"
+msgstr "EST"
+
+# UE
+#: ../rules/base.xml.in.h:187
+msgid "Estonia"
+msgstr "Estonia"
+
+# codice tre lettere per etiopia
+#: ../rules/base.xml.in.h:188
+msgid "Eth"
+msgstr "ETH"
+
+# UE
+#: ../rules/base.xml.in.h:189
+msgid "Ethiopia"
+msgstr "Etiopia"
+
+#: ../rules/base.xml.in.h:190
+msgid "Evdev-managed keyboard"
+msgstr "Tastiera gestita da Evdev"
+
+#: ../rules/base.xml.in.h:191
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+# Ewe: variante del Ghana
+#: ../rules/base.xml.in.h:192
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:193
+msgid "Extended"
+msgstr "Estesa"
+
+#: ../rules/base.xml.in.h:194
+msgid "Extended Backslash"
+msgstr "Backslash esteso"
+
+#: ../rules/base.xml.in.h:195
+msgid "F-letter (F) variant"
+msgstr "Variante lettera-F (F)"
+
+# codice tre lettere per isole Faroe
+#: ../rules/base.xml.in.h:196
+msgid "Fao"
+msgstr "FRO"
+
+# ????
+#: ../rules/base.xml.in.h:197
+msgid "Faroe Islands"
+msgstr "Isole Føroyar"
+
+#: ../rules/base.xml.in.h:198 ../rules/sun.xml.in.h:51
+msgid "Fin"
+msgstr "FIN"
+
+# UE
+#: ../rules/base.xml.in.h:199
+msgid "Finland"
+msgstr "Finlandia"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:202
+msgid "Four-level key with abstract separators"
+msgstr "Tasto di quarto livllo con separatori astratti"
+
+#: ../rules/base.xml.in.h:203
+msgid "Four-level key with comma"
+msgstr "Tasto di quarto livello con virgola"
+
+#: ../rules/base.xml.in.h:204
+msgid "Four-level key with dot"
+msgstr "Tasto di quarto livello con punto"
+
+# http://en.wikipedia.org/wiki/Momayyez
+#: ../rules/base.xml.in.h:205
+msgid "Four-level key with momayyez"
+msgstr "Tasto di quarto livello con momayyez"
+
+#: ../rules/base.xml.in.h:206 ../rules/sun.xml.in.h:53
+msgid "Fra"
+msgstr "FRA"
+
+# UE
+#: ../rules/base.xml.in.h:207
+msgid "France"
+msgstr "Francia"
+
+#: ../rules/base.xml.in.h:208 ../rules/sun.xml.in.h:55
+msgid "French"
+msgstr "Francese"
+
+#: ../rules/base.xml.in.h:209
+msgid "French (Macintosh)"
+msgstr "Francese (Macintosh)"
+
+#: ../rules/base.xml.in.h:210 ../rules/sun.xml.in.h:56
+msgid "French (legacy)"
+msgstr "Francese (vecchia maniera)"
+
+#: ../rules/base.xml.in.h:211
+msgid "French Dvorak"
+msgstr "Francese dvorak"
+
+#: ../rules/base.xml.in.h:212
+msgid "French, Sun dead keys"
+msgstr "Francese, tasti muti Sun"
+
+#: ../rules/base.xml.in.h:213
+msgid "French, eliminate dead keys"
+msgstr "Francese, tasti muti rimossi"
+
+#: ../rules/base.xml.in.h:214
+msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
+msgstr "Portatile Fujitsu-Siemens Computers AMILO A1667G"
+
+# Fula: variante del Ghana
+#: ../rules/base.xml.in.h:215
+msgid "Fula"
+msgstr "Fula"
+
+# Codice tre lettere per U.K.
+#: ../rules/base.xml.in.h:216
+msgid "GBr"
+msgstr "GBR"
+
+# Ga: variante del ghana
+#: ../rules/base.xml.in.h:217
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:218
+msgid "Generic 101-key PC"
+msgstr "Generica 101 tasti PC"
+
+#: ../rules/base.xml.in.h:219
+msgid "Generic 102-key (Intl) PC"
+msgstr "Generica 102 tasti (Intl) PC"
+
+#: ../rules/base.xml.in.h:220
+msgid "Generic 104-key PC"
+msgstr "Generica 104 tasti PC"
+
+#: ../rules/base.xml.in.h:221
+msgid "Generic 105-key (Intl) PC"
+msgstr "Generica 105 tasti (Intl) PC"
+
+#: ../rules/base.xml.in.h:222
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:223
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:224
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:225
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:226
+msgid "Geo"
+msgstr "GEO"
+
+# UE
+#: ../rules/base.xml.in.h:227
+msgid "Georgia"
+msgstr "Georgia"
+
+# Curiosamente è una variante delle tastiere italiane...
+#: ../rules/base.xml.in.h:228
+msgid "Georgian"
+msgstr "Georgiana"
+
+# Questa invece variante delle tastiere francesi
+#: ../rules/base.xml.in.h:229
+msgid "Georgian AZERTY Tskapo"
+msgstr "Geogiana AZERI Tskapo"
+
+#: ../rules/base.xml.in.h:230
+msgid "German (Macintosh)"
+msgstr "Tedesca (Macintosh)"
+
+#: ../rules/base.xml.in.h:231
+msgid "German, Sun dead keys"
+msgstr "Tedesca, tasti muti Sun"
+
+#: ../rules/base.xml.in.h:232
+msgid "German, eliminate dead keys"
+msgstr "Tedesca, tasti muti rimossi"
+
+# UE
+#: ../rules/base.xml.in.h:233
+msgid "Germany"
+msgstr "Germania"
+
+# shortDesc per Ghana, usato codice ISO
+#: ../rules/base.xml.in.h:234
+msgid "Gha"
+msgstr "GHA"
+
+#: ../rules/base.xml.in.h:235
+msgid "Ghana"
+msgstr "Ghana"
+
+# codice tre lettere per grecia
+#: ../rules/base.xml.in.h:236
+msgid "Gre"
+msgstr "GRC"
+
+# UE
+#: ../rules/base.xml.in.h:237
+msgid "Greece"
+msgstr "Grecia"
+
+#: ../rules/base.xml.in.h:238
+msgid "Group toggle on multiply/divide key"
+msgstr ""
+
+# shortDesc per Guinea, usato codice ISO
+#: ../rules/base.xml.in.h:239
+msgid "Gui"
+msgstr "GIN"
+
+#: ../rules/base.xml.in.h:240
+msgid "Guinea"
+msgstr "Guinea"
+
+# Gujarati: variante india
+#: ../rules/base.xml.in.h:241
+msgid "Gujarati"
+msgstr "Gujarati"
+
+# Gurmukhi: variante india
+#: ../rules/base.xml.in.h:242
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../rules/base.xml.in.h:243
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:244
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking Keyboard"
+
+#: ../rules/base.xml.in.h:245
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking Keyboard per Mac"
+
+# Hausa: variante Ghana
+#: ../rules/base.xml.in.h:246
+msgid "Hausa"
+msgstr "Hausa"
+
+#: ../rules/base.xml.in.h:247
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:248
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:249
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:250
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:251
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:252
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:253
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:254
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavillion ZT11xx"
+
+#: ../rules/base.xml.in.h:255
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard Multimedia Keyboard SK-2501"
+
+#: ../rules/base.xml.in.h:256
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard SK-2505"
+
+# Hindi Bolnagri: variante India
+#: ../rules/base.xml.in.h:257
+msgid "Hindi Bolnagri"
+msgstr "Hindi Bolnagri"
+
+#: ../rules/base.xml.in.h:258
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+# codice tre lettere per croazia
+#: ../rules/base.xml.in.h:259
+msgid "Hrv"
+msgstr "HRV"
+
+#: ../rules/base.xml.in.h:260 ../rules/sun.xml.in.h:59
+msgid "Hun"
+msgstr "HUN"
+
+# UE
+#: ../rules/base.xml.in.h:261
+msgid "Hungary"
+msgstr "Ungheria"
+
+#: ../rules/base.xml.in.h:262
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper è mappato sul tasto Win."
+
+#: ../rules/base.xml.in.h:263
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:264
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:265
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:266
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (opzione alternativa)"
+
+#: ../rules/base.xml.in.h:267
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:268
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:269
+msgid "IBM ThinkPad R60/T60/Z60m/Z60t/R61/T61/Z61m/Z61t"
+msgstr "IBM ThinkPad R60/T60/Z60m/Z60t/R61/T61/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:270 ../rules/sun.xml.in.h:61
+msgid "ISO Alternate"
+msgstr "ISO alternativa"
+
+# UE
+#: ../rules/base.xml.in.h:271
+msgid "Iceland"
+msgstr "Islandia"
+
+# Igbo: variante Nigeria
+#: ../rules/base.xml.in.h:272
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:273
+msgid "Ind"
+msgstr "IND"
+
+# UE
+#: ../rules/base.xml.in.h:274
+msgid "India"
+msgstr "India"
+
+#: ../rules/base.xml.in.h:275
+msgid "International (AltGr dead keys)"
+msgstr "Internazionale (tasti muti AltGr)"
+
+#: ../rules/base.xml.in.h:276 ../rules/sun.xml.in.h:62
+msgid "International (with dead keys)"
+msgstr "Internazionale (con tasti muti)"
+
+# Inuktitut: variante canadese
+#: ../rules/base.xml.in.h:277
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+# UE
+#: ../rules/base.xml.in.h:278
+msgid "Iran"
+msgstr "Iran"
+
+# UE
+#: ../rules/base.xml.in.h:279
+msgid "Iraq"
+msgstr "Iraq"
+
+# UE
+#: ../rules/base.xml.in.h:280
+msgid "Ireland"
+msgstr "Irlanda"
+
+# codice tre lettere per irlanda
+#: ../rules/base.xml.in.h:281
+msgid "Irl"
+msgstr "IRL"
+
+# codice tre lettere per Iran
+#: ../rules/base.xml.in.h:282
+msgid "Irn"
+msgstr "IRN"
+
+# codice tre lettere per iraq
+#: ../rules/base.xml.in.h:283
+msgid "Irq"
+msgstr "IRQ"
+
+# Codice tre lettere per islanda<
+#: ../rules/base.xml.in.h:284
+msgid "Isl"
+msgstr "ISL"
+
+# codice tre lettere per israele<
+#: ../rules/base.xml.in.h:285
+msgid "Isr"
+msgstr "ISR"
+
+# UE
+#: ../rules/base.xml.in.h:286
+msgid "Israel"
+msgstr "Israele"
+
+#: ../rules/base.xml.in.h:287 ../rules/sun.xml.in.h:63
+msgid "Ita"
+msgstr "ITA"
+
+# UE
+#: ../rules/base.xml.in.h:288
+msgid "Italy"
+msgstr "Italia"
+
+# UE
+#: ../rules/base.xml.in.h:289
+msgid "Japan"
+msgstr "Giappone"
+
+#: ../rules/base.xml.in.h:290
+msgid "Japan (PC-98xx Series)"
+msgstr "Jappone (Serie PC-98xx)"
+
+#: ../rules/base.xml.in.h:291
+msgid "Japanese 106-key"
+msgstr "Giapponese 106 tasti"
+
+#: ../rules/base.xml.in.h:292
+msgid "Japanese keyboard options"
+msgstr "Opzioni tastiera giapponese"
+
+#: ../rules/base.xml.in.h:293 ../rules/sun.xml.in.h:66
+msgid "Jpn"
+msgstr "JPN"
+
+# Kana: variante giappone
+#: ../rules/base.xml.in.h:294
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:295
+msgid "Kana Lock key is locking"
+msgstr "Il tasto Kana Lock sta bloccando"
+
+# variante india
+#: ../rules/base.xml.in.h:296
+msgid "Kannada"
+msgstr "Kannada"
+
+# Kashubian: variante polonia
+#: ../rules/base.xml.in.h:297
+msgid "Kashubian"
+msgstr "Kashubian"
+
+# shortDesc per Kazakistan
+#: ../rules/base.xml.in.h:298
+msgid "Kaz"
+msgstr "KAZ"
+
+#: ../rules/base.xml.in.h:299
+#, fuzzy
+msgid "Kazakh with Russian"
+msgstr "Kazaka con russo"
+
+#: ../rules/base.xml.in.h:300
+msgid "Kazakhstan"
+msgstr "Kazakistan"
+
+# variante iraniana senza numeri
+# forse anche variante per altra lingua
+#: ../rules/base.xml.in.h:301
+msgid "Keypad"
+msgstr "Tastierino"
+
+# 1.2
+#: ../rules/base.xml.in.h:302
+msgid "Keypad with unicode additions (arrows and math operators)"
+msgstr "Tastierino con aggiunte unicode (frecce e operatori matematici)"
+
+# 1.2
+#: ../rules/base.xml.in.h:303
+msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Tastierino con aggiunte unicode (frecce e operatori matematici). Operatori matematici sul livello predefinito."
+
+#: ../rules/base.xml.in.h:304
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+# shortDesc per Cambogia, usato codide ISO
+#: ../rules/base.xml.in.h:305
+msgid "Khm"
+msgstr "KHM"
+
+# Komi: variante russa
+#: ../rules/base.xml.in.h:306
+msgid "Komi"
+msgstr "Komi"
+
+# shortDesc per corea del sud, usato codice iso
+#: ../rules/base.xml.in.h:307
+msgid "Kor"
+msgstr "KOR"
+
+#: ../rules/base.xml.in.h:308
+msgid "Korea, Republic of"
+msgstr "Corea, Repubblica di"
+
+#: ../rules/base.xml.in.h:309
+msgid "Korean 106-key"
+msgstr "Coreana 106 tasti"
+
+#: ../rules/base.xml.in.h:310
+msgid "Kurdish, (F)"
+msgstr "Curda, (F)"
+
+#: ../rules/base.xml.in.h:311
+msgid "Kurdish, Arabic-Latin"
+msgstr "Curda, arabo-latina"
+
+#: ../rules/base.xml.in.h:312
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Curda, latina Alt-Q"
+
+#: ../rules/base.xml.in.h:313
+msgid "Kurdish, Latin Q"
+msgstr "Curda, latina Q"
+
+# codice tre lettere per Kirghizistan
+#: ../rules/base.xml.in.h:314
+msgid "Kyr"
+msgstr "KGZ"
+
+# UE
+#: ../rules/base.xml.in.h:315
+msgid "Kyrgyzstan"
+msgstr "Kirghizistan"
+
+# Short description per Latin American ??
+#: ../rules/base.xml.in.h:316
+msgid "LAm"
+msgstr ""
+
+#: ../rules/base.xml.in.h:317
+msgid "LCtrl+LShift change layout."
+msgstr "Ctrl sin. + Maiusc sin. cambia la disposizione."
+
+#: ../rules/base.xml.in.h:318
+msgid "Lao"
+msgstr "LAO"
+
+# UE
+#: ../rules/base.xml.in.h:319
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:320
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Compaq Laptop tastiera per portatile (es. Armada)"
+
+#: ../rules/base.xml.in.h:321
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Compaq Internet Keyboard per portatile (es. Presario)"
+
+#: ../rules/base.xml.in.h:322
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Portatie eMachines m68xx"
+
+#: ../rules/base.xml.in.h:323
+msgid "Latin"
+msgstr "Latino"
+
+#: ../rules/base.xml.in.h:324
+msgid "Latin American"
+msgstr "Latino americano"
+
+#: ../rules/base.xml.in.h:325
+msgid "Latin Unicode"
+msgstr "Latino Unicode"
+
+#: ../rules/base.xml.in.h:326
+msgid "Latin Unicode qwerty"
+msgstr "Latino Unicode qwerty"
+
+#: ../rules/base.xml.in.h:327
+msgid "Latin qwerty"
+msgstr "Latino qwerty"
+
+#: ../rules/base.xml.in.h:328
+msgid "Latin unicode"
+msgstr "Latino unicode"
+
+#: ../rules/base.xml.in.h:329
+msgid "Latin unicode qwerty"
+msgstr "Latino unicode qwery"
+
+#: ../rules/base.xml.in.h:330
+msgid "Latin with guillemets"
+msgstr "Latino con caporali («»)"
+
+# UE
+#: ../rules/base.xml.in.h:331
+msgid "Latvia"
+msgstr "Lettonia"
+
+#: ../rules/base.xml.in.h:332
+msgid "Layout switching"
+msgstr "Commutazione di disposizione"
+
+#: ../rules/base.xml.in.h:333
+msgid "Left Alt is swapped with left Win-key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:334
+msgid "Left Alt key changes layout."
+msgstr "Il tasto Alt sinistro cambia la disposizione."
+
+#: ../rules/base.xml.in.h:335
+msgid "Left Alt key switches layout while pressed."
+msgstr "Il tasto Alt sinistro commuta la disposizione mentre è premuto."
+
+#: ../rules/base.xml.in.h:336
+msgid "Left Ctrl key changes layout."
+msgstr "Il tasto Ctrl sinistro cambia la disposizione."
+
+#: ../rules/base.xml.in.h:337
+msgid "Left Shift key changes layout."
+msgstr "Il tasto Maiusc sinistro cambia la disposizione."
+
+#: ../rules/base.xml.in.h:338
+msgid "Left Win-key changes layout."
+msgstr "Il tasto Win sinistro cambia la disposizione."
+
+# Tweaking the position of the "Compose" key: mapping to existing PC keys 
+#: ../rules/base.xml.in.h:339
+msgid "Left Win-key is Compose."
+msgstr "Tasto Win sinistro è Compose."
+
+#: ../rules/base.xml.in.h:340
+msgid "Left Win-key switches layout while pressed."
+msgstr "Il tasto Win sinistro commuta la disposizione mentre è premuto."
+
+# UE
+#: ../rules/base.xml.in.h:341
+msgid "Left hand"
+msgstr "Mano sinistra"
+
+#: ../rules/base.xml.in.h:342
+msgid "Left handed Dvorak"
+msgstr "Dvorak mancina"
+
+#: ../rules/base.xml.in.h:343
+msgid "Legacy Wang 724 keypad"
+msgstr ""
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:345
+msgid "Legacy key with comma"
+msgstr ""
+
+#: ../rules/base.xml.in.h:346
+msgid "Legacy key with dot"
+msgstr ""
+
+#: ../rules/base.xml.in.h:347
+msgid "Legacy keypad"
+msgstr ""
+
+# UE
+#: ../rules/base.xml.in.h:348
+msgid "Lithuania"
+msgstr "Lituania"
+
+#: ../rules/base.xml.in.h:349
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:350
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:351
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (opzione alternativa)"
+
+#: ../rules/base.xml.in.h:352
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:353
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:354
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:355
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (opzione alternativa 2)"
+
+#: ../rules/base.xml.in.h:356
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:357
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Tasti aggiuntivi Logitech attraverso G15daemon"
+
+#: ../rules/base.xml.in.h:358
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:359
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:360
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:361
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:362
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Keyboard"
+
+#: ../rules/base.xml.in.h:363
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:364
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:365
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (modello Y-RB6)"
+
+#: ../rules/base.xml.in.h:366
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:367
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+# codice tre lettere per lituania
+#: ../rules/base.xml.in.h:368
+msgid "Ltu"
+msgstr "LTU"
+
+# codice tre lettere per lavtia<
+#: ../rules/base.xml.in.h:369
+msgid "Lva"
+msgstr "LVA"
+
+# variante della Georgia
+#: ../rules/base.xml.in.h:370
+msgid "MESS"
+msgstr "MESS"
+
+# shortDesc per Montenegro, usato ISO
+#: ../rules/base.xml.in.h:371
+msgid "MNE"
+msgstr "MNE"
+
+#: ../rules/base.xml.in.h:372
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:373
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
+
+#: ../rules/base.xml.in.h:374
+msgid "Macedonia"
+msgstr "Macedonia"
+
+#: ../rules/base.xml.in.h:375
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:376
+msgid "Macintosh Old"
+msgstr "Macintosh Old"
+
+#: ../rules/base.xml.in.h:377
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, tasti muti Sun"
+
+#: ../rules/base.xml.in.h:378
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, tasti muti rimossi"
+
+#: ../rules/base.xml.in.h:379
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Rendere BlocMaiusc un Ctrl aggiuntivo."
+
+# codice tre lettere per maldive
+#: ../rules/base.xml.in.h:380
+msgid "Mal"
+msgstr "MDV"
+
+#: ../rules/base.xml.in.h:381
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../rules/base.xml.in.h:382
+msgid "Malayalam Lalitha"
+msgstr "Malayalam Lalitha"
+
+# UE
+#: ../rules/base.xml.in.h:383
+msgid "Maldives"
+msgstr "Maldive"
+
+# UE
+#: ../rules/base.xml.in.h:384
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:385
+msgid "Maltese keyboard with US layout"
+msgstr "Tastiera maltese con disposizione US"
+
+#: ../rules/base.xml.in.h:386
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:387
+msgid "Maori"
+msgstr "Maori"
+
+#: ../rules/base.xml.in.h:388
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:389
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:390
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:391
+msgid "Menu is Compose."
+msgstr "Menu opera come Compose."
+
+#: ../rules/base.xml.in.h:392
+msgid "Menu key changes layout."
+msgstr "Il tasto Menu cambia la disposizione."
+
+#: ../rules/base.xml.in.h:393
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta è mappato sul tasto Win."
+
+#: ../rules/base.xml.in.h:394
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta è mappato sul tasto Win sinistro."
+
+#: ../rules/base.xml.in.h:395
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:396
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, svedese"
+
+#: ../rules/base.xml.in.h:397
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:398
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
+
+#: ../rules/base.xml.in.h:399
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:400
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:401
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:402
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:403
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:404 ../rules/sun.xml.in.h:72
+msgid "Miscellaneous compatibility options"
+msgstr "Opzioni varie di compatibilità"
+
+# codice tre lettere per macedonia
+#: ../rules/base.xml.in.h:405
+msgid "Mkd"
+msgstr "MKD"
+
+# codice tre lettere per malta
+#: ../rules/base.xml.in.h:406
+msgid "Mlt"
+msgstr "MLT"
+
+# codice tre lettere per birmania
+#: ../rules/base.xml.in.h:407
+msgid "Mmr"
+msgstr "MMR"
+
+# codice tre lettere per mongolia
+#: ../rules/base.xml.in.h:408
+msgid "Mng"
+msgstr "MNG"
+
+#: ../rules/base.xml.in.h:409
+msgid "Mongolia"
+msgstr "Mongolia"
+
+#: ../rules/base.xml.in.h:410
+msgid "Montenegro"
+msgstr "Montenegro"
+
+#: ../rules/base.xml.in.h:411
+msgid "Morocco"
+msgstr "Marocco"
+
+#: ../rules/base.xml.in.h:412 ../rules/sun.xml.in.h:73
+msgid "Multilingual"
+msgstr "Multilingue"
+
+#: ../rules/base.xml.in.h:413
+msgid "Multilingual, first part"
+msgstr "Multilingue, prima parte"
+
+#: ../rules/base.xml.in.h:414 ../rules/sun.xml.in.h:74
+msgid "Multilingual, second part"
+msgstr "Multilingue, seconda parte"
+
+# UE
+#: ../rules/base.xml.in.h:415
+msgid "Myanmar"
+msgstr "Birmania"
+
+# opzioni tastiera giapponese
+#: ../rules/base.xml.in.h:416
+msgid "NICOLA-F style Backspace"
+msgstr "Backspace stile NICOLA-F"
+
+# variante tastiera tedesca
+#: ../rules/base.xml.in.h:417
+msgid "Neostyle"
+msgstr "Neostyle"
+
+# shortDesc per Nepal, usato ISO
+#: ../rules/base.xml.in.h:418
+msgid "Nep"
+msgstr "NPL"
+
+#: ../rules/base.xml.in.h:419
+msgid "Nepal"
+msgstr "Nepal"
+
+# UE
+#: ../rules/base.xml.in.h:420
+msgid "Netherlands"
+msgstr "Paesi Bassi"
+
+# shortDesc per Nigeria, usato ISO
+#: ../rules/base.xml.in.h:421
+msgid "Nig"
+msgstr "NGA"
+
+#: ../rules/base.xml.in.h:422
+msgid "Nigeria"
+msgstr "Nigeria"
+
+# codice tre lettere per paesi bassi
+#: ../rules/base.xml.in.h:423
+msgid "Nld"
+msgstr "NLD"
+
+# codice tre lettere per norvegia
+#: ../rules/base.xml.in.h:424 ../rules/sun.xml.in.h:75
+msgid "Nor"
+msgstr "NOR"
+
+#: ../rules/base.xml.in.h:425
+msgid "Northern Saami"
+msgstr "Saami settentrinale"
+
+#: ../rules/base.xml.in.h:426
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Saami settentrionale, tasti muti rimossi"
+
+#: ../rules/base.xml.in.h:427
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+# UE
+#: ../rules/base.xml.in.h:428
+msgid "Norway"
+msgstr "Norvegia"
+
+#: ../rules/base.xml.in.h:429
+msgid "NumLock LED shows alternative layout."
+msgstr "Il LED di BlocNum mostra la disposizione alternativa."
+
+#: ../rules/base.xml.in.h:430
+msgid "Numeric keypad delete key behaviour"
+msgstr "Comportamento tasto canc su tastierino numerico"
+
+#: ../rules/base.xml.in.h:431
+msgid "Numeric keypad keys work as with Mac."
+msgstr "I tasti del tastierino numerico operano come nei Mac."
+
+#: ../rules/base.xml.in.h:432
+msgid "Numeric keypad layout selection"
+msgstr "Selezione disposizione tastierino numerico"
+
+#: ../rules/base.xml.in.h:433
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:434
+msgid "OLPC"
+msgstr "OLPC"
+
+#: ../rules/base.xml.in.h:435
+msgid "OLPC Dari"
+msgstr "OLPC Dari"
+
+#: ../rules/base.xml.in.h:436
+msgid "OLPC Pashto"
+msgstr "OLPC Pashto"
+
+#: ../rules/base.xml.in.h:437
+msgid "OLPC Southern Uzbek"
+msgstr "OLPC Uzbeco meridionale"
+
+# Variante irlandese
+#: ../rules/base.xml.in.h:438
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:439
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+# variante bangladesh
+#: ../rules/base.xml.in.h:440
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../rules/base.xml.in.h:441
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet keyboard"
+
+#: ../rules/base.xml.in.h:442
+msgid "Ossetian"
+msgstr "Osseta"
+
+#: ../rules/base.xml.in.h:443
+msgid "Ossetian, Winkeys"
+msgstr "Osseta, Winkeys"
+
+#: ../rules/base.xml.in.h:444
+msgid "PC-98xx Series"
+msgstr "Serie PC-98xx"
+
+#: ../rules/base.xml.in.h:445
+msgid "Pak"
+msgstr "PAK"
+
+# UE
+#: ../rules/base.xml.in.h:446
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:447
+msgid "Pashto"
+msgstr "Pashto"
+
+# Variante tailandese
+#: ../rules/base.xml.in.h:448
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:449 ../rules/sun.xml.in.h:78
+msgid "Phonetic"
+msgstr "Fonetico"
+
+#: ../rules/base.xml.in.h:450 ../rules/sun.xml.in.h:79
+msgid "Pol"
+msgstr "POL"
+
+# UE
+#: ../rules/base.xml.in.h:451
+msgid "Poland"
+msgstr "Polonia"
+
+# Variante greca
+#: ../rules/base.xml.in.h:452
+msgid "Polytonic"
+msgstr "Politonica"
+
+# UE
+#: ../rules/base.xml.in.h:453
+msgid "Portugal"
+msgstr "Portogallo"
+
+#: ../rules/base.xml.in.h:454
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Premere il tasto Alt sinistro per scegliere il 3° livello."
+
+#: ../rules/base.xml.in.h:455
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Premere il tasto Win sinistro per scegliere il 3° livello."
+
+#: ../rules/base.xml.in.h:456
+msgid "Press Menu key to choose 3rd level."
+msgstr "Premere il tasto Menu per scegliere il 3° livello."
+
+#: ../rules/base.xml.in.h:457
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "Premere il tasto Alt destro per scegliere il 3° livello. Maiusc + Alt destro è Multi_Key."
+
+#: ../rules/base.xml.in.h:458
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Premere il tasto Alt destro per scegliere il 3° livello."
+
+#: ../rules/base.xml.in.h:459
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Premere il tasto Ctrl destro per scegliere il 3° livello."
+
+#: ../rules/base.xml.in.h:460
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Premere il tasto Win destro per scegliere il 3° livello."
+
+#: ../rules/base.xml.in.h:461
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Premere uno dei tasti Alt per scegliere il 3° livello."
+
+#: ../rules/base.xml.in.h:462
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Premere uno dei tast Win per scegliere il 3° livello."
+
+# Variante iraniana con numeri (fila alta e tastierino numerico)
+#: ../rules/base.xml.in.h:463
+msgid "Pro"
+msgstr "Pro"
+
+# Variante iraniana con numeri in fila alte e lettere sul tastierino
+#: ../rules/base.xml.in.h:464
+msgid "Pro Keypad"
+msgstr "Pro con tastierino"
+
+#: ../rules/base.xml.in.h:465
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:466
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+# codice tre lettere per portogallo
+#: ../rules/base.xml.in.h:467 ../rules/sun.xml.in.h:88
+msgid "Prt"
+msgstr "PRT"
+
+#: ../rules/base.xml.in.h:468
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:469
+msgid "R-Alt switches layout while pressed."
+msgstr "Il tasto Alt destro commuta la disposizione mentre è premuto."
+
+#: ../rules/base.xml.in.h:470
+msgid "Right Alt is Compose."
+msgstr "Alt destro è Compose."
+
+#: ../rules/base.xml.in.h:471
+msgid "Right Alt key changes layout."
+msgstr "Il tasto Alt destro cambia la disposizione."
+
+#: ../rules/base.xml.in.h:472 ../rules/sun.xml.in.h:90
+msgid "Right Alt key never chooses 3rd level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:473
+msgid "Right Ctrl is Compose."
+msgstr "Ctrl destro è Compose."
+
+#: ../rules/base.xml.in.h:474
+msgid "Right Ctrl key changes layout."
+msgstr "Il tasto Ctrl destro cambia la disposizione."
+
+#: ../rules/base.xml.in.h:475
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "Il tasto Ctrl destro commuta la disposizione mentre è premuto."
+
+#: ../rules/base.xml.in.h:476
+msgid "Right Ctrl key works as Right Alt."
+msgstr "I tasto Ctrl destro opera come il tasto Alt destro."
+
+#: ../rules/base.xml.in.h:477
+msgid "Right Shift key changes layout."
+msgstr "Il tasto Maiusc destro cambia la disposizione."
+
+#: ../rules/base.xml.in.h:478
+msgid "Right Win-key changes layout."
+msgstr "Il tasto Win destro cambia la disposizione."
+
+# Tweaking the position of the "Compose" key: mapping to existing PC keys 
+#: ../rules/base.xml.in.h:479
+msgid "Right Win-key is Compose."
+msgstr "Tasto Win destro è Compose."
+
+#: ../rules/base.xml.in.h:480
+msgid "Right Win-key switches layout while pressed."
+msgstr "Il tasto Win destro commuta la disposizione mentre è premuto."
+
+#: ../rules/base.xml.in.h:481
+msgid "Right hand"
+msgstr "Mano destra"
+
+#: ../rules/base.xml.in.h:482
+msgid "Right handed Dvorak"
+msgstr "Dvorak destrorsa"
+
+# UE
+#: ../rules/base.xml.in.h:483
+msgid "Romania"
+msgstr "Romania"
+
+#: ../rules/base.xml.in.h:484
+msgid "Romanian keyboard with German letters"
+msgstr "Tastiera rumena con lettere tedesche"
+
+#: ../rules/base.xml.in.h:485
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Tastiera rumena con lettere tedesche, tasti muti rimossi"
+
+# codice tre lettere per romania
+#: ../rules/base.xml.in.h:486
+msgid "Rou"
+msgstr "ROU"
+
+# codice tre lettere per russia
+#: ../rules/base.xml.in.h:487 ../rules/sun.xml.in.h:95
+msgid "Rus"
+msgstr "RUS"
+
+# UE
+#: ../rules/base.xml.in.h:488
+msgid "Russia"
+msgstr "Russia"
+
+#: ../rules/base.xml.in.h:489 ../rules/sun.xml.in.h:96
+msgid "Russian"
+msgstr "Russa"
+
+#: ../rules/base.xml.in.h:490
+msgid "Russian phonetic"
+msgstr "Fonetica russa"
+
+#: ../rules/base.xml.in.h:491
+msgid "Russian phonetic Dvorak"
+msgstr "Dvorak fonetica russa"
+
+#: ../rules/base.xml.in.h:492
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Fonetica russa, tasti muti rimossi"
+
+#: ../rules/base.xml.in.h:493
+msgid "Russian with Kazakh"
+msgstr "Russa con kazaca"
+
+#: ../rules/base.xml.in.h:494
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:495
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:496
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:497
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:498
+msgid "SK-7100"
+msgstr "SK-7100"
+
+# shortDesc per Serbia, usato codice ISO
+#: ../rules/base.xml.in.h:499
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:500
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:501
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:502
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:503
+msgid "ScrollLock LED shows alternative layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:504
+msgid "Serbia"
+msgstr "Serbia"
+
+#: ../rules/base.xml.in.h:505
+msgid "Shift cancels CapsLock."
+msgstr "Maiusc annulla BlocMaiusc."
+
+#: ../rules/base.xml.in.h:506
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "Maiusc con i tasti del tastierino numerico opera come in MS Windows."
+
+#: ../rules/base.xml.in.h:507
+msgid "Shift+CapsLock changes layout."
+msgstr "Maiusc+BlocMaiusc cambia la disposizione."
+
+# UE
+#: ../rules/base.xml.in.h:508
+msgid "Slovakia"
+msgstr "Slovacchia"
+
+# UE
+#: ../rules/base.xml.in.h:509
+msgid "Slovenia"
+msgstr "Slovenia"
+
+#: ../rules/base.xml.in.h:510
+msgid "South Africa"
+msgstr "Sud Africa"
+
+#: ../rules/base.xml.in.h:511
+msgid "Southern Uzbek"
+msgstr "Uzbeko meridionale"
+
+#: ../rules/base.xml.in.h:512
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:513
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:514
+msgid "Space key outputs non-breakable space character at second level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:515
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:516
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:517
+msgid "Space key outputs non-breakable space character at third level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:518
+msgid "Space key outputs usual space at any level."
+msgstr ""
+
+# UE
+#: ../rules/base.xml.in.h:519
+msgid "Spain"
+msgstr "Spagna"
+
+#: ../rules/base.xml.in.h:520 ../rules/sun.xml.in.h:103
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Tasti speciali (Ctrl+Alt+&lt;tasto&gt;) gestiti da un server."
+
+# codice tre lettere per SriLanka
+#: ../rules/base.xml.in.h:521
+msgid "SrL"
+msgstr "LKA"
+
+#: ../rules/base.xml.in.h:522
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../rules/base.xml.in.h:523 ../rules/sun.xml.in.h:104
+msgid "Standard"
+msgstr "Standard"
+
+#: ../rules/base.xml.in.h:524
+msgid "Standard (Cedilla)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:525
+msgid "Standard (Commabelow)"
+msgstr ""
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:527
+msgid "Standard RSTU"
+msgstr "RSTU standard"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:529
+msgid "Standard RSTU on Russian layout"
+msgstr "RSTU standard su disposizione russa"
+
+#: ../rules/base.xml.in.h:530 ../rules/sun.xml.in.h:112
+msgid "Sun dead keys"
+msgstr "Tasti muti Sun"
+
+#: ../rules/base.xml.in.h:531
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:532
+msgid "Super is mapped to the Win-keys."
+msgstr "Super è mappato sui tasti Win."
+
+#: ../rules/base.xml.in.h:533
+msgid "Svdvorak"
+msgstr ""
+
+# codice tre lettere per repubblica slovacca
+#: ../rules/base.xml.in.h:534 ../rules/sun.xml.in.h:113
+msgid "Svk"
+msgstr "SVK"
+
+# codice tre lettere per slovenia
+#: ../rules/base.xml.in.h:535
+msgid "Svn"
+msgstr "SVN"
+
+#: ../rules/base.xml.in.h:536
+msgid "Swap Ctrl and CapsLock."
+msgstr "Invertire Ctrl e BlocMaiusc."
+
+#: ../rules/base.xml.in.h:537
+msgid "Swap ESC and CapsLock."
+msgstr "Invertire ESC e BlocMaiusc."
+
+#: ../rules/base.xml.in.h:538
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr ""
+
+#: ../rules/base.xml.in.h:539 ../rules/sun.xml.in.h:115
+msgid "Swe"
+msgstr "SWE"
+
+# UE
+#: ../rules/base.xml.in.h:540
+msgid "Sweden"
+msgstr "Svezia"
+
+# UE
+#: ../rules/base.xml.in.h:541
+msgid "Switzerland"
+msgstr "Svizzera"
+
+#: ../rules/base.xml.in.h:542
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:543
+msgid "Syr"
+msgstr "SYR"
+
+# UE
+#: ../rules/base.xml.in.h:544
+msgid "Syria"
+msgstr "Siria"
+
+# L'aggettivo per Siria in iglese EU sarebbe Syrian
+#
+#: ../rules/base.xml.in.h:545
+msgid "Syriac"
+msgstr "Siriano"
+
+#: ../rules/base.xml.in.h:546
+msgid "Syriac phonetic"
+msgstr "Siriano fonetico"
+
+#: ../rules/base.xml.in.h:547
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+# UE
+#: ../rules/base.xml.in.h:548
+msgid "Tajikistan"
+msgstr "Tagikistan"
+
+#: ../rules/base.xml.in.h:549
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../rules/base.xml.in.h:550
+msgid "Tamil TAB Typewriter"
+msgstr "Tamil TAB macchina per scrivere"
+
+#: ../rules/base.xml.in.h:551
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamil TSCII macchina per scrivere"
+
+#: ../rules/base.xml.in.h:552
+msgid "Tamil Unicode"
+msgstr "Tamil Unicode"
+
+# UE
+#: ../rules/base.xml.in.h:553
+#, fuzzy
+msgid "Tatar"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:554
+msgid "Telugu"
+msgstr "Telegu"
+
+#: ../rules/base.xml.in.h:555
+msgid "Tha"
+msgstr "THA"
+
+# UE
+#: ../rules/base.xml.in.h:556
+msgid "Thailand"
+msgstr "Thailandia"
+
+#: ../rules/base.xml.in.h:557 ../rules/sun.xml.in.h:119
+msgid "Third level choosers"
+msgstr "Selettore terzo livello"
+
+#: ../rules/base.xml.in.h:558
+msgid "Tibetan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:559
+msgid "Tibetan (with ASCII numerals)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:560
+msgid "Tifinagh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:561
+#, fuzzy
+msgid "Tifinagh Alternative"
+msgstr "Alternativa"
+
+#: ../rules/base.xml.in.h:562
+msgid "Tifinagh Alternative Phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:563
+#, fuzzy
+msgid "Tifinagh Extended"
+msgstr "Estesa"
+
+#: ../rules/base.xml.in.h:564
+msgid "Tifinagh Extended Phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:565
+#, fuzzy
+msgid "Tifinagh Phonetic"
+msgstr "Fonetico"
+
+#: ../rules/base.xml.in.h:566
+msgid "Tilde (~) variant"
+msgstr "Variante tilde (~)"
+
+# codice tre lettere per tajikistan
+#: ../rules/base.xml.in.h:567
+msgid "Tjk"
+msgstr "TJK"
+
+#: ../rules/base.xml.in.h:568
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:569
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:570
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:571 ../rules/sun.xml.in.h:120
+msgid "Tur"
+msgstr "TUR"
+
+#: ../rules/base.xml.in.h:572
+#, fuzzy
+msgid "Turkey"
+msgstr "TUR"
+
+# Non sono sicuro vada tradotto
+#: ../rules/base.xml.in.h:573
+msgid "Typewriter"
+msgstr "Macchina per scrivere"
+
+#: ../rules/base.xml.in.h:574
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Tastiera USA con digrammi bosniaci"
+
+#: ../rules/base.xml.in.h:575
+msgid "US keyboard with Bosnian letters"
+msgstr "Tastiera USA con lettere bosniache"
+
+#: ../rules/base.xml.in.h:576
+msgid "US keyboard with Croatian digraphs"
+msgstr "Tastiera USA con digrammi croati"
+
+#: ../rules/base.xml.in.h:577
+msgid "US keyboard with Croatian letters"
+msgstr "Tastiera USA con lettere croate"
+
+#: ../rules/base.xml.in.h:578
+#, fuzzy
+msgid "US keyboard with Estonian letters"
+msgstr "Tastiera USA con lettere bosniache"
+
+#: ../rules/base.xml.in.h:579
+msgid "US keyboard with Lithuanian letters"
+msgstr "Tastiera USA con lettere lituane"
+
+# o slovacchi?
+#: ../rules/base.xml.in.h:580
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Tastiera USA con digrammi sloveni"
+
+#: ../rules/base.xml.in.h:581
+msgid "US keyboard with Slovenian letters"
+msgstr "Tastiera USA con lettere slovene"
+
+#: ../rules/base.xml.in.h:582 ../rules/sun.xml.in.h:126
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.xml.in.h:583
+#, fuzzy
+msgid "Udmurt"
+msgstr "Urdu"
+
+#: ../rules/base.xml.in.h:584
+msgid "Ukr"
+msgstr "UKR"
+
+# UE
+#: ../rules/base.xml.in.h:585
+msgid "Ukraine"
+msgstr "Ucraina"
+
+# Sarà da tradurre? -Luca
+#: ../rules/base.xml.in.h:586
+msgid "UnicodeExpert"
+msgstr "UnicodeEsperto"
+
+# UE
+#: ../rules/base.xml.in.h:587 ../rules/sun.xml.in.h:127
+msgid "United Kingdom"
+msgstr "Regno Unito"
+
+#: ../rules/base.xml.in.h:588
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../rules/base.xml.in.h:589
+msgid "Use Bosnian digraphs"
+msgstr "Usa digrammi bosniaci"
+
+#: ../rules/base.xml.in.h:590
+msgid "Use Croatian digraphs"
+msgstr "Usa digrammi croati"
+
+#: ../rules/base.xml.in.h:591
+msgid "Use Slovenian digraphs"
+msgstr "Usa digrammi sloveni"
+
+#: ../rules/base.xml.in.h:592
+#, fuzzy
+msgid "Use guillemets for quotes"
+msgstr "Usa caporali («») per virgolette (\"\")"
+
+# Using startard LEDs to indicate the alternative (not first) group(s) 
+#: ../rules/base.xml.in.h:593
+#, fuzzy
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Usare LED della tastiera per mostrare il gruppo alternativo."
+
+#: ../rules/base.xml.in.h:594
+msgid "Using space key to input non-breakable space character"
+msgstr ""
+
+#: ../rules/base.xml.in.h:595
+msgid "Uzb"
+msgstr "UZB"
+
+# UE
+#: ../rules/base.xml.in.h:596
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+# UE
+#: ../rules/base.xml.in.h:597
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../rules/base.xml.in.h:598
+msgid "Vnm"
+msgstr "VNK"
+
+#: ../rules/base.xml.in.h:599
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:600
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:601
+msgid "Wang model 724 azerty"
+msgstr ""
+
+#: ../rules/base.xml.in.h:602
+msgid "Western"
+msgstr ""
+
+#: ../rules/base.xml.in.h:603
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+# variante bielorussa
+#: ../rules/base.xml.in.h:604
+msgid "Winkeys"
+msgstr "Tasti Win"
+
+#: ../rules/base.xml.in.h:605
+msgid "With &lt;\\|&gt; key"
+msgstr "Con tasti &lt;\\|&gt;"
+
+#: ../rules/base.xml.in.h:606
+#, fuzzy
+msgid "With EuroSign on 5"
+msgstr "Aggiungere il simbolo € al tasto 5."
+
+# i caporali sono «» li aggiungo? -Luca
+#
+#  Con caporali («»)
+#
+#: ../rules/base.xml.in.h:607
+#, fuzzy
+msgid "With guillemets"
+msgstr "Con caporali («»)"
+
+#: ../rules/base.xml.in.h:608
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:609
+msgid "Yoruba"
+msgstr ""
+
+#: ../rules/base.xml.in.h:610
+msgid "Z and ZHE swapped"
+msgstr "Z e ZHE invertiti"
+
+#: ../rules/base.xml.in.h:611
+msgid "Zar"
+msgstr ""
+
+#: ../rules/base.xml.in.h:612
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:613
+msgid "azerty/digits"
+msgstr "azerty/cifre"
+
+#: ../rules/base.xml.in.h:614
+msgid "digits"
+msgstr "cifre"
+
+#: ../rules/base.xml.in.h:615
+msgid "displaced semicolon and quote (obsolete)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:616
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:617 ../rules/sun.xml.in.h:132
+msgid "qwerty"
+msgstr "querty"
+
+#: ../rules/base.xml.in.h:618
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, backslash esteso"
+
+#: ../rules/base.xml.in.h:619
+msgid "qwerty/digits"
+msgstr "querty/cifre"
+
+#: ../rules/base.xml.in.h:620
+msgid "qwertz"
+msgstr "qwertz"
+
+# Non sono sicuro vada tradotto
+#: ../rules/sun.xml.in.h:1
+#, fuzzy
+msgid "\"Typewriter\""
+msgstr "Macchina per scrivere"
+
+#: ../rules/sun.xml.in.h:17
+#, fuzzy
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr "BlocMaiusc agisce come Maiusc con il blocco. Maiusc annulla BlocMaiusc."
+
+#: ../rules/sun.xml.in.h:18
+#, fuzzy
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "BlocMaiusc agisce come Maiusc con il blocco. Maiusc non annulla BlocMaiusc."
+
+#: ../rules/sun.xml.in.h:19
+#, fuzzy
+msgid "Alt+Control changes group"
+msgstr "Alt+Ctrl cambia il gruppo."
+
+#: ../rules/sun.xml.in.h:20
+#, fuzzy
+msgid "Alt+Shift changes group"
+msgstr "Alt+Maiusc cambia il gruppo."
+
+#: ../rules/sun.xml.in.h:21
+msgid "Basic"
+msgstr ""
+
+# UE
+#: ../rules/sun.xml.in.h:23
+#, fuzzy
+msgid "Belgian"
+msgstr "Belgio"
+
+#: ../rules/sun.xml.in.h:25
+#, fuzzy
+msgid "Both Alt keys together change group"
+msgstr "I tasti Alt insieme cambiano gruppo."
+
+#: ../rules/sun.xml.in.h:26
+#, fuzzy
+msgid "Both Ctrl keys together change group"
+msgstr "I tasti Ctrl insieme cambiano gruppo."
+
+#: ../rules/sun.xml.in.h:27
+#, fuzzy
+msgid "Both Shift keys together change group"
+msgstr "I tasti Maiusc insieme cambiano gruppo."
+
+# UE
+#: ../rules/sun.xml.in.h:28
+msgid "Bulgarian"
+msgstr "Bulgara"
+
+# UE
+#: ../rules/sun.xml.in.h:30
+msgid "Canadian"
+msgstr "Canadese"
+
+#: ../rules/sun.xml.in.h:31
+msgid "Caps Lock is Compose"
+msgstr "BlocMaiusc è Compose"
+
+#: ../rules/sun.xml.in.h:32
+msgid "Caps Lock key changes group"
+msgstr "Il tasto BlocMaiusc cambia il gruppo"
+
+#: ../rules/sun.xml.in.h:34
+#, fuzzy
+msgid "Caps_Lock LED shows alternative group"
+msgstr "Il LED BlocMaiusc mostra il gruppo alternativo."
+
+#: ../rules/sun.xml.in.h:35
+msgid "Control Key Position"
+msgstr "Posizione tasto Control"
+
+#: ../rules/sun.xml.in.h:36
+msgid "Control key at bottom left"
+msgstr "Il tasto Control è in basso a sinistra"
+
+#: ../rules/sun.xml.in.h:37
+msgid "Control key at left of 'A'"
+msgstr "Il tasto Control è a sinistra di «A»"
+
+#: ../rules/sun.xml.in.h:38
+msgid "Control+Shift changes group"
+msgstr "Control+Maiusc cambia il gruppo"
+
+# UE
+#: ../rules/sun.xml.in.h:40
+msgid "Czech"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:41
+msgid "Danish"
+msgstr ""
+
+# codice tre lettere per germania<
+#: ../rules/sun.xml.in.h:45
+msgid "DeuCH"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:47
+msgid "Dvo"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:52
+msgid "Finnish"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:54
+msgid "FraCH"
+msgstr ""
+
+# UE
+#: ../rules/sun.xml.in.h:57
+msgid "German"
+msgstr ""
+
+# questo shift non indica il tasto maiusc. 
+# Cfr la capplet di GNOME per le opzioni relative.
+#: ../rules/sun.xml.in.h:58
+msgid "Group Shift/Lock behavior"
+msgstr "Comportamento cambio/blocco del gruppo"
+
+# UE
+#: ../rules/sun.xml.in.h:60
+msgid "Hungarian"
+msgstr "Ungherese"
+
+# UE
+#: ../rules/sun.xml.in.h:64
+msgid "Italian"
+msgstr "Italiana"
+
+# UE
+#: ../rules/sun.xml.in.h:65
+msgid "Japanese"
+msgstr "Giapponese"
+
+#: ../rules/sun.xml.in.h:67
+msgid "Left Alt key changes group"
+msgstr "Il tasto Alt sinistro cambia il gruppo"
+
+#: ../rules/sun.xml.in.h:68
+msgid "Left Alt key switches group while pressed"
+msgstr "Il tasto Alt sinistro commuta il gruppo mentre è premuto"
+
+#: ../rules/sun.xml.in.h:69
+msgid "Left Ctrl key changes group"
+msgstr "Il tasto Ctrl sinistro cambia il gruppo"
+
+#: ../rules/sun.xml.in.h:70
+msgid "Left Shift key changes group"
+msgstr "Il tasto Maiusc sinistro cambia il gruppo"
+
+#: ../rules/sun.xml.in.h:71
+msgid "Make CapsLock an additional Control"
+msgstr "Rendere BlocMaiusc un Control aggiuntivo"
+
+# UE
+#: ../rules/sun.xml.in.h:76
+msgid "Norwegian"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:77
+#, fuzzy
+msgid "Num_Lock LED shows alternative group"
+msgstr "Il LED BloccaNum mostra il gruppo alternativo."
+
+#: ../rules/sun.xml.in.h:80
+#, fuzzy
+msgid "Polish"
+msgstr "POL"
+
+#: ../rules/sun.xml.in.h:81
+msgid "Polish with Polish quotes on key \"1/!\""
+msgstr ""
+
+#: ../rules/sun.xml.in.h:82
+msgid "Portuguese"
+msgstr "Portoghese"
+
+#: ../rules/sun.xml.in.h:83
+msgid "Press Left Alt key to choose 3rd level"
+msgstr "Premere il tasto Alt sinistro per scegliere il 3° livello"
+
+#: ../rules/sun.xml.in.h:84
+msgid "Press Right Alt key to choose 3rd level"
+msgstr "Premere il tasto Alt destro per scegliere il 3° livello"
+
+#: ../rules/sun.xml.in.h:85
+#, fuzzy
+msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr "Premere il tasto Alt destro per scegliere il 3° livello."
+
+#: ../rules/sun.xml.in.h:86
+msgid "Press Right Control to choose 3rd level"
+msgstr "Premere il tasto Control destro per scegliere il 3° livello"
+
+#: ../rules/sun.xml.in.h:87
+msgid "Press any of Alt keys to choose 3rd level"
+msgstr "Premere uno dei tasti Alt per scegliere il 3° livello"
+
+#: ../rules/sun.xml.in.h:89
+msgid "Right Alt key changes group"
+msgstr "Il tasto Alt destro cambia il gruppo"
+
+#: ../rules/sun.xml.in.h:91
+msgid "Right Alt switches group while pressed"
+msgstr "Il tasto Alt destro commuta il gruppo mentre è premuto"
+
+#: ../rules/sun.xml.in.h:92
+msgid "Right Control key works as Right Alt"
+msgstr "I tasto Control destro opera come il tasto Alt destro"
+
+#: ../rules/sun.xml.in.h:93
+msgid "Right Ctrl key changes group"
+msgstr "Il tasto Ctrl destro cambia il gruppo"
+
+#: ../rules/sun.xml.in.h:94
+msgid "Right Shift key changes group"
+msgstr "Il tasto Maiusc destro cambia il gruppo"
+
+#: ../rules/sun.xml.in.h:97
+msgid "Scroll Lock changes group"
+msgstr "BlocMaiusc cambia il gruppo"
+
+#: ../rules/sun.xml.in.h:98
+#, fuzzy
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "Il LED BlocScorr mostra il gruppo alternativo."
+
+#: ../rules/sun.xml.in.h:99
+#, fuzzy
+msgid "Shift with numpad keys works as in MS Windows"
+msgstr "Maiusc assieme ai tasti numerici opera come in MS Windows."
+
+#: ../rules/sun.xml.in.h:100
+msgid "Shift+CapsLock changes group"
+msgstr "Maiusc+BlocMaiusc cambia la disposizione."
+
+#: ../rules/sun.xml.in.h:101
+msgid "Slovak"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:102
+msgid "Spanish"
+msgstr "Spagnola"
+
+#: ../rules/sun.xml.in.h:105
+msgid "Sun Type 4"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:106
+msgid "Sun Type 5"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:107
+msgid "Sun Type 5 European"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:108
+msgid "Sun Type 5 Unix"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:109
+msgid "Sun Type 6"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:110
+msgid "Sun Type 6 Unix"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:111
+msgid "Sun Type 6 with Euro key"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:114
+msgid "Swap Control and Caps Lock"
+msgstr "Invertire Control e BlocMaiusc."
+
+#: ../rules/sun.xml.in.h:116
+msgid "Swedish"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:117
+msgid "Swiss French"
+msgstr ""
+
+# UE
+#: ../rules/sun.xml.in.h:118
+msgid "Swiss German"
+msgstr ""
+
+# UE
+#: ../rules/sun.xml.in.h:121
+msgid "Turkish"
+msgstr "Turco"
+
+# UE
+#: ../rules/sun.xml.in.h:122
+#, fuzzy
+msgid "Turkish (F)"
+msgstr "Turco"
+
+#: ../rules/sun.xml.in.h:123
+msgid "Turkish Alt-Q Layout"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:124
+msgid "U.S. English"
+msgstr "Inglese americano"
+
+#: ../rules/sun.xml.in.h:125
+msgid "U.S. English w/ ISO9995-3"
+msgstr "Inglese americano w/ ISO9995-3"
+
+# Using startard LEDs to indicate the alternative (not first) group(s) 
+#: ../rules/sun.xml.in.h:128
+#, fuzzy
+msgid "Use keyboard LED to show alternative group"
+msgstr "Usare LED della tastiera per mostrare il gruppo alternativo."
+
+# "Internal" capitalization means capitalization using some internal tables.
+#            Otherwise "as Shift" - means using next group.
+#: ../rules/sun.xml.in.h:129
+#, fuzzy
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr "BlocMaiusc attiva l'uso interno delle lettere maiuscole. Maiusc annulla BlocMaiusc."
+
+#: ../rules/sun.xml.in.h:130
+#, fuzzy
+msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+msgstr "BlocMaiusc attiva l'uso interno delle lettere maiuscole. Maiusc non annulla BlocMaiusc."
+
+#: ../rules/sun.xml.in.h:131
+msgid "bksl"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:133
+msgid "type4"
+msgstr ""
diff --git a/xorg-server/xkbdata.src/po/ka.po b/xorg-server/xkbdata.src/po/ka.po
new file mode 100644
index 000000000..f1dad4d71
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/ka.po
@@ -0,0 +1,2274 @@
+# translation of xkeyboard-config.po to Georgian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Vladimer Sichinava <vlsichinava@gmail.com>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-09-17 21:37+0100\n"
+"PO-Revision-Date: 2006-09-20 22:48+0200\n"
+"Last-Translator: Vladimer Sichinava <vlsichinava@gmail.com>\n"
+"Language-Team: Georgian <www.gia.ge>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2
+msgid "101/104 key Compatible"
+msgstr "101/104 ღილ�კი�ნი თ�ვსებ�დი"
+
+#: ../rules/base.xml.in.h:3
+msgid "101/qwerty/comma/Dead keys"
+msgstr ""
+"pc101, qwerty, მძიმე, სპეც კლ�ვიშები "
+"(dead keys)"
+
+#: ../rules/base.xml.in.h:4
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr ""
+"pc101, qwerty, მძიმე, სპეც კლ�ვიშების "
+"(dead keys) გ�რეშე"
+
+#: ../rules/base.xml.in.h:5
+msgid "101/qwerty/dot/Dead keys"
+msgstr ""
+"pc101, qwerty, წერტილი, სპეც "
+"კლ�ვიშები (dead keys)"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr ""
+"pc101, qwerty, წერტილი, სპეც "
+"კლ�ვიშები (dead keys) გ�რეშე"
+
+#: ../rules/base.xml.in.h:7
+msgid "101/qwertz/comma/Dead keys"
+msgstr ""
+"pc101, qwertz, მძიმე, სპეც კლ�ვიშები "
+"(dead keys)"
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr ""
+"pc101, qwertz, მძიმე, სპეც კლ�ვიშების "
+"(dead keys) გ�რეშე"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwertz/dot/Dead keys"
+msgstr ""
+"pc101, qwertz, წერტილი, სპეც "
+"კლ�ვიშები (dead keys)"
+
+#: ../rules/base.xml.in.h:10
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr ""
+"pc101, qwertz, წერტილი, სპეც "
+"კლ�ვიშების (dead keys) გ�რეშე"
+
+#: ../rules/base.xml.in.h:11
+msgid "102/qwerty/comma/Dead keys"
+msgstr ""
+"pc102, qwerty, მძიმე, სპეც კლ�ვიშები "
+"(dead keys)"
+
+#: ../rules/base.xml.in.h:12
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr ""
+"pc102, qwerty, მძიმე, სპეც კლ�ვიშების "
+"(dead keys) გ�რეშე"
+
+#: ../rules/base.xml.in.h:13
+msgid "102/qwerty/dot/Dead keys"
+msgstr ""
+"pc102, qwertz, წერტილი, სპეც "
+"კლ�ვიშები (dead keys)"
+
+#: ../rules/base.xml.in.h:14
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr ""
+"pc102, qwerty, წერტილი, სპეც "
+"კლ�ვიშების (dead keys) გ�რეშე"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwertz/comma/Dead keys"
+msgstr ""
+"pc102, qwertz, მძიმე, სპეც კლ�ვიშები "
+"(dead keys)"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr ""
+"pc102, qwertz, მძიმე, სპეც კლ�ვიშების "
+"(dead keys) გ�რეშე"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwertz/dot/Dead keys"
+msgstr ""
+"pc102, qwertz, წერტილი, სპეც "
+"კლ�ვიშები (dead keys)"
+
+#: ../rules/base.xml.in.h:18
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr ""
+"pc102, qwertz, წერტილი, სპეც "
+"კლ�ვიშების (dead keys) გ�რეშე"
+
+#: ../rules/base.xml.in.h:19
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:20
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:21
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:22
+msgid "ACPI Standard"
+msgstr "სტ�ნდ�რტული ACPI"
+
+#: ../rules/base.xml.in.h:23
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:24
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:25
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:26
+msgid "Acer TravelMate 800"
+msgstr "Acer TravelMate 800"
+
+#: ../rules/base.xml.in.h:27
+msgid "Add the EuroSign to the 2 key."
+msgstr ""
+"ევრ�ს ნიშნის 2ი�ნის კლ�ვიშზე "
+"დ�მ�ტებ�."
+
+#: ../rules/base.xml.in.h:28
+msgid "Add the EuroSign to the 5 key."
+msgstr ""
+"ევრ�ს ნიშნის 5ი�ნის კლ�ვიშზე "
+"დ�მ�ტებ�."
+
+#: ../rules/base.xml.in.h:29
+msgid "Add the EuroSign to the E key."
+msgstr ""
+"ევრ�ს ნიშნის E �ს�ს კლ�ვიშზე "
+"დ�მ�ტებ�."
+
+#: ../rules/base.xml.in.h:30
+msgid "Add the standard behavior to Menu key."
+msgstr ""
+"მენიუს კლ�ვიშისთვის "
+"სტ�ნდ�რტული ქცევის "
+"მინიჭებ�."
+
+#: ../rules/base.xml.in.h:31
+msgid "Adding the EuroSign to certain keys"
+msgstr ""
+"ევრ�ს ნიშნის ზ�გიერთ "
+"კლ�ვიშებზე დ�მ�ტებ�"
+
+#: ../rules/base.xml.in.h:32
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:33
+msgid "Afg"
+msgstr "�ვღ"
+
+#: ../rules/base.xml.in.h:34
+msgid "Afghanistan"
+msgstr "�ვღ�ნეთი"
+
+#: ../rules/base.xml.in.h:35
+msgid "Akan"
+msgstr "�კ�ნი"
+
+#: ../rules/base.xml.in.h:36
+msgid "Alb"
+msgstr "�ლბ"
+
+#: ../rules/base.xml.in.h:37
+msgid "Albania"
+msgstr "�ლბ�ნეთი"
+
+#: ../rules/base.xml.in.h:38
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr ""
+"Alt დ� Meta, Alt ღილ�კზე "
+"(ნ�გულისხმევი�)."
+
+#: ../rules/base.xml.in.h:39
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr ""
+"Alt შეეს�ბ�მებ� მ�რჯვენ� Win "
+"ღილ�კს, Super   კი Menu-ს."
+
+#: ../rules/base.xml.in.h:40
+msgid "Alt+CapsLock changes group."
+msgstr "Alt + CapsLock ცვლის ჯგუფს."
+
+#: ../rules/base.xml.in.h:41
+msgid "Alt+Ctrl changes group."
+msgstr "Alt + Ctrl ცვლის ჯგუფს."
+
+#: ../rules/base.xml.in.h:42
+msgid "Alt+Shift changes group."
+msgstr "Alt + Shift ცვლის ჯგუფს."
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win კლ�ვიშთ� ქცევ�"
+
+#: ../rules/base.xml.in.h:45
+msgid "Alternative"
+msgstr "�ლტერნ�ტიული"
+
+#: ../rules/base.xml.in.h:46
+msgid "Alternative international (former us_intl)"
+msgstr ""
+"�ლტერნ�ტიული "
+"ინტერნ�ცი�ნ�ლური"
+
+#: ../rules/base.xml.in.h:47
+msgid "Alternative, Sun dead keys"
+msgstr ""
+"�ლტერნ�ტიული, Sun სპეც "
+"კლ�ვიშებით (dead keys)"
+
+#: ../rules/base.xml.in.h:48
+msgid "Alternative, eliminate dead keys"
+msgstr ""
+"�ლტერნ�ტიული, სპეც "
+"კლ�ვიშების (dead keys) გ�რეშე"
+
+#: ../rules/base.xml.in.h:49
+msgid "And"
+msgstr "�ნდ"
+
+#: ../rules/base.xml.in.h:50
+msgid "Andorra"
+msgstr "�ნდ�რ�"
+
+#: ../rules/base.xml.in.h:51
+msgid "Apostrophe (') variant"
+msgstr "(') �პ�სტრ�ფი�ნი ვ�რი�ნტი"
+
+#: ../rules/base.xml.in.h:52
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:53
+msgid "Apple Laptop"
+msgstr "Apple ლეპტ�პი"
+
+#: ../rules/base.xml.in.h:54
+msgid "Ara"
+msgstr "�რ�"
+
+#: ../rules/base.xml.in.h:55
+msgid "Arabic"
+msgstr "�რ�ბული"
+
+#: ../rules/base.xml.in.h:56
+msgid "Arm"
+msgstr "ს�მხ"
+
+#: ../rules/base.xml.in.h:57
+msgid "Armenia"
+msgstr "ს�მხეთი"
+
+#: ../rules/base.xml.in.h:58
+msgid "Aze"
+msgstr "�ზერ"
+
+#: ../rules/base.xml.in.h:59
+msgid "Azerbaijan"
+msgstr "�ზერბ�იჯ�ნი"
+
+#: ../rules/base.xml.in.h:60
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet Keyboard"
+
+#: ../rules/base.xml.in.h:61
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:62
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:63
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:64
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:65
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:66
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:67
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:68
+msgid "Ban"
+msgstr "ბ�ნ"
+
+#: ../rules/base.xml.in.h:69
+msgid "Bangladesh"
+msgstr "ბ�ნგლ�დეში"
+
+#: ../rules/base.xml.in.h:70
+msgid "Bel"
+msgstr "ბელ"
+
+#: ../rules/base.xml.in.h:71
+msgid "Belarus"
+msgstr "ბელ�რუსი�"
+
+#: ../rules/base.xml.in.h:72
+msgid "Belgium"
+msgstr "ბელგი�"
+
+#: ../rules/base.xml.in.h:73
+msgid "Bengali"
+msgstr "ბენგ�ლი"
+
+#: ../rules/base.xml.in.h:74
+msgid "Bengali Probhat"
+msgstr "ბენგ�ლის პრ�ბ�ტი"
+
+#: ../rules/base.xml.in.h:75
+msgid "Bgr"
+msgstr "ბ�ლგ"
+
+#: ../rules/base.xml.in.h:76
+msgid "Bhu"
+msgstr "ბუტ"
+
+#: ../rules/base.xml.in.h:77
+msgid "Bhutan"
+msgstr "ბუტ�ნი"
+
+#: ../rules/base.xml.in.h:78
+msgid "Bih"
+msgstr "ბ�სნ"
+
+#: ../rules/base.xml.in.h:79
+msgid "Blr"
+msgstr "ბელ"
+
+#: ../rules/base.xml.in.h:80
+msgid "Bosnia and Herzegovina"
+msgstr "ბ�სნი� დ� ჰერც�გ�ვინ�"
+
+#: ../rules/base.xml.in.h:81
+msgid "Both Alt keys together change group."
+msgstr ""
+"�რივე Alt ღილ�კი ერთ�დ ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:82
+msgid "Both Ctrl keys together change group."
+msgstr ""
+"�რივე Ctrl ღილ�კი ერთ�დ ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:83
+msgid "Both Shift keys together change group."
+msgstr ""
+"�რივე Shift ღილ�კი ერთ�დ ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:84
+msgid "Both Win-keys switch group while pressed."
+msgstr ""
+"�რივე Win ღილ�კი ერთ�დ ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:85
+msgid "Bra"
+msgstr "ბრ�ზ"
+
+#: ../rules/base.xml.in.h:86
+msgid "Brazil"
+msgstr "ბრ�ზილი�"
+
+#: ../rules/base.xml.in.h:87
+msgid "Brazilian ABNT2"
+msgstr "ბრ�ზილიური ABNT2"
+
+#: ../rules/base.xml.in.h:88
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bulgaria"
+msgstr "ბულგ�რეთი"
+
+#: ../rules/base.xml.in.h:90
+msgid "Cambodia"
+msgstr "კ�მბ�ჯ�"
+
+#: ../rules/base.xml.in.h:91
+msgid "Can"
+msgstr "კ�ნ"
+
+#: ../rules/base.xml.in.h:92
+msgid "Canada"
+msgstr "კ�ნ�დ�"
+
+#: ../rules/base.xml.in.h:93
+msgid "Caps Lock is Compose."
+msgstr ""
+"ღილ�კი 	Caps Lock შეეს�ბ�მებ� Compose-ს."
+
+#: ../rules/base.xml.in.h:94
+msgid "CapsLock LED shows alternative group."
+msgstr ""
+"CapsLock-ის ინდიკ�ტ�რი �ჩვენებს "
+"დ�მ�ტებით ჯგუფებს."
+
+#: ../rules/base.xml.in.h:95
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr ""
+"მუშ��ბს რ�გ�რც დ�ბლ�კილი Shift, "
+"ის �ყ�ვნებს CapsLock-ის "
+"მ�ქმედებ�ს."
+
+#: ../rules/base.xml.in.h:96
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr ""
+"მუშ��ბს რ�გ�რც დ�ბლ�კილი Shift, "
+"ის �რ �ყ�ვნებს CapsLock-ის "
+"მ�ქმედებ�ს."
+
+#: ../rules/base.xml.in.h:97
+msgid "CapsLock just locks the Shift modifier."
+msgstr ""
+"CapsLock-ი ბლ�კ�ვს Shift "
+"მ�დიფიკ�ტ�რს."
+
+#: ../rules/base.xml.in.h:98
+msgid "CapsLock key behavior"
+msgstr "CapsLock ღილ�კის ქცევ�"
+
+#: ../rules/base.xml.in.h:99
+msgid "CapsLock key changes group."
+msgstr "CapsLock ღილ�კი ცვლის ჯგუფს."
+
+#: ../rules/base.xml.in.h:100
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr ""
+"CapsLock რთ�ვს Shift-ს, ეხებ� ყველ� "
+"ღილ�კს."
+
+#: ../rules/base.xml.in.h:101
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr ""
+"CapsLock რთ�ვს �ლფ�ვიტის "
+"სიმბ�ლ�ების უბრ�ლ� "
+"კ�პიტ�ლიზ�ცი�ს."
+
+#: ../rules/base.xml.in.h:102
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr ""
+"რთ�ვს შიდ� კ�პიტ�ლიზ�ცი�ს. "
+"Shift �ყ�ვნებს CapsLock-ს. "
+
+#: ../rules/base.xml.in.h:103
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr ""
+"რთ�ვს შიდ� კ�პიტ�ლიზ�ცი�ს. "
+"Shift �რ ეხებ� CapsLock-ს. "
+
+#: ../rules/base.xml.in.h:104
+msgid "Catalan variant with middle-dot L"
+msgstr "კ�ტ�ლ�ნური ს�შუ�ლ� L-ით"
+
+#: ../rules/base.xml.in.h:105
+msgid "Che"
+msgstr "შვეიც"
+
+#: ../rules/base.xml.in.h:106
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:107
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr ""
+"Cherry Blue Line CyBo@rd (�ლტერნ�ტიული "
+"ვ�რი�ნტი)"
+
+#: ../rules/base.xml.in.h:108
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:109
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:110
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:111
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:112
+msgid "Classic Dvorak"
+msgstr "კლ�სიკური Dvorak"
+
+#: ../rules/base.xml.in.h:113
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:114
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:115
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 ღილ�კი�ნი)"
+
+#: ../rules/base.xml.in.h:116
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 ღილ�კი�ნი)"
+
+#: ../rules/base.xml.in.h:117
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 ღილ�კი�ნი)"
+
+#: ../rules/base.xml.in.h:118
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:119
+msgid "Compose key position"
+msgstr "Compose კლ�ვიშის პ�ზიცი�"
+
+#: ../rules/base.xml.in.h:120
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+"კ�ნგ�ს დემ�კრ�ტიული "
+"რესპუბლიკ�"
+
+#: ../rules/base.xml.in.h:121
+msgid "Croatia"
+msgstr "ხ�რვ�ტი�"
+
+#: ../rules/base.xml.in.h:122
+msgid "Ctrl key at bottom left"
+msgstr "Ctrl ღილ�კი ქვემ�თ მ�რცხნივ"
+
+#: ../rules/base.xml.in.h:123
+msgid "Ctrl key at left of 'A'"
+msgstr "Ctrl ღილ�კი A �ს�ს მ�რცხნივ"
+
+#: ../rules/base.xml.in.h:124
+msgid "Ctrl key position"
+msgstr ""
+"Ctrl ღილ�კის �დგილმდებ�რე�ბ�"
+
+#: ../rules/base.xml.in.h:125
+msgid "Ctrl+Shift changes group."
+msgstr "Ctrl Shift ცვლის ჯგუფს."
+
+#: ../rules/base.xml.in.h:126
+msgid "Cyrillic"
+msgstr "კირილიც�"
+
+#: ../rules/base.xml.in.h:127
+msgid "Cze"
+msgstr "ჩეხ"
+
+#: ../rules/base.xml.in.h:128
+msgid "Czechia"
+msgstr "ჩეხეთი"
+
+#: ../rules/base.xml.in.h:129
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:130
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:131
+msgid "Dead acute"
+msgstr "სპეც. სიმბ�ლ� Dead acute"
+
+#: ../rules/base.xml.in.h:132
+msgid "Dead grave acute"
+msgstr "სპეც. სიმბ�ლ� Dead grave acute"
+
+#: ../rules/base.xml.in.h:133
+msgid "Default numpad keys."
+msgstr ""
+"სტ�ნდ�რტული ციფრული "
+"კლ�ვიშები"
+
+#: ../rules/base.xml.in.h:134
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:135
+msgid "Dell 101-key PC"
+msgstr "Dell 101-კლ�ვიში�ნი PC"
+
+#: ../rules/base.xml.in.h:136
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude series laptop"
+
+#: ../rules/base.xml.in.h:137
+msgid "Dell USB Multimedia Keybard"
+msgstr "Dell USB Multimedia Keybard"
+
+#: ../rules/base.xml.in.h:138
+msgid "Denmark"
+msgstr "დ�ნი�"
+
+#: ../rules/base.xml.in.h:139
+msgid "Deu"
+msgstr "გერ"
+
+#: ../rules/base.xml.in.h:140
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:141
+msgid "Diamond 9801 / 9802 series"
+msgstr "მ�დელები Diamond 9801 / 9802 series"
+
+#: ../rules/base.xml.in.h:142
+msgid "Dnk"
+msgstr "დ�ნ"
+
+#: ../rules/base.xml.in.h:143
+msgid "Dvorak"
+msgstr "დვ�რ�კული"
+
+#: ../rules/base.xml.in.h:144
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr ""
+"Dvorak, პ�ლ�ნური ფრჩხილები \"1/!\" "
+"ღილ�კზე�"
+
+#: ../rules/base.xml.in.h:145
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr ""
+"Dvorak, პ�ლ�ნური ფრჩხილები, "
+"ფრჩხილების კლ�ვიშზე"
+
+#: ../rules/base.xml.in.h:146
+msgid "Eliminate dead keys"
+msgstr ""
+"სპეც ღილ�კების (dead keys) გ�მ�რთვ�"
+
+#: ../rules/base.xml.in.h:147
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:148
+msgid "Epo"
+msgstr "ეპ�"
+
+#: ../rules/base.xml.in.h:149
+msgid "Esp"
+msgstr "ესპ"
+
+#: ../rules/base.xml.in.h:150
+msgid "Esperanto"
+msgstr "ესპერ�ნტ�"
+
+#: ../rules/base.xml.in.h:151
+msgid "Est"
+msgstr "ესტ"
+
+#: ../rules/base.xml.in.h:152
+msgid "Estonia"
+msgstr "ესტ�ნეთი"
+
+#: ../rules/base.xml.in.h:153
+msgid "Evdev-managed keyboard"
+msgstr "Evdev-managed keyboard"
+
+#: ../rules/base.xml.in.h:154
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:155
+msgid "Ewe"
+msgstr "ივი"
+
+#: ../rules/base.xml.in.h:156
+msgid "Extended"
+msgstr "გ�ფ�რთ�ებული"
+
+#: ../rules/base.xml.in.h:157
+msgid "Extended Backslash"
+msgstr ""
+"Backslash გ�ფ�რთ�ებული ფუნქციები"
+
+#: ../rules/base.xml.in.h:158
+msgid "F-letter (F) variant"
+msgstr "F-ს ვ�რი�ნტი"
+
+#: ../rules/base.xml.in.h:159
+msgid "Fao"
+msgstr "ფ�რ"
+
+#: ../rules/base.xml.in.h:160
+msgid "Faroe Islands"
+msgstr "ფ�რერის კუნძულები"
+
+#: ../rules/base.xml.in.h:161
+msgid "Fin"
+msgstr "ფინ"
+
+#: ../rules/base.xml.in.h:162
+msgid "Finland"
+msgstr "ფინეთი"
+
+#: ../rules/base.xml.in.h:163
+msgid "Fra"
+msgstr "ფრ�"
+
+#: ../rules/base.xml.in.h:164
+msgid "France"
+msgstr "ს�ფრ�ნგეთი"
+
+#: ../rules/base.xml.in.h:165
+msgid "French"
+msgstr "ფრ�ნგული"
+
+#: ../rules/base.xml.in.h:166
+msgid "French (Macintosh)"
+msgstr "ფრ�ნგული (Macintosh)"
+
+#: ../rules/base.xml.in.h:167
+msgid "French (legacy)"
+msgstr "ფრ�ნგული (legacy)"
+
+#: ../rules/base.xml.in.h:168
+msgid "French Dvorak"
+msgstr "ფრ�ნგული Dvorak"
+
+#: ../rules/base.xml.in.h:169
+msgid "French, Sun dead keys"
+msgstr "ფრ�ნგული, Sun dead keys"
+
+#: ../rules/base.xml.in.h:170
+msgid "French, eliminate dead keys"
+msgstr "ფრ�ნგული, dead keys გ�რეშე"
+
+#: ../rules/base.xml.in.h:171
+msgid "Fula"
+msgstr "ფულ�"
+
+#: ../rules/base.xml.in.h:172
+msgid "GBr"
+msgstr "ბრიტ"
+
+#: ../rules/base.xml.in.h:173
+msgid "Ga"
+msgstr "გ�"
+
+#: ../rules/base.xml.in.h:174
+msgid "Generic 101-key PC"
+msgstr "სტ�ნდ�რტული 101-ღილ�კი�ნი PC"
+
+#: ../rules/base.xml.in.h:175
+msgid "Generic 102-key (Intl) PC"
+msgstr ""
+"სტ�ნდ�რტული 102-ღილ�კი�ნი (Intl) PC"
+
+#: ../rules/base.xml.in.h:176
+msgid "Generic 104-key PC"
+msgstr "სტ�ნდ�რტული 104-ღილ�კი�ნი PC"
+
+#: ../rules/base.xml.in.h:177
+msgid "Generic 105-key (Intl) PC"
+msgstr ""
+"სტ�ნდ�რტული 105-ღილ�კი�ნი (Intl) PC"
+
+#: ../rules/base.xml.in.h:178
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:179
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:180
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:181
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:182
+msgid "Geo"
+msgstr "ქ�რთ"
+
+#: ../rules/base.xml.in.h:183
+msgid "Georgia"
+msgstr "ს�ქ�რთველ�"
+
+#: ../rules/base.xml.in.h:184
+msgid "German (Macintosh)"
+msgstr "გერმ�ნული (Macintosh)"
+
+#: ../rules/base.xml.in.h:185
+msgid "German, Sun dead keys"
+msgstr "გერმ�ნული, Sun dead keys"
+
+#: ../rules/base.xml.in.h:186
+msgid "German, eliminate dead keys"
+msgstr "გერმ�ნული, სპეც dead keys გ�რეშე"
+
+#: ../rules/base.xml.in.h:187
+msgid "Germany"
+msgstr "გერმ�ნი�"
+
+#: ../rules/base.xml.in.h:188
+msgid "Gha"
+msgstr "გ�ნ"
+
+#: ../rules/base.xml.in.h:189
+msgid "Ghana"
+msgstr "გ�ნ�"
+
+#: ../rules/base.xml.in.h:190
+msgid "Gre"
+msgstr "ს�ბ"
+
+#: ../rules/base.xml.in.h:191
+msgid "Greece"
+msgstr "ს�ბერძნეთი"
+
+#: ../rules/base.xml.in.h:192
+msgid "Group Shift/Lock behavior"
+msgstr ""
+"გ�ნლ�გების შეცვლის ფუნქცი�"
+
+#: ../rules/base.xml.in.h:193
+msgid "Gujarati"
+msgstr "გუჯ�რ�თი"
+
+#: ../rules/base.xml.in.h:194
+msgid "Gurmukhi"
+msgstr "გურმუხი"
+
+#: ../rules/base.xml.in.h:195
+msgid "Gyration"
+msgstr "გირ�შნ"
+
+#: ../rules/base.xml.in.h:196
+msgid "Hausa"
+msgstr "ჰ�უს�"
+
+#: ../rules/base.xml.in.h:197
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:198
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:199
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:200
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:201
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:202
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:203
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:204
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:205
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:206
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:207
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:208
+msgid "Hrv"
+msgstr "ხ�რ"
+
+#: ../rules/base.xml.in.h:209
+msgid "Hun"
+msgstr "უნგ"
+
+#: ../rules/base.xml.in.h:210
+msgid "Hungary"
+msgstr "უნგრეთი"
+
+#: ../rules/base.xml.in.h:211
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper შეეს�ბ�მებ� Win ღილ�კებს."
+
+#: ../rules/base.xml.in.h:212
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:213
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:214
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:215
+msgid "IBM Rapid Access II (alternate option)"
+msgstr ""
+"IBM Rapid Access II (�ლტერნ�ტიული "
+"ვ�რი�ნტი)"
+
+#: ../rules/base.xml.in.h:216
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:217
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:218
+msgid "ISO Alternate"
+msgstr "დ�მ�ტებითი ISO"
+
+#: ../rules/base.xml.in.h:219
+msgid "Iceland"
+msgstr "ისლ�ნდი�"
+
+#: ../rules/base.xml.in.h:220
+msgid "Ind"
+msgstr "ინდ"
+
+#: ../rules/base.xml.in.h:221
+msgid "India"
+msgstr "ინდ�ეთი"
+
+#: ../rules/base.xml.in.h:222
+msgid "International (with dead keys)"
+msgstr ""
+"ს�ერთ�შ�რის�, სპეც "
+"ღილ�კებით (dead keys)"
+
+#: ../rules/base.xml.in.h:223
+msgid "Inuktitut"
+msgstr "ინუკტიტუტი"
+
+#: ../rules/base.xml.in.h:224
+msgid "Iran"
+msgstr "ირ�ნი"
+
+#: ../rules/base.xml.in.h:225
+msgid "Iraq"
+msgstr "ერ�ყი"
+
+#: ../rules/base.xml.in.h:226
+msgid "Ireland"
+msgstr "ირლ�ნდი�"
+
+#: ../rules/base.xml.in.h:227
+msgid "Irl"
+msgstr "ირლ"
+
+#: ../rules/base.xml.in.h:228
+msgid "Irn"
+msgstr "ირ�"
+
+#: ../rules/base.xml.in.h:229
+msgid "Irq"
+msgstr "ერ�"
+
+#: ../rules/base.xml.in.h:230
+msgid "Isl"
+msgstr "ისლ"
+
+#: ../rules/base.xml.in.h:231
+msgid "Isr"
+msgstr "ებრ"
+
+#: ../rules/base.xml.in.h:232
+msgid "Israel"
+msgstr "ისრ�ელი"
+
+#: ../rules/base.xml.in.h:233
+msgid "Ita"
+msgstr "იტ�"
+
+#: ../rules/base.xml.in.h:234
+msgid "Italy"
+msgstr "იტ�ლი�"
+
+#: ../rules/base.xml.in.h:235
+msgid "Japan"
+msgstr "ი�პ�ნი�"
+
+#: ../rules/base.xml.in.h:236
+msgid "Japan (PC-98xx Series)"
+msgstr "Japan (PC-98xx Series)"
+
+#: ../rules/base.xml.in.h:237
+msgid "Japanese 106-key"
+msgstr "ი�პ�ნი� 106-ღილ�კი�ნი"
+
+#: ../rules/base.xml.in.h:238
+msgid "Jpn"
+msgstr "ი�პ"
+
+#: ../rules/base.xml.in.h:239
+msgid "Kannada"
+msgstr "კ�ნნ�დ�"
+
+#: ../rules/base.xml.in.h:240
+msgid "Kashubian"
+msgstr "კ�შუბი�ნი"
+
+#: ../rules/base.xml.in.h:241
+msgid "Kaz"
+msgstr "ყ�ზ"
+
+#: ../rules/base.xml.in.h:242
+msgid "Kazakh with Russian"
+msgstr "ყ�ზ�ხური რუსულთ�ნ"
+
+#: ../rules/base.xml.in.h:243
+msgid "Kazakhstan"
+msgstr "ყ�ზ�ხეთი"
+
+#: ../rules/base.xml.in.h:244
+msgid "Keypad"
+msgstr "დ�მ�ტებითი პ�ნელით"
+
+#: ../rules/base.xml.in.h:245
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:246
+msgid "Khm"
+msgstr "კხმ"
+
+#: ../rules/base.xml.in.h:247
+msgid "Kor"
+msgstr "კ�რ"
+
+#: ../rules/base.xml.in.h:248
+msgid "Korea, Republic of"
+msgstr "კ�რე�, რესპუბლიკ�"
+
+#: ../rules/base.xml.in.h:249
+msgid "Korean 106-key"
+msgstr "კ�რეული 106-ღილ�კი�ნი"
+
+#: ../rules/base.xml.in.h:250
+msgid "Kotoistus"
+msgstr "Kotoistus"
+
+#: ../rules/base.xml.in.h:251
+msgid "Kurdish, (F)"
+msgstr "ქურთული, (F)"
+
+#: ../rules/base.xml.in.h:252
+msgid "Kurdish, Arabic-Latin"
+msgstr "ქურთული, �რ�ბულ-ლ�თინური"
+
+#: ../rules/base.xml.in.h:253
+msgid "Kurdish, Latin Alt-Q"
+msgstr "ქურთული, ლ�თინური Alt-Q"
+
+#: ../rules/base.xml.in.h:254
+msgid "Kurdish, Latin Q"
+msgstr "ქურთული, ლ�თინური Q"
+
+#: ../rules/base.xml.in.h:255
+msgid "Kyr"
+msgstr "ყირ"
+
+#: ../rules/base.xml.in.h:256
+msgid "Kyrgyzstan"
+msgstr "ყირღიზეთი"
+
+#: ../rules/base.xml.in.h:257
+msgid "LAm"
+msgstr "ლ�თ�მ"
+
+#: ../rules/base.xml.in.h:258
+msgid "Lao"
+msgstr "ლ��სური"
+
+#: ../rules/base.xml.in.h:259
+msgid "Laos"
+msgstr "ლ��სი"
+
+#: ../rules/base.xml.in.h:260
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr ""
+"Compaq ლეპტ�პ/ნ�უთბუქის "
+"კლ�ვი�ტურ� (მ�გ. Armada)"
+
+#: ../rules/base.xml.in.h:261
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr ""
+"Compaq ლეპტ�პ/ნ�უთბუქის "
+"კლ�ვი�ტურ� (მ�გ. Presario)"
+
+#: ../rules/base.xml.in.h:262
+msgid "Laptop/notebook Dell Inspiron 6xxx/8xxx"
+msgstr "ლეპტ�პ/ნ�უთბუქი Dell Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:263
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "ლეპტ�პ/ნ�უთბუქი eMachines m68xx"
+
+#: ../rules/base.xml.in.h:264
+msgid "Latin"
+msgstr "ლ�თინური"
+
+#: ../rules/base.xml.in.h:265
+msgid "Latin American"
+msgstr "ლ�თინურ �მერიკული"
+
+#: ../rules/base.xml.in.h:266
+msgid "Latin Unicode"
+msgstr "ლ�თინური უნიკ�დი"
+
+#: ../rules/base.xml.in.h:267
+msgid "Latin Unicode qwerty"
+msgstr "ლ�თინური უნიკ�დი qwerty"
+
+#: ../rules/base.xml.in.h:268
+msgid "Latin qwerty"
+msgstr "ლ�თინური qwerty"
+
+#: ../rules/base.xml.in.h:269
+msgid "Latin with guillemets"
+msgstr ""
+"ლ�თინური ფრ�ნგული "
+"ბრჭყ�ლებით"
+
+#: ../rules/base.xml.in.h:270
+msgid "Latvia"
+msgstr "ლ�ტვი�"
+
+#: ../rules/base.xml.in.h:271
+msgid "Left Alt is swapped with left Win-key."
+msgstr ""
+"მ�რცხენ� Alt-ი შეცვლილი� Win "
+"ღილ�კით"
+
+#: ../rules/base.xml.in.h:272
+msgid "Left Alt key changes group."
+msgstr ""
+"მ�რცხენ� Alt ღილ�კი ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:273
+msgid "Left Alt key switches group while pressed."
+msgstr ""
+"მ�რცხენ� Alt ღილ�კი ცვლის "
+"ჯგუფს დ�ჭერის დრ�ს."
+
+#: ../rules/base.xml.in.h:274
+msgid "Left Ctrl key changes group."
+msgstr ""
+"მ�რცხენ� Alt ღილ�კი ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:275
+msgid "Left Shift key changes group."
+msgstr ""
+"მ�რცხენ� Shift ღილ�კი ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:276
+msgid "Left Win-key changes group."
+msgstr ""
+"მ�რცხენ� Win ღილ�კი ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:277
+msgid "Left Win-key is Compose."
+msgstr ""
+"მ�რცხენ� Win ღილ�კი "
+"შეეს�ბ�მებ� Compose-ს."
+
+#: ../rules/base.xml.in.h:278
+msgid "Left Win-key switches group while pressed."
+msgstr ""
+"მ�რცხენ� Win ღილ�კი ცვლის "
+"ჯგუფს დ�ჭერის დრ�ს."
+
+#: ../rules/base.xml.in.h:279
+msgid "Left handed Dvorak"
+msgstr "Dvorak ც�ციებისთვის"
+
+#: ../rules/base.xml.in.h:280
+msgid "Lithuania"
+msgstr "ლიტვ�"
+
+#: ../rules/base.xml.in.h:281
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:282
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:283
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:284
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:285
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:286
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: ../rules/base.xml.in.h:287
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr ""
+"Logitech Cordless Desktop Pro (�ლტერნ�ტიული "
+"ვ�რი�ნტი)"
+
+#: ../rules/base.xml.in.h:288
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr ""
+"Logitech Cordless Desktop Pro (�ლტერნ�ტიული "
+"ვ�რი�ნტი2)"
+
+#: ../rules/base.xml.in.h:289
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:290
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:291
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:292
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:293
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:294
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:295
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:296
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:297
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:298
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+#: ../rules/base.xml.in.h:299
+msgid "Ltu"
+msgstr "ლიტ"
+
+#: ../rules/base.xml.in.h:300
+msgid "Lva"
+msgstr "ლ�ტვ"
+
+#: ../rules/base.xml.in.h:301
+msgid "Macedonia"
+msgstr "მ�კედ�ნი�"
+
+#: ../rules/base.xml.in.h:302
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:303
+msgid "Macintosh Old"
+msgstr "Macintosh ძველი"
+
+#: ../rules/base.xml.in.h:304
+msgid "Macintosh layout"
+msgstr "Macintosh-ის გ�ნლ�გებ�"
+
+#: ../rules/base.xml.in.h:305
+msgid "Macintosh layout, eliminate dead keys"
+msgstr ""
+"Macintosh-ის გ�ნლ�გებ�, სპეც "
+"კლ�ვიშების (dead keys) გ�რეშე"
+
+#: ../rules/base.xml.in.h:306
+msgid "Make CapsLock an additional Ctrl."
+msgstr ""
+"გ�მ�იყენე CapsLock რ�გ�რც "
+"დ�მ�ტებითი Ctrl კლ�ვიში."
+
+#: ../rules/base.xml.in.h:307
+msgid "Mal"
+msgstr "მ�ლ"
+
+#: ../rules/base.xml.in.h:308
+msgid "Malayalam"
+msgstr "მ�ლ�ური"
+
+#: ../rules/base.xml.in.h:309
+msgid "Maldives"
+msgstr "მ�ლდივები"
+
+#: ../rules/base.xml.in.h:310
+msgid "Malta"
+msgstr "მ�ლტ�"
+
+#: ../rules/base.xml.in.h:311
+msgid "Maltese keyboard with US layout"
+msgstr ""
+"მ�ლტის კლ�ვი�ტურ� �შშ-ს "
+"გ�ნლ�გებით"
+
+#: ../rules/base.xml.in.h:312
+msgid "Mao"
+msgstr "მ��"
+
+#: ../rules/base.xml.in.h:313
+msgid "Maori"
+msgstr "მ��რი"
+
+#: ../rules/base.xml.in.h:314
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:315
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:316
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:317
+msgid "Menu is Compose."
+msgstr ""
+"Menu ღილ�კი შეეს�ბ�მებ� Compose-ის "
+"ღილ�კს."
+
+#: ../rules/base.xml.in.h:318
+msgid "Menu key changes group."
+msgstr "Menu-ს ღილ�კი ცვლის ჯგუფს."
+
+#: ../rules/base.xml.in.h:319
+msgid "Meta is mapped to the Win-keys."
+msgstr ""
+"Мета შეეს�ბ�მებ� Win ღილ�კებს."
+
+#: ../rules/base.xml.in.h:320
+msgid "Meta is mapped to the left Win-key."
+msgstr ""
+"Мета შეეს�ბ�მებ� მ�რცხენ� Win "
+"ღილ�კს."
+
+#: ../rules/base.xml.in.h:321
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:322
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, შვედური"
+
+#: ../rules/base.xml.in.h:323
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:324
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:325
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "	Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:326
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:327
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:328
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:329
+msgid "Miscellaneous compatibility options"
+msgstr ""
+"თ�ვსებ�დ�ბის სხვ�დ�სხვ� "
+"პ�რ�მეტრი"
+
+#: ../rules/base.xml.in.h:330
+msgid "Mkd"
+msgstr "მ�კ"
+
+#: ../rules/base.xml.in.h:331
+msgid "Mlt"
+msgstr "მ�ლტ"
+
+#: ../rules/base.xml.in.h:332
+msgid "Mmr"
+msgstr "მი�ნ"
+
+#: ../rules/base.xml.in.h:333
+msgid "Mng"
+msgstr "მ�ნღ"
+
+#: ../rules/base.xml.in.h:334
+msgid "Mongolia"
+msgstr "მ�ნღ�ლეთი"
+
+#: ../rules/base.xml.in.h:335
+msgid "Multilingual"
+msgstr "მრ�ვ�ლენ�ვ�ნი"
+
+#: ../rules/base.xml.in.h:336
+msgid "Multilingual, first part"
+msgstr ""
+"მრ�ვ�ლენ�ვ�ნი, პირველი "
+"ნ�წილი"
+
+#: ../rules/base.xml.in.h:337
+msgid "Multilingual, second part"
+msgstr ""
+"მრ�ვ�ლენ�ვ�ნი, მე�რე ნ�წილი"
+
+#: ../rules/base.xml.in.h:338
+msgid "Myanmar"
+msgstr "მი�ნმ�"
+
+#: ../rules/base.xml.in.h:339
+msgid "Neostyle"
+msgstr "Neostyle"
+
+#: ../rules/base.xml.in.h:340
+msgid "Nep"
+msgstr "ნეპ"
+
+#: ../rules/base.xml.in.h:341
+msgid "Nepal"
+msgstr "ნეპ�ლი"
+
+#: ../rules/base.xml.in.h:342
+msgid "Netherlands"
+msgstr "ნიდერლ�ნდები"
+
+#: ../rules/base.xml.in.h:343
+msgid "Nld"
+msgstr "ჰ�ლ"
+
+#: ../rules/base.xml.in.h:344
+msgid "Nor"
+msgstr "ნ�რ"
+
+#: ../rules/base.xml.in.h:345
+msgid "Northern Saami"
+msgstr "ჩრდილ�ეთ ს��მური"
+
+#: ../rules/base.xml.in.h:346
+msgid "Northern Saami, eliminate dead keys"
+msgstr ""
+"ჩრდილ�ეთ ს��მური, სპეც "
+"ღილ�კების (dead keys) გ�რეშე"
+
+#: ../rules/base.xml.in.h:347
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:348
+msgid "Norway"
+msgstr "ნ�რვეგი�"
+
+#: ../rules/base.xml.in.h:349
+msgid "NumLock LED shows alternative group."
+msgstr ""
+"NumLock-ის ინდიკ�ტ�რი �ჩვენებს "
+"დ�მ�ტებით ჯგუფს."
+
+#: ../rules/base.xml.in.h:350
+msgid "Numpad keys work as with Mac."
+msgstr ""
+"ციფრული ღილ�კები "
+"მ�ქმედებენ რ�გ�რც Mac-ის "
+"კლ�ვი�ტურ�ში."
+
+#: ../rules/base.xml.in.h:351
+msgid "Ogham"
+msgstr "�გხ�მი"
+
+#: ../rules/base.xml.in.h:352
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:353
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/Internet keyboard"
+
+#: ../rules/base.xml.in.h:354
+msgid "Oriya"
+msgstr "�რი�"
+
+#: ../rules/base.xml.in.h:355
+msgid "Ossetian"
+msgstr "�სური"
+
+#: ../rules/base.xml.in.h:356
+msgid "Ossetian, Winkeys"
+msgstr "�სური, Windows კლ�ვი�ტურ�"
+
+#: ../rules/base.xml.in.h:357
+msgid "PC-98xx Series"
+msgstr "PC-98xx Series"
+
+#: ../rules/base.xml.in.h:358
+msgid "Pak"
+msgstr "პ�კ"
+
+#: ../rules/base.xml.in.h:359
+msgid "Pakistan"
+msgstr "პ�კისტ�ნი"
+
+#: ../rules/base.xml.in.h:360
+msgid "Pashto"
+msgstr "პ�შტ�"
+
+#: ../rules/base.xml.in.h:361
+msgid "Pattachote"
+msgstr "პ�ტ�ჩ�ტი"
+
+#: ../rules/base.xml.in.h:362
+msgid "Phonetic"
+msgstr "ფ�ნეტიკური"
+
+#: ../rules/base.xml.in.h:363
+msgid "Pol"
+msgstr "პ�ლ"
+
+#: ../rules/base.xml.in.h:364
+msgid "Poland"
+msgstr "პ�ლ�ნეთი"
+
+#: ../rules/base.xml.in.h:365
+msgid "Polytonic"
+msgstr "პ�ლიფ�ნიური"
+
+#: ../rules/base.xml.in.h:366
+msgid "Portugal"
+msgstr "პ�რტუგ�ლი�"
+
+#: ../rules/base.xml.in.h:367
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:368
+msgid "Press Left Alt key to choose 3rd level."
+msgstr ""
+"მე-3 ს�ფეხურის "
+"�მ�რჩევისთვის, დ��ჭირეთ "
+"მ�რცხენ� Alt-ს"
+
+#: ../rules/base.xml.in.h:369
+msgid "Press Left Win-key to choose 3rd level."
+msgstr ""
+"მე-3 ს�ფეხურის "
+"�მ�რჩევისთვის, დ��ჭირეთ "
+"მ�რცხენ� Win ღილ�კს."
+
+#: ../rules/base.xml.in.h:370
+msgid "Press Menu key to choose 3rd level."
+msgstr ""
+"მე-3 ს�ფეხურის "
+"�მ�რჩევისთვის, დ��ჭირეთ Menu "
+"ღილ�კს."
+
+#: ../rules/base.xml.in.h:371
+msgid ""
+"Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr ""
+"მე-3 ს�ფეხურის "
+"�მ�რჩევისთვის, დ��ჭირეთ "
+"მ�რჯვენ� Alt ღილ�კს. "
+"Shift+მ�რჯვენ� Alt ღილ�კი "
+"იმ�ქმედებენ რ�გ�რც Multi_Key."
+
+#: ../rules/base.xml.in.h:372
+msgid "Press Right Alt key to choose 3rd level."
+msgstr ""
+"მე-3 ს�ფეხურის "
+"�მ�რჩევისთვის, დ��ჭირეთ "
+"მ�რჯვენ� Alt ღილ�კს."
+
+#: ../rules/base.xml.in.h:373
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr ""
+"მე-3 ს�ფეხურის "
+"�მ�რჩევისთვის, დ��ჭირეთ "
+"მ�რჯვენ� Ctrl-ს."
+
+#: ../rules/base.xml.in.h:374
+msgid "Press Right Win-key to choose 3rd level."
+msgstr ""
+"მე-3 ს�ფეხურის �მ�რჩევ� "
+"მ�რჯვენ� Win ღილ�კის დ�ჭერით."
+
+#: ../rules/base.xml.in.h:375
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr ""
+"მე-3 ს�ფეხურის �მ�რჩევ� "
+"ნებისმიერი Alt ღილ�კის "
+"დ�ჭერით."
+
+#: ../rules/base.xml.in.h:376
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr ""
+"მე-3 ს�ფეხურის �მ�რჩევ� "
+"ნებისმიერი Win ღილ�კის "
+"დ�ჭერით."
+
+#: ../rules/base.xml.in.h:377
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:378
+msgid "Pro Keypad"
+msgstr "Pro დ�მ�ტებ. პ�ნელით"
+
+#: ../rules/base.xml.in.h:379
+msgid "Probhat"
+msgstr "პრ�ბ�ტი"
+
+#: ../rules/base.xml.in.h:380
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:381
+msgid "Prt"
+msgstr "პ�რტ"
+
+#: ../rules/base.xml.in.h:382
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:383
+msgid "R-Alt switches group while pressed."
+msgstr ""
+"მ�რჯვენ� Alt კლ�ვიში ცვლის "
+"ჯგუფს დ�ჭერილ "
+"მდგ�მ�რე�ბ�ში."
+
+#: ../rules/base.xml.in.h:384
+msgid "Right Alt is Compose."
+msgstr ""
+"მ�რჯვენ� Alt ღილ�კი "
+"შეეს�ბ�მებ� Compose-ს."
+
+#: ../rules/base.xml.in.h:385
+msgid "Right Alt key changes group."
+msgstr ""
+"მ�რჯვენ� Alt ღილ�კი ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:386
+msgid "Right Ctrl is Compose."
+msgstr ""
+"მ�რჯვენ� Ctrl ღილ�კი "
+"შეეს�ბ�მებ� Compose-ს."
+
+#: ../rules/base.xml.in.h:387
+msgid "Right Ctrl key changes group."
+msgstr ""
+"მ�რჯვენ� Ctrl ღილ�კი ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:388
+msgid "Right Ctrl key switches group while pressed."
+msgstr ""
+"მ�რჯვენ� Ctrl ღილ�კი ცვლის "
+"ჯგუფს დ�ჭერილ "
+"მდგ�მ�რე�ბ�ში."
+
+#: ../rules/base.xml.in.h:389
+msgid "Right Ctrl key works as Right Alt."
+msgstr ""
+"მ�რჯვენ� Ctrl ღილ�კი მ�ქმედებს "
+"რ�გ�რც მ�რჯვენ� Alt."
+
+#: ../rules/base.xml.in.h:390
+msgid "Right Shift key changes group."
+msgstr ""
+"მ�რჯვენ� Shift ღილ�კი ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:391
+msgid "Right Win-key changes group."
+msgstr ""
+"მ�რჯვენ� Win ღილ�კი ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:392
+msgid "Right Win-key is Compose."
+msgstr ""
+"მ�რჯვენ� Win ღილ�კი "
+"შეეს�ბ�მებ� Compose-ს."
+
+#: ../rules/base.xml.in.h:393
+msgid "Right Win-key switches group while pressed."
+msgstr ""
+"მ�რჯვენ� Win ღილ�კი ცვლის "
+"ჯგუფს დ�ჭერილ "
+"მდგ�მ�რე�ბ�ში."
+
+#: ../rules/base.xml.in.h:394
+msgid "Right handed Dvorak"
+msgstr ""
+"Dvorak კლ�ვი�ტურ� "
+"�რ�-ც�ციებისთვის"
+
+#: ../rules/base.xml.in.h:395
+msgid "Romania"
+msgstr "რუმინეთი"
+
+#: ../rules/base.xml.in.h:396
+msgid "Romanian keyboard with German letters"
+msgstr ""
+"რუმინული კლ�ვი�ტურ� "
+"გერმ�ნული �ს�ებით"
+
+#: ../rules/base.xml.in.h:397
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr ""
+"რუმინული კლ�ვი�ტურ� "
+"გერმ�ნული �ს�ებით, dead keys "
+"გ�რეშე. "
+
+#: ../rules/base.xml.in.h:398
+msgid "Rou"
+msgstr "რუმ"
+
+#: ../rules/base.xml.in.h:399
+msgid "Rus"
+msgstr "რუს"
+
+#: ../rules/base.xml.in.h:400
+msgid "Russia"
+msgstr "რუსეთი"
+
+#: ../rules/base.xml.in.h:401
+msgid "Russian"
+msgstr "რუსული"
+
+#: ../rules/base.xml.in.h:402
+msgid "Russian phonetic"
+msgstr "რუსული ფ�ნეტიკური"
+
+#: ../rules/base.xml.in.h:403
+msgid "Russian phonetic, eliminate dead keys"
+msgstr ""
+"რუსული ფ�ნეტიკური, სპეც (dead keys) "
+"კლ�ვიშების გ�რეშე"
+
+#: ../rules/base.xml.in.h:404
+msgid "Russian with Kazakh"
+msgstr "რუსული ყ�ზ�ხურთ�ნ ერთ�დ"
+
+#: ../rules/base.xml.in.h:405
+msgid "SCG"
+msgstr "SCG"
+
+#: ../rules/base.xml.in.h:406
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:407
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:408
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:409
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:410
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:411
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:412
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:413
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:414
+msgid "ScrollLock LED shows alternative group."
+msgstr ""
+"ScrollLock ინდიკ�ტ�რი �ნ�ხებს "
+"�ლტერ. ჯგუფს."
+
+#: ../rules/base.xml.in.h:415
+msgid "Serbia and Montenegro"
+msgstr "სერბი� დ� მ�ნტენეგრ�"
+
+#: ../rules/base.xml.in.h:416
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr ""
+"Shift ღილ�კი ციფრულ "
+"კლ�ვი�ტურ�სთ�ნ, მუშ��ბენ "
+"რ�გ�რც MS Window-ში."
+
+#: ../rules/base.xml.in.h:417
+msgid "Shift+CapsLock changes group."
+msgstr "Shift+CapsLock ცვლი�ნ ჯგუფს."
+
+#: ../rules/base.xml.in.h:418
+msgid "Slovakia"
+msgstr "სლ�ვ�კეთი"
+
+#: ../rules/base.xml.in.h:419
+msgid "Slovenia"
+msgstr "სლ�ვენი�"
+
+#: ../rules/base.xml.in.h:420
+msgid "South Africa"
+msgstr "ს�მხრეთ �ფრიკ�"
+
+#: ../rules/base.xml.in.h:421
+msgid "Southern Uzbek"
+msgstr "ს�მხრეთ-უზბეკური"
+
+#: ../rules/base.xml.in.h:422
+msgid "Spain"
+msgstr "ესპ�ნეთი"
+
+#: ../rules/base.xml.in.h:423
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr ""
+"სპეც კლ�ვიშებს (Ctrl+Alt+&lt;клв&gt;) "
+"სერვერი �მუშ�ვებთ."
+
+#: ../rules/base.xml.in.h:424
+msgid "SrL"
+msgstr "შრლ"
+
+#: ../rules/base.xml.in.h:425
+msgid "Sri Lanka"
+msgstr "შრი-ლ�ნკ�"
+
+#: ../rules/base.xml.in.h:426
+msgid "Standard"
+msgstr "სტ�ნდ�რტული"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:428
+msgid "Standard RSTU"
+msgstr "სტ�ნდ�რტული RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:430
+msgid "Standard RSTU on Russian layout"
+msgstr ""
+"სტ�ნდ�რტული RSTU რუსულ "
+"გ�ნლ�გებ�ზე"
+
+#: ../rules/base.xml.in.h:431
+msgid "Sun dead keys"
+msgstr "სპეც ღილ�კები (dead keys) Sun"
+
+#: ../rules/base.xml.in.h:432
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:433
+msgid "Super is mapped to the Win-keys (default)."
+msgstr ""
+"Super შეეს�ბ�მებ� Win "
+"ღილ�კებს.(ნ�გულისმევი�)"
+
+#: ../rules/base.xml.in.h:434
+msgid "Svk"
+msgstr "სლ�ვკ"
+
+#: ../rules/base.xml.in.h:435
+msgid "Svn"
+msgstr "სლ�ვენ"
+
+#: ../rules/base.xml.in.h:436
+msgid "Swap Ctrl and CapsLock."
+msgstr "CapsLock ის Ctrl-ით შეცვლ�."
+
+#: ../rules/base.xml.in.h:437
+msgid "Swe"
+msgstr "შვედ"
+
+#: ../rules/base.xml.in.h:438
+msgid "Sweden"
+msgstr "შვედეთი"
+
+#: ../rules/base.xml.in.h:439
+msgid "Switzerland"
+msgstr "შვეიც�რი�"
+
+#: ../rules/base.xml.in.h:440
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:441
+msgid "Syr"
+msgstr "სირ"
+
+#: ../rules/base.xml.in.h:442
+msgid "Syria"
+msgstr "სირი�"
+
+#: ../rules/base.xml.in.h:443
+msgid "Syriac"
+msgstr "სირიული"
+
+#: ../rules/base.xml.in.h:444
+msgid "Syriac phonetic"
+msgstr "სირიის ფ�ნეტიკური"
+
+#: ../rules/base.xml.in.h:445
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:446
+msgid "Tajikistan"
+msgstr "ტ�ჯიკეთი"
+
+#: ../rules/base.xml.in.h:447
+msgid "Tamil"
+msgstr "თ�მილური"
+
+#: ../rules/base.xml.in.h:448
+msgid "Tamil TAB Typewriter"
+msgstr ""
+"თ�მილური TAB ს�ბეჭდი მ�ნქ�ნ�"
+
+#: ../rules/base.xml.in.h:449
+msgid "Tamil TSCII Typewriter"
+msgstr ""
+"თ�მილური TSCII ს�ბეჭდი მ�ნქ�ნ�"
+
+#: ../rules/base.xml.in.h:450
+msgid "Tamil Unicode"
+msgstr "ტ�მილური უნიკ�დი"
+
+#: ../rules/base.xml.in.h:451
+msgid "Tatar"
+msgstr "თ�თრული"
+
+#: ../rules/base.xml.in.h:452
+msgid "Telugu"
+msgstr "თელუგუ"
+
+#: ../rules/base.xml.in.h:453
+msgid "Tha"
+msgstr "ტ�ი"
+
+#: ../rules/base.xml.in.h:454
+msgid "Thailand"
+msgstr "ტ�ილ�ნდი"
+
+#: ../rules/base.xml.in.h:455
+msgid "Third level choosers"
+msgstr "მე-3 ს�ფეხურის �მ�რჩევ�"
+
+#: ../rules/base.xml.in.h:456
+msgid "Tilde (~) variant"
+msgstr "ვ�რი�ნტი (~)-ით"
+
+#: ../rules/base.xml.in.h:457
+msgid "Tjk"
+msgstr "ტ�ჯ"
+
+#: ../rules/base.xml.in.h:458
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:459
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:460
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:461
+msgid "Tur"
+msgstr "თურქ"
+
+#: ../rules/base.xml.in.h:462
+msgid "Turkey"
+msgstr "თურქეთი"
+
+#: ../rules/base.xml.in.h:463
+msgid "Typewriter"
+msgstr "ს�ბეჭდი მ�ნქ�ნ�"
+
+#: ../rules/base.xml.in.h:464
+msgid "U.S. English"
+msgstr "ინგლისუ�რი �.შ.შ"
+
+#: ../rules/base.xml.in.h:465
+msgid "US keyboard with Bosnian digraphs"
+msgstr ""
+"�შშ-ს კლ�ვი�ტურ� ბ�სნიური "
+"დიგრ�ფებით"
+
+#: ../rules/base.xml.in.h:466
+msgid "US keyboard with Bosnian letters"
+msgstr ""
+"�შშ-ს კლ�ვი�ტურ� ბ�სნიური "
+"�ს�ებით"
+
+#: ../rules/base.xml.in.h:467
+msgid "US keyboard with Croatian digraphs"
+msgstr ""
+"�შშ-ს კლ�ვი�ტურ� ხ�რვ�ტიული "
+"დიგრ�ფებით"
+
+#: ../rules/base.xml.in.h:468
+msgid "US keyboard with Croatian letters"
+msgstr ""
+"�შშ-ს კლ�ვი�ტურ� ხ�რვ�ტიული "
+"�ს�ებით"
+
+#: ../rules/base.xml.in.h:469
+msgid "US keyboard with Lithuanian letters"
+msgstr ""
+"�შშ-ს კლ�ვი�ტურ� ლიტვური "
+"�ს�ებით"
+
+#: ../rules/base.xml.in.h:470
+msgid "US keyboard with Slovenian digraphs"
+msgstr ""
+"�შშ-ს კლ�ვი�ტურ� სლ�ვ�კური "
+"დიგრ�ფებით"
+
+#: ../rules/base.xml.in.h:471
+msgid "US keyboard with Slovenian letters"
+msgstr ""
+"�შშ-ს კლ�ვი�ტურ� სლ�ვ�კური "
+"�ს�ებით"
+
+#: ../rules/base.xml.in.h:472
+msgid "USA"
+msgstr "�შშ"
+
+#: ../rules/base.xml.in.h:473
+msgid "Ukr"
+msgstr "უკრ"
+
+#: ../rules/base.xml.in.h:474
+msgid "Ukraine"
+msgstr "უკრ�ინ�"
+
+#: ../rules/base.xml.in.h:475
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:476
+msgid "United Kingdom"
+msgstr "დიდი ბრიტ�ნეთი"
+
+#: ../rules/base.xml.in.h:477
+msgid "Urdu"
+msgstr "ურდუ"
+
+#: ../rules/base.xml.in.h:478
+msgid "Use Bosnian digraphs"
+msgstr ""
+"ბ�სნიური დიგრ�ფების "
+"გ�მ�ყენებ�"
+
+#: ../rules/base.xml.in.h:479
+msgid "Use Croatian digraphs"
+msgstr ""
+"ხ�რვ�ტიული დიგრ�ფების "
+"გ�მ�ყენებ�"
+
+#: ../rules/base.xml.in.h:480
+msgid "Use Slovenian digraphs"
+msgstr ""
+"სლ�ვენური დიგრ�ფების "
+"გ�მ�ყენებ�"
+
+#: ../rules/base.xml.in.h:481
+msgid "Use guillemets for quotes"
+msgstr ""
+"ფრ�ნგული ბრჭყ�ლების, "
+"ბრჭყ�ლებ�დ გ�მ�ყენებ�"
+
+#: ../rules/base.xml.in.h:482
+msgid "Use keyboard LED to show alternative group."
+msgstr ""
+"დ�მ�ტებითი ჯგუფის "
+"ს�ჩვენებლ�დ, კლ�ვი�ტურის "
+"ინდიკ�ტ�რის გ�მ�ყენებ�."
+
+#: ../rules/base.xml.in.h:483
+msgid "Uzb"
+msgstr "უზბ"
+
+#: ../rules/base.xml.in.h:484
+msgid "Uzbekistan"
+msgstr "უზბეკეთი"
+
+#: ../rules/base.xml.in.h:485
+msgid "Vietnam"
+msgstr "ვიეტნ�მი"
+
+#: ../rules/base.xml.in.h:486
+msgid "Vnm"
+msgstr "ვიეტ"
+
+#: ../rules/base.xml.in.h:487
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:488
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:489
+msgid "Winkeys"
+msgstr "Windows კლ�ვი�ტურ�"
+
+#: ../rules/base.xml.in.h:490
+msgid "With &lt;\\|&gt; key"
+msgstr "კლ�ვიშებით &lt;\\|&gt;"
+
+#: ../rules/base.xml.in.h:491
+msgid "With guillemets"
+msgstr "გრ�ნგული ბრჭყ�ლებით"
+
+#: ../rules/base.xml.in.h:492
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:493
+msgid "Z and ZHE swapped"
+msgstr "Z დ� ZHE გ�დ�ტ�ნილი�"
+
+#: ../rules/base.xml.in.h:494
+msgid "Zar"
+msgstr "უ�რი"
+
+#: ../rules/base.xml.in.h:495
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:496
+msgid "azerty/digits"
+msgstr "zerty/ციფრები"
+
+#: ../rules/base.xml.in.h:497
+msgid "digits"
+msgstr "ციფრები"
+
+#: ../rules/base.xml.in.h:498
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:499
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:500
+msgid "qwerty, extended Backslash"
+msgstr ""
+"qwerty, დ� Backslash-ის დ�მ�ტებითი "
+"ფუნქციები"
+
+#: ../rules/base.xml.in.h:501
+msgid "qwerty/digits"
+msgstr "qwerty/ციფრები"
+
+#: ../rules/base.xml.in.h:502
+msgid "qwertz"
+msgstr "qwertz"
+
diff --git a/xorg-server/xkbdata.src/po/ko.po b/xorg-server/xkbdata.src/po/ko.po
new file mode 100644
index 000000000..0c696ea48
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/ko.po
@@ -0,0 +1,2845 @@
+# This file is distributed under the same license as the xkeyboard-config package.
+# Changwoo Ryu <cwryu@ddebian.org>, 2007, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.2-pre1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-01-15 21:41+0000\n"
+"PO-Revision-Date: 2008-01-23 20:50+0900\n"
+"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
+"Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(구형) 다른 버전"
+
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(구형) 다른 버전, � �드키"
+
+#: ../rules/base.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(구형) 다른 버전, �드키 없�"
+
+#: ../rules/base.xml.in.h:5
+msgid "(Legacy) Dvorak"
+msgstr "(구형) 드보�"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/104 key Compatible"
+msgstr "101/104키 호환"
+
+#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/QWERTY/쉼표/�드키"
+
+#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/QWERTY/쉼표/�드키 없�"
+
+#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/QWERTY/�/�드키"
+
+#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/QWERTY/�/�드키 없�"
+
+#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/QWERTZ/쉼표/�드키"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/QWERTZ/쉼표/�드키 없�"
+
+#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/QWERTZ/�/�드키"
+
+#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/QWERTZ/�/�드키 없�"
+
+#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/QWERTY/쉼표/�드키"
+
+#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/QWERTY/쉼표/�드키 없�"
+
+#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/QWERTY/�/�드키"
+
+#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/QWERTY/�/�드키 없�"
+
+#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/QWERTZ/쉼표/�드키"
+
+#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/QWERTZ/쉼표/�드키 없�"
+
+#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/QWERTZ/�/�드키"
+
+#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/QWERTZ/�/�드키 없�"
+
+#: ../rules/base.xml.in.h:23
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:24
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:25
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:26
+msgid "ACPI Standard"
+msgstr "ACPI 표준"
+
+#: ../rules/base.xml.in.h:27
+msgid "Acer AirKey V"
+msgstr "��서 AirKey V"
+
+#: ../rules/base.xml.in.h:28
+msgid "Acer C300"
+msgstr "��서 C300"
+
+#: ../rules/base.xml.in.h:29
+msgid "Acer Ferrari 4000"
+msgstr "��서 Ferrari 4000"
+
+#: ../rules/base.xml.in.h:30
+msgid "Acer Laptop"
+msgstr "��서 노트�"
+
+#: ../rules/base.xml.in.h:31
+msgid "Add the EuroSign to the 2 key."
+msgstr "유로 기호를 2 키� 추가."
+
+#: ../rules/base.xml.in.h:32
+msgid "Add the EuroSign to the 4 key."
+msgstr "유로 기호를 4 키� 추가."
+
+#: ../rules/base.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "유로 기호를 5 키� 추가."
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "유로 기호를 E 키� 추가."
+
+#: ../rules/base.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "메뉴 키� 기본 �작 추가."
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "유로기호를 특정 키� 추가"
+
+#: ../rules/base.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38
+msgid "Afg"
+msgstr "아프가니스탄"
+
+#: ../rules/base.xml.in.h:39
+msgid "Afghanistan"
+msgstr "아프가니스탄"
+
+#: ../rules/base.xml.in.h:40
+msgid "Akan"
+msgstr "아칸"
+
+#: ../rules/base.xml.in.h:41
+msgid "Alb"
+msgstr "알바니아"
+
+#: ../rules/base.xml.in.h:42
+msgid "Albania"
+msgstr "알바니아"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt와 Meta가 Alt 키� 있습니다."
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt 키가 윈�우 키로 매핑�고, Super 키가 메뉴 키로 매핑�니다."
+
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Alt+CapsLock으로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+Ctrl로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Alt+Shift로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win 키 �작"
+
+#: ../rules/base.xml.in.h:50
+msgid "Alternative"
+msgstr "다른 버전"
+
+#: ../rules/base.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "다른 �부"
+
+#: ../rules/base.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "다른 �성 기호 버전"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "다른 국제 버전 (예전 us_intl)"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "다른 버전, � �드키"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "다른 버전, �드키 없�"
+
+#: ../rules/base.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "다른 버전, latin-9 전용"
+
+#: ../rules/base.xml.in.h:57
+msgid "And"
+msgstr "안��"
+
+#: ../rules/base.xml.in.h:58
+msgid "Andorra"
+msgstr "안��"
+
+#: ../rules/base.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "아�스트로피 (') 변형"
+
+#: ../rules/base.xml.in.h:60
+msgid "Apple"
+msgstr "애플"
+
+#: ../rules/base.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "애플 노트�"
+
+#: ../rules/base.xml.in.h:62
+msgid "Ara"
+msgstr "아�"
+
+#: ../rules/base.xml.in.h:63
+msgid "Arabic"
+msgstr "아�"
+
+#: ../rules/base.xml.in.h:64
+msgid "Arm"
+msgstr "아르메니아"
+
+#: ../rules/base.xml.in.h:65
+msgid "Armenia"
+msgstr "아르메니아"
+
+#: ../rules/base.xml.in.h:66
+msgid "Asus Laptop"
+msgstr "��서스 노트�"
+
+#: ../rules/base.xml.in.h:67
+msgid "Aze"
+msgstr "아제르바�잔"
+
+#: ../rules/base.xml.in.h:68
+msgid "Azerbaijan"
+msgstr "아제르바�잔"
+
+#: ../rules/base.xml.in.h:69
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 무선 �터넷 키보드"
+
+#: ../rules/base.xml.in.h:70
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:71
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF 멀티미디어"
+
+#: ../rules/base.xml.in.h:72
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:73
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
+
+#: ../rules/base.xml.in.h:74
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:75
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:76
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:77
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:78
+msgid "Ban"
+msgstr "방글��시"
+
+#: ../rules/base.xml.in.h:79
+msgid "Bangladesh"
+msgstr "방글��시"
+
+#: ../rules/base.xml.in.h:80 ../rules/sun.xml.in.h:22
+msgid "Bel"
+msgstr "벨기�"
+
+#: ../rules/base.xml.in.h:81
+msgid "Belarus"
+msgstr "벨�루스"
+
+#: ../rules/base.xml.in.h:82
+msgid "Belgium"
+msgstr "벨기�"
+
+#: ../rules/base.xml.in.h:83
+msgid "BenQ X-Touch"
+msgstr "벤� X-Touch"
+
+#: ../rules/base.xml.in.h:84
+msgid "Bengali"
+msgstr "뱅골어"
+
+#: ../rules/base.xml.in.h:85
+msgid "Bengali Probhat"
+msgstr "뱅골어 프롭햇"
+
+#: ../rules/base.xml.in.h:86
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonomic, 드보� 방�"
+
+#: ../rules/base.xml.in.h:87
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonomic, 드보� 방�, latin-9 전용"
+
+#: ../rules/base.xml.in.h:88 ../rules/sun.xml.in.h:24
+msgid "Bgr"
+msgstr "불가리아"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bhu"
+msgstr "부탄"
+
+#: ../rules/base.xml.in.h:90
+msgid "Bhutan"
+msgstr "부탄"
+
+#: ../rules/base.xml.in.h:91
+msgid "Biblical Hebrew (Tiro)"
+msgstr "성서 히브리어 (Tiro)"
+
+#: ../rules/base.xml.in.h:92
+msgid "Bih"
+msgstr "보스니아 헤르체고비나"
+
+#: ../rules/base.xml.in.h:93
+msgid "Blr"
+msgstr "벨�루스"
+
+#: ../rules/base.xml.in.h:94
+msgid "Bosnia and Herzegovina"
+msgstr "보스니아 헤르체고비나"
+
+#: ../rules/base.xml.in.h:95
+msgid "Both Alt keys together change layout."
+msgstr "Alt 키 � 개로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:96
+msgid "Both Ctrl keys together change layout."
+msgstr "Ctrl 키 � 개로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:97
+msgid "Both Shift keys together change layout."
+msgstr "Shift 키 � 개로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:98
+msgid "Both Win-keys switch layout while pressed."
+msgstr "윈�우 키 � 개를 누르면 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:99
+msgid "Bra"
+msgstr "브�질"
+
+#: ../rules/base.xml.in.h:100
+msgid "Braille"
+msgstr "��"
+
+#: ../rules/base.xml.in.h:101
+msgid "Brazil"
+msgstr "브�질"
+
+#: ../rules/base.xml.in.h:102
+msgid "Brazilian ABNT2"
+msgstr "브�질 ABNT2"
+
+# Braille
+#: ../rules/base.xml.in.h:103
+msgid "Brl"
+msgstr "��"
+
+#: ../rules/base.xml.in.h:104
+msgid "Brother Internet Keyboard"
+msgstr "브�� �터넷 키보드"
+
+# 아� 변형
+#: ../rules/base.xml.in.h:105
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:106
+msgid "Bulgaria"
+msgstr "불가리아"
+
+#: ../rules/base.xml.in.h:107
+msgid "Cambodia"
+msgstr "캄보디아"
+
+#: ../rules/base.xml.in.h:108 ../rules/sun.xml.in.h:29
+msgid "Can"
+msgstr "�나다"
+
+#: ../rules/base.xml.in.h:109
+msgid "Canada"
+msgstr "�나다"
+
+#: ../rules/base.xml.in.h:110
+msgid "Caps Lock is Compose."
+msgstr "Caps Lock 키가 조합 키입니다."
+
+#: ../rules/base.xml.in.h:111
+msgid "CapsLock LED shows alternative layout."
+msgstr "CapsLock LED가 다른 배치를 표시합니다."
+
+#: ../rules/base.xml.in.h:112
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "CapsLock� Shift처럼 �작하고 �태 고정. Shift가 CapsLock� \"�시 중지\"."
+
+#: ../rules/base.xml.in.h:113
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "CapsLock� Shift처럼 �작하고 �태 고정. Shift가 CapsLock �태� �향 없�."
+
+#: ../rules/base.xml.in.h:114
+msgid "CapsLock just locks the Shift modifier."
+msgstr "CapsLock� Shift �태를 고정하기만 합니다."
+
+#: ../rules/base.xml.in.h:115 ../rules/sun.xml.in.h:33
+msgid "CapsLock key behavior"
+msgstr "CapsLock 키 �작"
+
+#: ../rules/base.xml.in.h:116
+msgid "CapsLock key changes layout."
+msgstr "CapsLock 키로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:117
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "CapsLock� Shift �태를 토글합니다. 즉 모든 키가 �향� 받습니다."
+
+#: ../rules/base.xml.in.h:118
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "CapsLock� �반�� 알파벳 대문� �태를 토글합니다."
+
+#: ../rules/base.xml.in.h:119
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "CapsLock� 내부 대문� 기능 사용. Shift가 CapsLock� \"�시 중지\"."
+
+#: ../rules/base.xml.in.h:120
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "CapsLock� 내부 대문� 기능 사용. Shift가 CapsLock �태� �향 없�."
+
+#: ../rules/base.xml.in.h:121
+msgid "Catalan variant with middle-dot L"
+msgstr "카탈로니아어 변형, 가운�� L �함"
+
+#: ../rules/base.xml.in.h:122
+msgid "Che"
+msgstr "스위스"
+
+#: ../rules/base.xml.in.h:123
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "체리 Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:124
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "체리 Blue Line CyBo@rd (다른 옵션)"
+
+#: ../rules/base.xml.in.h:125
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "체리 CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:126
+msgid "Cherry CyMotion Master Linux"
+msgstr "체리 CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:127
+msgid "Cherry CyMotion Master XPress"
+msgstr "체리 CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:128
+msgid "Chicony Internet Keyboard"
+msgstr "치코니 �터넷 키보드"
+
+#: ../rules/base.xml.in.h:129
+msgid "Chicony KB-9885"
+msgstr "치코니 KB-9885"
+
+#: ../rules/base.xml.in.h:130
+msgid "Chicony KU-0108"
+msgstr "치코니 KU-0108"
+
+#: ../rules/base.xml.in.h:131
+msgid "China"
+msgstr "중국"
+
+# http://ko.wikipedia.org/wiki/%EC%B6%94%EB%B0%94%EC%8B%9C%EC%96%B4
+#: ../rules/base.xml.in.h:132
+msgid "Chuvash"
+msgstr "추바시어"
+
+# http://ko.wikipedia.org/wiki/%EC%B6%94%EB%B0%94%EC%8B%9C%EC%96%B4
+#: ../rules/base.xml.in.h:133
+msgid "Chuvash Latin"
+msgstr "추바시어 �틴"
+
+#: ../rules/base.xml.in.h:134
+msgid "Classic"
+msgstr "�래�"
+
+#: ../rules/base.xml.in.h:135
+msgid "Classic Dvorak"
+msgstr "�래� 드보�"
+
+#: ../rules/base.xml.in.h:136
+msgid "Classmate PC"
+msgstr "�래스메�트 PC"
+
+# 아�랜드 변형
+#: ../rules/base.xml.in.h:137
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+# Colemak: �표명
+#: ../rules/base.xml.in.h:138
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:139
+msgid "Commabelow"
+msgstr "아래 쉼표"
+
+#: ../rules/base.xml.in.h:140
+msgid "Compaq Easy Access Keyboard"
+msgstr "컴팩 Easy Access 키보드"
+
+#: ../rules/base.xml.in.h:141
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "컴팩 �터넷 키보드 (13키)"
+
+#: ../rules/base.xml.in.h:142
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "컴팩 �터넷 키보드 (18키)"
+
+#: ../rules/base.xml.in.h:143
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "컴팩 �터넷 키보드 (7키)"
+
+#: ../rules/base.xml.in.h:144
+msgid "Compaq iPaq Keyboard"
+msgstr "컴팩 iPaq 키보드"
+
+#: ../rules/base.xml.in.h:145
+msgid "Compose key position"
+msgstr "조합 키 위치"
+
+#: ../rules/base.xml.in.h:146
+msgid "Congo, Democratic Republic of the"
+msgstr "콩고 민주 공화국"
+
+#: ../rules/base.xml.in.h:147
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "Ctrl 키가 윈�우 키로 매핑�니다 (그리고 보통 Ctrl 키로� �작합니다)."
+
+#: ../rules/base.xml.in.h:148
+msgid "Croatia"
+msgstr "�로아티아"
+
+#: ../rules/base.xml.in.h:149
+msgid "Ctrl key at bottom left"
+msgstr "맨 아래 왼쪽� Ctrl 키"
+
+#: ../rules/base.xml.in.h:150
+msgid "Ctrl key at left of 'A'"
+msgstr "'A' 왼쪽� Ctrl 키"
+
+#: ../rules/base.xml.in.h:151
+msgid "Ctrl key position"
+msgstr "Ctrl 키 위치"
+
+#: ../rules/base.xml.in.h:152
+msgid "Ctrl+Shift change layout."
+msgstr "Ctrl+Shift로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:153
+msgid "Cyrillic"
+msgstr "키릴"
+
+#: ../rules/base.xml.in.h:154
+msgid "Cyrillic with guillemets"
+msgstr "키릴, �괄호 �함"
+
+#: ../rules/base.xml.in.h:155
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "키릴, Z와 ZHE 뒤바꾸기"
+
+#: ../rules/base.xml.in.h:156 ../rules/sun.xml.in.h:39
+msgid "Cze"
+msgstr "ì²´ì½”"
+
+#: ../rules/base.xml.in.h:157
+msgid "Czechia"
+msgstr "ì²´ì½”"
+
+#: ../rules/base.xml.in.h:158
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:159
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:160 ../rules/sun.xml.in.h:42
+msgid "Dead acute"
+msgstr "어�트 �드키"
+
+#: ../rules/base.xml.in.h:161 ../rules/sun.xml.in.h:43
+msgid "Dead grave acute"
+msgstr "그레�브 어�트 �드키"
+
+#: ../rules/base.xml.in.h:162
+msgid "Default numeric keypad keys."
+msgstr "기본 숫�� 키."
+
+#: ../rules/base.xml.in.h:163
+msgid "Dell"
+msgstr "�"
+
+#: ../rules/base.xml.in.h:164
+msgid "Dell 101-key PC"
+msgstr "� 101키 PC"
+
+#: ../rules/base.xml.in.h:165
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "� 노트� Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:166
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "� 노트� Precision M series"
+
+#: ../rules/base.xml.in.h:167
+msgid "Dell Latitude series laptop"
+msgstr "� Latitude 시리즈 노트�"
+
+#: ../rules/base.xml.in.h:168
+msgid "Dell Precision M65"
+msgstr "� Precision M65"
+
+#: ../rules/base.xml.in.h:169
+msgid "Dell USB Multimedia Keybard"
+msgstr "� USB 멀티미디어 키보드"
+
+#: ../rules/base.xml.in.h:170
+msgid "Denmark"
+msgstr "�마�"
+
+#: ../rules/base.xml.in.h:171 ../rules/sun.xml.in.h:44
+msgid "Deu"
+msgstr "��"
+
+#: ../rules/base.xml.in.h:172
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop 키보드"
+
+#: ../rules/base.xml.in.h:173
+msgid "Diamond 9801 / 9802 series"
+msgstr "다�아몬드 9801 / 9802 시리즈"
+
+#: ../rules/base.xml.in.h:174 ../rules/sun.xml.in.h:46
+msgid "Dnk"
+msgstr "�마�"
+
+#: ../rules/base.xml.in.h:175 ../rules/sun.xml.in.h:48
+msgid "Dvorak"
+msgstr "드보�"
+
+#: ../rules/base.xml.in.h:176
+msgid "Dvorak international"
+msgstr "드보� 국제 버전"
+
+#: ../rules/base.xml.in.h:177
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "드보�, \"1/!\" 키� �란드어 따옴표"
+
+#: ../rules/base.xml.in.h:178
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "드보�, 따옴표 키� �란드어 따옴표"
+
+#: ../rules/base.xml.in.h:179
+msgid "Eastern"
+msgstr "�부"
+
+#: ../rules/base.xml.in.h:180 ../rules/sun.xml.in.h:49
+msgid "Eliminate dead keys"
+msgstr "�드키 없�"
+
+#: ../rules/base.xml.in.h:181
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:182
+msgid "Epo"
+msgstr "�스페란토"
+
+#: ../rules/base.xml.in.h:183
+msgid "Ergonomic"
+msgstr "어고노믹"
+
+#: ../rules/base.xml.in.h:184 ../rules/sun.xml.in.h:50
+msgid "Esp"
+msgstr "스페�"
+
+#: ../rules/base.xml.in.h:185
+msgid "Esperanto"
+msgstr "�스페란토"
+
+#: ../rules/base.xml.in.h:186
+msgid "Est"
+msgstr "�스토니아"
+
+#: ../rules/base.xml.in.h:187
+msgid "Estonia"
+msgstr "�스토니아"
+
+#: ../rules/base.xml.in.h:188
+msgid "Eth"
+msgstr "�티오피아"
+
+#: ../rules/base.xml.in.h:189
+msgid "Ethiopia"
+msgstr "�티오피아"
+
+#: ../rules/base.xml.in.h:190
+msgid "Evdev-managed keyboard"
+msgstr "evdev 관리 키보드"
+
+#: ../rules/base.xml.in.h:191
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:192
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:193
+msgid "Extended"
+msgstr "확장"
+
+#: ../rules/base.xml.in.h:194
+msgid "Extended Backslash"
+msgstr "확장 백슬래시"
+
+#: ../rules/base.xml.in.h:195
+msgid "F-letter (F) variant"
+msgstr "F 글� (F) 변형"
+
+#: ../rules/base.xml.in.h:196
+msgid "Fao"
+msgstr "페로 제�"
+
+#: ../rules/base.xml.in.h:197
+msgid "Faroe Islands"
+msgstr "페로 제�"
+
+#: ../rules/base.xml.in.h:198 ../rules/sun.xml.in.h:51
+msgid "Fin"
+msgstr "핀란드"
+
+#: ../rules/base.xml.in.h:199
+msgid "Finland"
+msgstr "핀란드"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:202
+msgid "Four-level key with abstract separators"
+msgstr "네번째 단계, 가� 구분 문� 사용"
+
+#: ../rules/base.xml.in.h:203
+msgid "Four-level key with comma"
+msgstr "네번째 단계, 쉼표 사용"
+
+#: ../rules/base.xml.in.h:204
+msgid "Four-level key with dot"
+msgstr "네번째 단계, � 사용"
+
+# momayyez: http://en.wikipedia.org/wiki/Momayyez
+#: ../rules/base.xml.in.h:205
+msgid "Four-level key with momayyez"
+msgstr "네번째 단계, 아�� 쉼표 (momayyez) 사용"
+
+#: ../rules/base.xml.in.h:206 ../rules/sun.xml.in.h:53
+msgid "Fra"
+msgstr "프랑스"
+
+#: ../rules/base.xml.in.h:207
+msgid "France"
+msgstr "프랑스"
+
+#: ../rules/base.xml.in.h:208 ../rules/sun.xml.in.h:55
+msgid "French"
+msgstr "프랑스어"
+
+#: ../rules/base.xml.in.h:209
+msgid "French (Macintosh)"
+msgstr "프랑스어 (매킨토시)"
+
+#: ../rules/base.xml.in.h:210 ../rules/sun.xml.in.h:56
+msgid "French (legacy)"
+msgstr "프랑스어 (구형)"
+
+#: ../rules/base.xml.in.h:211
+msgid "French Dvorak"
+msgstr "프랑스어 드보�"
+
+#: ../rules/base.xml.in.h:212
+msgid "French, Sun dead keys"
+msgstr "프랑스어, � �드키"
+
+#: ../rules/base.xml.in.h:213
+msgid "French, eliminate dead keys"
+msgstr "프랑스어, �드키 없�"
+
+#: ../rules/base.xml.in.h:214
+msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
+msgstr "후지스-지멘스 컴퓨터 AMILO A1667G 노트�"
+
+#: ../rules/base.xml.in.h:215
+msgid "Fula"
+msgstr "Fula"
+
+#: ../rules/base.xml.in.h:216
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:217
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:218
+msgid "Generic 101-key PC"
+msgstr "�반 101키 PC"
+
+#: ../rules/base.xml.in.h:219
+msgid "Generic 102-key (Intl) PC"
+msgstr "�반 102키 (국제 버전) PC"
+
+#: ../rules/base.xml.in.h:220
+msgid "Generic 104-key PC"
+msgstr "�반 104키 PC"
+
+#: ../rules/base.xml.in.h:221
+msgid "Generic 105-key (Intl) PC"
+msgstr "�반 105키 (국제 버전) PC"
+
+#: ../rules/base.xml.in.h:222
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:223
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:224
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:225
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:226
+msgid "Geo"
+msgstr "조지아"
+
+#: ../rules/base.xml.in.h:227
+msgid "Georgia"
+msgstr "조지아"
+
+#: ../rules/base.xml.in.h:228
+msgid "Georgian"
+msgstr "조지아"
+
+#: ../rules/base.xml.in.h:229
+msgid "Georgian AZERTY Tskapo"
+msgstr "조지아 AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:230
+msgid "German (Macintosh)"
+msgstr "��어 (매킨토시)"
+
+#: ../rules/base.xml.in.h:231
+msgid "German, Sun dead keys"
+msgstr "��어, � �드키"
+
+#: ../rules/base.xml.in.h:232
+msgid "German, eliminate dead keys"
+msgstr "��어, �드키 없�"
+
+#: ../rules/base.xml.in.h:233
+msgid "Germany"
+msgstr "��"
+
+#: ../rules/base.xml.in.h:234
+msgid "Gha"
+msgstr "가나"
+
+#: ../rules/base.xml.in.h:235
+msgid "Ghana"
+msgstr "가나"
+
+#: ../rules/base.xml.in.h:236
+msgid "Gre"
+msgstr "그리스"
+
+#: ../rules/base.xml.in.h:237
+msgid "Greece"
+msgstr "그리스"
+
+#: ../rules/base.xml.in.h:238
+msgid "Group toggle on multiply/divide key"
+msgstr "곱하기/나누기 키� 그룹 토글"
+
+# 기니공화국
+#: ../rules/base.xml.in.h:239
+msgid "Gui"
+msgstr "기니"
+
+# 기니공화국
+#: ../rules/base.xml.in.h:240
+msgid "Guinea"
+msgstr "기니"
+
+#: ../rules/base.xml.in.h:241
+msgid "Gujarati"
+msgstr "구��트어"
+
+#: ../rules/base.xml.in.h:242
+msgid "Gurmukhi"
+msgstr "굴목키어"
+
+# 제조사 �름
+#: ../rules/base.xml.in.h:243
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:244
+msgid "Happy Hacking Keyboard"
+msgstr "해피해킹 키보드"
+
+#: ../rules/base.xml.in.h:245
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "해피해킹 키보드, 맥용"
+
+# 나�지리아 변형
+#: ../rules/base.xml.in.h:246
+msgid "Hausa"
+msgstr "하우사어"
+
+#: ../rules/base.xml.in.h:247
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "휴렛팩커드 �터넷 키보드"
+
+#: ../rules/base.xml.in.h:248
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "휴렛팩커드 Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:249
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "휴렛팩커드 Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:250
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "휴렛팩커드 Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:251
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "휴렛팩커드 Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:252
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "휴렛팩커드 Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:253
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "휴렛팩커드 Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:254
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "휴렛팩커드 Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:255
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "휴렛팩커드 SK-2501 멀티미디어 키보드"
+
+#: ../rules/base.xml.in.h:256
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "휴렛팩커드 SK-2505 �터넷 키보드"
+
+# Bolnagri: x input method �름, http://indlinux.org/wiki/index.php/BolNagri
+#: ../rules/base.xml.in.h:257
+msgid "Hindi Bolnagri"
+msgstr "힌�어 Bolnagri"
+
+#: ../rules/base.xml.in.h:258
+msgid "Honeywell Euroboard"
+msgstr "하니웰 Euroboard"
+
+#: ../rules/base.xml.in.h:259
+msgid "Hrv"
+msgstr "�로아티아"
+
+#: ../rules/base.xml.in.h:260 ../rules/sun.xml.in.h:59
+msgid "Hun"
+msgstr "�가리"
+
+#: ../rules/base.xml.in.h:261
+msgid "Hungary"
+msgstr "�가리"
+
+#: ../rules/base.xml.in.h:262
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper가 윈�우 키로 매핑�니다."
+
+#: ../rules/base.xml.in.h:263
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:264
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:265
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:266
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (다른 옵션)"
+
+#: ../rules/base.xml.in.h:267
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:268
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, 국제 버전"
+
+#: ../rules/base.xml.in.h:269
+msgid "IBM ThinkPad R60/T60/Z60m/Z60t/R61/T61/Z61m/Z61t"
+msgstr "IBM ThinkPad R60/T60/Z60m/Z60t/R61/T61/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:270 ../rules/sun.xml.in.h:61
+msgid "ISO Alternate"
+msgstr "ISO 다른 버전"
+
+#: ../rules/base.xml.in.h:271
+msgid "Iceland"
+msgstr "아�슬랜드"
+
+# 나�지리아 변형
+#: ../rules/base.xml.in.h:272
+msgid "Igbo"
+msgstr "�그보어"
+
+#: ../rules/base.xml.in.h:273
+msgid "Ind"
+msgstr "��"
+
+#: ../rules/base.xml.in.h:274
+msgid "India"
+msgstr "��"
+
+#: ../rules/base.xml.in.h:275
+msgid "International (AltGr dead keys)"
+msgstr "국제 버전 (AltGr �드키)"
+
+#: ../rules/base.xml.in.h:276 ../rules/sun.xml.in.h:62
+msgid "International (with dead keys)"
+msgstr "국제 버전 (�드키 �함)"
+
+#: ../rules/base.xml.in.h:277
+msgid "Inuktitut"
+msgstr "�누�트어"
+
+#: ../rules/base.xml.in.h:278
+msgid "Iran"
+msgstr "�란"
+
+#: ../rules/base.xml.in.h:279
+msgid "Iraq"
+msgstr "���"
+
+#: ../rules/base.xml.in.h:280
+msgid "Ireland"
+msgstr "아�랜드"
+
+#: ../rules/base.xml.in.h:281
+msgid "Irl"
+msgstr "아�랜드"
+
+#: ../rules/base.xml.in.h:282
+msgid "Irn"
+msgstr "아�랜드"
+
+#: ../rules/base.xml.in.h:283
+msgid "Irq"
+msgstr "���"
+
+#: ../rules/base.xml.in.h:284
+msgid "Isl"
+msgstr "아�슬랜드"
+
+#: ../rules/base.xml.in.h:285
+msgid "Isr"
+msgstr "�스�엘"
+
+#: ../rules/base.xml.in.h:286
+msgid "Israel"
+msgstr "�스�엘"
+
+#: ../rules/base.xml.in.h:287 ../rules/sun.xml.in.h:63
+msgid "Ita"
+msgstr "�탈리아"
+
+#: ../rules/base.xml.in.h:288
+msgid "Italy"
+msgstr "�탈리아"
+
+#: ../rules/base.xml.in.h:289
+msgid "Japan"
+msgstr "�본"
+
+#: ../rules/base.xml.in.h:290
+msgid "Japan (PC-98xx Series)"
+msgstr "�본 (PC-98xx 시리즈)"
+
+#: ../rules/base.xml.in.h:291
+msgid "Japanese 106-key"
+msgstr "�본 106키"
+
+#: ../rules/base.xml.in.h:292
+msgid "Japanese keyboard options"
+msgstr "�본어 키보드 옵션"
+
+#: ../rules/base.xml.in.h:293 ../rules/sun.xml.in.h:66
+msgid "Jpn"
+msgstr "�본"
+
+#: ../rules/base.xml.in.h:294
+msgid "Kana"
+msgstr "가나"
+
+#: ../rules/base.xml.in.h:295
+msgid "Kana Lock key is locking"
+msgstr "Kana Lock 키 �태 고정"
+
+#: ../rules/base.xml.in.h:296
+msgid "Kannada"
+msgstr "칸나다어"
+
+#: ../rules/base.xml.in.h:297
+msgid "Kashubian"
+msgstr "카슈브어"
+
+#: ../rules/base.xml.in.h:298
+msgid "Kaz"
+msgstr "카��스탄"
+
+#: ../rules/base.xml.in.h:299
+msgid "Kazakh with Russian"
+msgstr "카��스탄, 러시아어 �함"
+
+#: ../rules/base.xml.in.h:300
+msgid "Kazakhstan"
+msgstr "카��스탄"
+
+#: ../rules/base.xml.in.h:301
+msgid "Keypad"
+msgstr "키패드"
+
+#: ../rules/base.xml.in.h:302
+msgid "Keypad with unicode additions (arrows and math operators)"
+msgstr "키패드 유니코드 추가 (화살표 � 수학 기호)"
+
+#: ../rules/base.xml.in.h:303
+msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "키패드 유니코드 추가 (화살표 � 수학 기호). 수학 기호를 기본 단계�."
+
+#: ../rules/base.xml.in.h:304
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:305
+msgid "Khm"
+msgstr "캄보디아"
+
+# Komi: http://ko.wikipedia.org/wiki/%EC%BD%94%EB%AF%B8%EC%96%B4
+#: ../rules/base.xml.in.h:306
+msgid "Komi"
+msgstr "코미어"
+
+#: ../rules/base.xml.in.h:307
+msgid "Kor"
+msgstr "대한민국"
+
+#: ../rules/base.xml.in.h:308
+msgid "Korea, Republic of"
+msgstr "대한민국"
+
+#: ../rules/base.xml.in.h:309
+msgid "Korean 106-key"
+msgstr "한글 106키"
+
+#: ../rules/base.xml.in.h:310
+msgid "Kurdish, (F)"
+msgstr "쿠르드어, (F)"
+
+#: ../rules/base.xml.in.h:311
+msgid "Kurdish, Arabic-Latin"
+msgstr "쿠르드어, 아�어 �틴"
+
+#: ../rules/base.xml.in.h:312
+msgid "Kurdish, Latin Alt-Q"
+msgstr "쿠르드어, �틴 Alt-Q"
+
+#: ../rules/base.xml.in.h:313
+msgid "Kurdish, Latin Q"
+msgstr "쿠르드어, �틴 Q"
+
+#: ../rules/base.xml.in.h:314
+msgid "Kyr"
+msgstr "키르기지스탄"
+
+#: ../rules/base.xml.in.h:315
+msgid "Kyrgyzstan"
+msgstr "키르기지스탄"
+
+#: ../rules/base.xml.in.h:316
+msgid "LAm"
+msgstr "�틴 아메리카"
+
+#: ../rules/base.xml.in.h:317
+msgid "LCtrl+LShift change layout."
+msgstr "왼쪽Ctrl+왼쪽Shift로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:318
+msgid "Lao"
+msgstr "�오스"
+
+#: ../rules/base.xml.in.h:319
+msgid "Laos"
+msgstr "�오스"
+
+#: ../rules/base.xml.in.h:320
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "노트� 컴팩 (Armada 등) 노트� 키보드"
+
+#: ../rules/base.xml.in.h:321
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "노트� 컴팩 (Presario 등) 노트� 키보드"
+
+#: ../rules/base.xml.in.h:322
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "노트� 컴팩 eMachines m68xx"
+
+#: ../rules/base.xml.in.h:323
+msgid "Latin"
+msgstr "�틴"
+
+#: ../rules/base.xml.in.h:324
+msgid "Latin American"
+msgstr "�틴 아메리카"
+
+#: ../rules/base.xml.in.h:325
+msgid "Latin Unicode"
+msgstr "�틴 유니코드"
+
+#: ../rules/base.xml.in.h:326
+msgid "Latin Unicode qwerty"
+msgstr "�틴 유니코드 QWERTY"
+
+#: ../rules/base.xml.in.h:327
+msgid "Latin qwerty"
+msgstr "�틴 QWERTY"
+
+#: ../rules/base.xml.in.h:328
+msgid "Latin unicode"
+msgstr "�틴 유니코드"
+
+#: ../rules/base.xml.in.h:329
+msgid "Latin unicode qwerty"
+msgstr "�틴 유니코드 QWERTY"
+
+#: ../rules/base.xml.in.h:330
+msgid "Latin with guillemets"
+msgstr "�틴, �괄호 �함"
+
+#: ../rules/base.xml.in.h:331
+msgid "Latvia"
+msgstr "�트비아"
+
+#: ../rules/base.xml.in.h:332
+msgid "Layout switching"
+msgstr "배치 전환"
+
+#: ../rules/base.xml.in.h:333
+msgid "Left Alt is swapped with left Win-key."
+msgstr "왼쪽 Alt와 왼쪽 윈�우 키를 뒤바꿉니다."
+
+#: ../rules/base.xml.in.h:334
+msgid "Left Alt key changes layout."
+msgstr "왼쪽 Alt 키로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:335
+msgid "Left Alt key switches layout while pressed."
+msgstr "왼쪽 Alt 키를 누르면 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:336
+msgid "Left Ctrl key changes layout."
+msgstr "왼쪽 Ctrl 키로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:337
+msgid "Left Shift key changes layout."
+msgstr "왼쪽 Shift 키로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:338
+msgid "Left Win-key changes layout."
+msgstr "왼쪽 윈�우 키로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:339
+msgid "Left Win-key is Compose."
+msgstr "왼쪽 윈�우 키가 조합 키입니다."
+
+#: ../rules/base.xml.in.h:340
+msgid "Left Win-key switches layout while pressed."
+msgstr "왼쪽 윈�우 키를 누르면 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:341
+msgid "Left hand"
+msgstr "왼�잡�"
+
+#: ../rules/base.xml.in.h:342
+msgid "Left handed Dvorak"
+msgstr "왼�잡� 드보�"
+
+#: ../rules/base.xml.in.h:343
+msgid "Legacy Wang 724 keypad"
+msgstr "구� Wang 724 키패드"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:345
+msgid "Legacy key with comma"
+msgstr "구� 키, 쉼표 �함"
+
+#: ../rules/base.xml.in.h:346
+msgid "Legacy key with dot"
+msgstr "구� 키, � �함"
+
+#: ../rules/base.xml.in.h:347
+msgid "Legacy keypad"
+msgstr "구� 키패드"
+
+#: ../rules/base.xml.in.h:348
+msgid "Lithuania"
+msgstr "리투아니아"
+
+#: ../rules/base.xml.in.h:349
+msgid "Logitech Access Keyboard"
+msgstr "로지� Access 키보드"
+
+#: ../rules/base.xml.in.h:350
+msgid "Logitech Cordless Desktop"
+msgstr "로지� Cordless Desktop"
+
+#: ../rules/base.xml.in.h:351
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "로지� Cordless Desktop (다른 옵션)"
+
+#: ../rules/base.xml.in.h:352
+msgid "Logitech Cordless Desktop EX110"
+msgstr "로지� Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:353
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "로지� Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:354
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "로지� Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:355
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "로지� Cordless Desktop Pro (다른 옵션 2)"
+
+#: ../rules/base.xml.in.h:356
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "로지� Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:357
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "로지� G15 추가 키, G15daemon 사용"
+
+#: ../rules/base.xml.in.h:358
+msgid "Logitech Internet Keyboard"
+msgstr "로지� �터넷 키보드"
+
+#: ../rules/base.xml.in.h:359
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "로지� Internet Navigator 키보드"
+
+#: ../rules/base.xml.in.h:360
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "로지� Ultra-X 무선 미디어 �스�탑 키보드"
+
+#: ../rules/base.xml.in.h:361
+msgid "Logitech Ultra-X Keyboard"
+msgstr "로지� Ultra-X 키보드"
+
+#: ../rules/base.xml.in.h:362
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "로지� diNovo Edge 키보드"
+
+#: ../rules/base.xml.in.h:363
+msgid "Logitech diNovo Keyboard"
+msgstr "로지� diNovo 키보드"
+
+#: ../rules/base.xml.in.h:364
+msgid "Logitech iTouch"
+msgstr "로지� iTouch"
+
+#: ../rules/base.xml.in.h:365
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "로지� iTouch Cordless 키보드 (모� Y-RB6)"
+
+#: ../rules/base.xml.in.h:366
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "로지� iTouch Internet Navigator 키보드 SE"
+
+#: ../rules/base.xml.in.h:367
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "로지� iTouch Internet Navigator 키보드 SE (USB)"
+
+#: ../rules/base.xml.in.h:368
+msgid "Ltu"
+msgstr "리투아니아"
+
+#: ../rules/base.xml.in.h:369
+msgid "Lva"
+msgstr "�트비아"
+
+#: ../rules/base.xml.in.h:370
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:371
+msgid "MNE"
+msgstr "MNE"
+
+#: ../rules/base.xml.in.h:372
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:373
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (국제 버전)"
+
+#: ../rules/base.xml.in.h:374
+msgid "Macedonia"
+msgstr "마케�니아"
+
+#: ../rules/base.xml.in.h:375
+msgid "Macintosh"
+msgstr "매킨토시"
+
+#: ../rules/base.xml.in.h:376
+msgid "Macintosh Old"
+msgstr "매킨토시 구형"
+
+#: ../rules/base.xml.in.h:377
+msgid "Macintosh, Sun dead keys"
+msgstr "매킨토시, � �드키"
+
+#: ../rules/base.xml.in.h:378
+msgid "Macintosh, eliminate dead keys"
+msgstr "매킨토시, �드키 없�"
+
+#: ../rules/base.xml.in.h:379
+msgid "Make CapsLock an additional Ctrl."
+msgstr "CapsLock� � 하나� Ctrl로 만듭니다."
+
+#: ../rules/base.xml.in.h:380
+msgid "Mal"
+msgstr "몰디브"
+
+#: ../rules/base.xml.in.h:381
+msgid "Malayalam"
+msgstr "��얄람어"
+
+#: ../rules/base.xml.in.h:382
+msgid "Malayalam Lalitha"
+msgstr "��얄람어 �리타"
+
+#: ../rules/base.xml.in.h:383
+msgid "Maldives"
+msgstr "몰디브"
+
+#: ../rules/base.xml.in.h:384
+msgid "Malta"
+msgstr "몰타"
+
+#: ../rules/base.xml.in.h:385
+msgid "Maltese keyboard with US layout"
+msgstr "몰타 키보드, 미국� 배치"
+
+#: ../rules/base.xml.in.h:386
+msgid "Mao"
+msgstr "마오리"
+
+#: ../rules/base.xml.in.h:387
+msgid "Maori"
+msgstr "마오리"
+
+#: ../rules/base.xml.in.h:388
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:389
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access 키보드"
+
+#: ../rules/base.xml.in.h:390
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:391
+msgid "Menu is Compose."
+msgstr "메뉴 키가 조합 키입니다."
+
+#: ../rules/base.xml.in.h:392
+msgid "Menu key changes layout."
+msgstr "메뉴 키로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:393
+msgid "Meta is mapped to the Win-keys."
+msgstr "메타 키가 윈�우 키로 매핑�니다."
+
+#: ../rules/base.xml.in.h:394
+msgid "Meta is mapped to the left Win-key."
+msgstr "메타 키가 왼쪽 윈�우 키로 매핑�니다."
+
+#: ../rules/base.xml.in.h:395
+msgid "Microsoft Internet Keyboard"
+msgstr "마��로소프트 �터넷 키보드"
+
+#: ../rules/base.xml.in.h:396
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "마��로소프트 �터넷 키보드 프로, 스웨�"
+
+#: ../rules/base.xml.in.h:397
+msgid "Microsoft Natural"
+msgstr "마��로소프트 내츄럴"
+
+#: ../rules/base.xml.in.h:398
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "마��로소프트 내츄럴 키보드 엘리트"
+
+#: ../rules/base.xml.in.h:399
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "마��로소프트 내츄럴 키보드 / 마��로소프트 �터넷 키보드 프로"
+
+#: ../rules/base.xml.in.h:400
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "마��로소프트 내츄럴 키보드 프로 OEM"
+
+#: ../rules/base.xml.in.h:401
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "마��로소프트 내츄럴 키보드 프로 USB / 마��로소프트 �터넷 키보드 프로"
+
+#: ../rules/base.xml.in.h:402
+msgid "Microsoft Office Keyboard"
+msgstr "마��로소프트 오피스 키보드"
+
+#: ../rules/base.xml.in.h:403
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "마��로소프트 무선 멀티미디어 키보드 1.0A"
+
+#: ../rules/base.xml.in.h:404 ../rules/sun.xml.in.h:72
+msgid "Miscellaneous compatibility options"
+msgstr "기타 호환성 옵션"
+
+#: ../rules/base.xml.in.h:405
+msgid "Mkd"
+msgstr "마케�니아"
+
+#: ../rules/base.xml.in.h:406
+msgid "Mlt"
+msgstr "몰타"
+
+#: ../rules/base.xml.in.h:407
+msgid "Mmr"
+msgstr "미얀마"
+
+#: ../rules/base.xml.in.h:408
+msgid "Mng"
+msgstr "몽골"
+
+#: ../rules/base.xml.in.h:409
+msgid "Mongolia"
+msgstr "몽골"
+
+#: ../rules/base.xml.in.h:410
+msgid "Montenegro"
+msgstr "몬테네그로"
+
+#: ../rules/base.xml.in.h:411
+msgid "Morocco"
+msgstr "모로코"
+
+#: ../rules/base.xml.in.h:412 ../rules/sun.xml.in.h:73
+msgid "Multilingual"
+msgstr "여러 언어 지�"
+
+#: ../rules/base.xml.in.h:413
+msgid "Multilingual, first part"
+msgstr "여러 언어 지�, 첫번째"
+
+#: ../rules/base.xml.in.h:414 ../rules/sun.xml.in.h:74
+msgid "Multilingual, second part"
+msgstr "여러 언어 지�, �번째"
+
+#: ../rules/base.xml.in.h:415
+msgid "Myanmar"
+msgstr "미얀마"
+
+#: ../rules/base.xml.in.h:416
+msgid "NICOLA-F style Backspace"
+msgstr "NICOLA-F 스타� 백스페�스"
+
+# 제조사
+#: ../rules/base.xml.in.h:417
+msgid "Neostyle"
+msgstr "Neostyle"
+
+#: ../rules/base.xml.in.h:418
+msgid "Nep"
+msgstr "네팔"
+
+#: ../rules/base.xml.in.h:419
+msgid "Nepal"
+msgstr "네팔"
+
+#: ../rules/base.xml.in.h:420
+msgid "Netherlands"
+msgstr "네�란드"
+
+#: ../rules/base.xml.in.h:421
+msgid "Nig"
+msgstr "나�지리아"
+
+#: ../rules/base.xml.in.h:422
+msgid "Nigeria"
+msgstr "나�지리아"
+
+#: ../rules/base.xml.in.h:423
+msgid "Nld"
+msgstr "네�란드"
+
+#: ../rules/base.xml.in.h:424 ../rules/sun.xml.in.h:75
+msgid "Nor"
+msgstr "노르웨�"
+
+#: ../rules/base.xml.in.h:425
+msgid "Northern Saami"
+msgstr "� 사오미"
+
+#: ../rules/base.xml.in.h:426
+msgid "Northern Saami, eliminate dead keys"
+msgstr "� 사오미, �드키 없�"
+
+#: ../rules/base.xml.in.h:427
+msgid "Northgate OmniKey 101"
+msgstr "노스게�트 OmniKey 101"
+
+#: ../rules/base.xml.in.h:428
+msgid "Norway"
+msgstr "노르웨�"
+
+#: ../rules/base.xml.in.h:429
+msgid "NumLock LED shows alternative layout."
+msgstr "NumLock LED가 다른 배치를 표시합니다."
+
+#: ../rules/base.xml.in.h:430
+msgid "Numeric keypad delete key behaviour"
+msgstr "숫� 키패드� Delete 키 �작"
+
+#: ../rules/base.xml.in.h:431
+msgid "Numeric keypad keys work as with Mac."
+msgstr "숫� 키패드가 맥과 ��하게 �작."
+
+#: ../rules/base.xml.in.h:432
+msgid "Numeric keypad layout selection"
+msgstr "숫� 키패드 배치 선�"
+
+#: ../rules/base.xml.in.h:433
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:434
+msgid "OLPC"
+msgstr "OLPC"
+
+# 아프가니스탄 공용어� 하나, http://ko.wikipedia.org/wiki/%EB%8B%A4%EB%A6%AC%EC%96%B4
+#: ../rules/base.xml.in.h:435
+msgid "OLPC Dari"
+msgstr "OLPC 다리어"
+
+# 아프가니스탄 공용어� 하나, http://ko.wikipedia.org/wiki/%ED%8C%8C%EC%8A%88%ED%86%A0%EC%96%B4
+#: ../rules/base.xml.in.h:436
+msgid "OLPC Pashto"
+msgstr "OLPC 파슈토어"
+
+#: ../rules/base.xml.in.h:437
+msgid "OLPC Southern Uzbek"
+msgstr "OLPC 남 우즈벡"
+
+# 아�랜드 변형
+#: ../rules/base.xml.in.h:438
+msgid "Ogham"
+msgstr "Ogham"
+
+# 아�랜드 변형
+#: ../rules/base.xml.in.h:439
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+# �� 방언
+#: ../rules/base.xml.in.h:440
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../rules/base.xml.in.h:441
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet 키보드"
+
+# 러시아 변형
+#: ../rules/base.xml.in.h:442
+msgid "Ossetian"
+msgstr "Ossetian"
+
+#: ../rules/base.xml.in.h:443
+msgid "Ossetian, Winkeys"
+msgstr "Ossetian, 윈�우 키"
+
+#: ../rules/base.xml.in.h:444
+msgid "PC-98xx Series"
+msgstr "PC-98xx 시리즈"
+
+#: ../rules/base.xml.in.h:445
+msgid "Pak"
+msgstr "파키스탄"
+
+#: ../rules/base.xml.in.h:446
+msgid "Pakistan"
+msgstr "파키스탄"
+
+# 아프가니스탄
+#: ../rules/base.xml.in.h:447
+msgid "Pashto"
+msgstr "파슈토어"
+
+# 태국
+#: ../rules/base.xml.in.h:448
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:449 ../rules/sun.xml.in.h:78
+msgid "Phonetic"
+msgstr "�성 표기"
+
+#: ../rules/base.xml.in.h:450 ../rules/sun.xml.in.h:79
+msgid "Pol"
+msgstr "�란드"
+
+#: ../rules/base.xml.in.h:451
+msgid "Poland"
+msgstr "�란드"
+
+# 그리스어 발� 표기 http://en.wikipedia.org/wiki/Polytonic_orthography
+#: ../rules/base.xml.in.h:452
+msgid "Polytonic"
+msgstr "�리토닉"
+
+#: ../rules/base.xml.in.h:453
+msgid "Portugal"
+msgstr "�르투갈"
+
+#: ../rules/base.xml.in.h:454
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "왼쪽 Alt 키를 누르면 3번째 단계를 선�합니다."
+
+#: ../rules/base.xml.in.h:455
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "왼쪽 윈�우 키를 누르면 3번째 단계를 선�합니다."
+
+#: ../rules/base.xml.in.h:456
+msgid "Press Menu key to choose 3rd level."
+msgstr "메뉴 키를 누르면 3번째 단계를 선�합니다."
+
+#: ../rules/base.xml.in.h:457
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "오른쪽 Alt 키를 누르면 3번째 단계를 선�합니다. Shift+오른쪽 Alt 키가 Multi_Key입니다."
+
+#: ../rules/base.xml.in.h:458
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "오른쪽 Alt 키를 누르면 3번째 단계를 선�합니다."
+
+#: ../rules/base.xml.in.h:459
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "오른쪽 Ctrl 키를 누르면 3번째 단계를 선�합니다."
+
+#: ../rules/base.xml.in.h:460
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "오른쪽 윈�우 키를 누르면 3번째 단계를 선�합니다."
+
+#: ../rules/base.xml.in.h:461
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "아무 Alt 키를 누르면 3번째 단계를 선�합니다."
+
+#: ../rules/base.xml.in.h:462
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "아무 윈�우 키를 누르면 3번째 단계를 선�합니다."
+
+#: ../rules/base.xml.in.h:463
+msgid "Pro"
+msgstr "프로"
+
+#: ../rules/base.xml.in.h:464
+msgid "Pro Keypad"
+msgstr "프로 키보드"
+
+#: ../rules/base.xml.in.h:465
+msgid "Probhat"
+msgstr "프롭햇"
+
+#: ../rules/base.xml.in.h:466
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:467 ../rules/sun.xml.in.h:88
+msgid "Prt"
+msgstr "�르투갈"
+
+#: ../rules/base.xml.in.h:468
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:469
+msgid "R-Alt switches layout while pressed."
+msgstr "오른쪽 Alt 키를 누르면 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:470
+msgid "Right Alt is Compose."
+msgstr "오른쪽 Alt가 조합 키입니다."
+
+#: ../rules/base.xml.in.h:471
+msgid "Right Alt key changes layout."
+msgstr "오른쪽 Alt 키로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:472 ../rules/sun.xml.in.h:90
+msgid "Right Alt key never chooses 3rd level."
+msgstr "오른쪽 Alt 키는 3번째 단계를 선�하지 않습니다."
+
+#: ../rules/base.xml.in.h:473
+msgid "Right Ctrl is Compose."
+msgstr "오른쪽 Ctrl� 조합 키입니다."
+
+#: ../rules/base.xml.in.h:474
+msgid "Right Ctrl key changes layout."
+msgstr "오른쪽 Ctrl 키로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:475
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "오른쪽 Ctrl 키를 누르면 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:476
+msgid "Right Ctrl key works as Right Alt."
+msgstr "오른쪽 Ctrl 키가 오른쪽 Alt로 �작합니다."
+
+#: ../rules/base.xml.in.h:477
+msgid "Right Shift key changes layout."
+msgstr "오른쪽 Shift 키로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:478
+msgid "Right Win-key changes layout."
+msgstr "오른쪽 윈�우 키로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:479
+msgid "Right Win-key is Compose."
+msgstr "오른쪽 윈�우 키가 조합 키입니다."
+
+#: ../rules/base.xml.in.h:480
+msgid "Right Win-key switches layout while pressed."
+msgstr "오른쪽 윈�우 키를 누르면 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:481
+msgid "Right hand"
+msgstr "오른�잡�"
+
+#: ../rules/base.xml.in.h:482
+msgid "Right handed Dvorak"
+msgstr "오른�잡� 드보�"
+
+#: ../rules/base.xml.in.h:483
+msgid "Romania"
+msgstr "루마니아"
+
+#: ../rules/base.xml.in.h:484
+msgid "Romanian keyboard with German letters"
+msgstr "루마니아 키보드, ��어 글�"
+
+#: ../rules/base.xml.in.h:485
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "루마니아 키보드, ��어 글�, �드키 없�"
+
+#: ../rules/base.xml.in.h:486
+msgid "Rou"
+msgstr "루마니아"
+
+#: ../rules/base.xml.in.h:487 ../rules/sun.xml.in.h:95
+msgid "Rus"
+msgstr "러시아"
+
+#: ../rules/base.xml.in.h:488
+msgid "Russia"
+msgstr "러시아"
+
+#: ../rules/base.xml.in.h:489 ../rules/sun.xml.in.h:96
+msgid "Russian"
+msgstr "러시아어"
+
+#: ../rules/base.xml.in.h:490
+msgid "Russian phonetic"
+msgstr "러시아어 �성 표기"
+
+#: ../rules/base.xml.in.h:491
+msgid "Russian phonetic Dvorak"
+msgstr "러시아어 �성 표기 드보�"
+
+#: ../rules/base.xml.in.h:492
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "러시아어 �성 표기, �드키 없�"
+
+#: ../rules/base.xml.in.h:493
+msgid "Russian with Kazakh"
+msgstr "러시아어, 카�� �함"
+
+#: ../rules/base.xml.in.h:494
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless 키보드"
+
+#: ../rules/base.xml.in.h:495
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:496
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:497
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:498
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:499
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:500
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:501
+msgid "Samsung SDM 4500P"
+msgstr "삼성 SDM 4500P"
+
+#: ../rules/base.xml.in.h:502
+msgid "Samsung SDM 4510P"
+msgstr "삼성 SDM 4510P"
+
+#: ../rules/base.xml.in.h:503
+msgid "ScrollLock LED shows alternative layout."
+msgstr "ScrollLock LED가 다른 배치를 표시합니다."
+
+#: ../rules/base.xml.in.h:504
+msgid "Serbia"
+msgstr "세르비아"
+
+#: ../rules/base.xml.in.h:505
+msgid "Shift cancels CapsLock."
+msgstr "Shift를 누르면 CapsLock� �니다."
+
+#: ../rules/base.xml.in.h:506
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "Shift 키와 �시� 숫� 키패드 키를 누를 때 MS 윈�우즈와 ��하게 �작."
+
+#: ../rules/base.xml.in.h:507
+msgid "Shift+CapsLock changes layout."
+msgstr "Shift+CapsLock으로 배치를 바꿉니다."
+
+#: ../rules/base.xml.in.h:508
+msgid "Slovakia"
+msgstr "슬로바키아"
+
+#: ../rules/base.xml.in.h:509
+msgid "Slovenia"
+msgstr "슬로베니아"
+
+#: ../rules/base.xml.in.h:510
+msgid "South Africa"
+msgstr "남아공"
+
+#: ../rules/base.xml.in.h:511
+msgid "Southern Uzbek"
+msgstr "남 우즈벡"
+
+#: ../rules/base.xml.in.h:512
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "스페�스 키는 네번째 단계�서 강제 공백 출력, 여섯번째 단계�서 얇� 강제 공백"
+
+#: ../rules/base.xml.in.h:513
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr "스페�스 키는 네번째 단계�서 강제 공백 출력."
+
+#: ../rules/base.xml.in.h:514
+msgid "Space key outputs non-breakable space character at second level."
+msgstr "스페�스 키는 �번째 단계�서 강제 공백 출력."
+
+#: ../rules/base.xml.in.h:515
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr "스페�스 키는 세번째 단계�서 강제 공백 출력, 네 번째�는 출력 없�."
+
+#: ../rules/base.xml.in.h:516
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "스페�스 키는 세번째 단계�서 강제 공백 출력, 네 번째�는 얇� 강제 공백 출력."
+
+#: ../rules/base.xml.in.h:517
+msgid "Space key outputs non-breakable space character at third level."
+msgstr "스페�스 키는 세번째 단계�서 강제 공백 출력."
+
+#: ../rules/base.xml.in.h:518
+msgid "Space key outputs usual space at any level."
+msgstr "스페�스 키는 모든 단계�서 �반 공백 출력."
+
+#: ../rules/base.xml.in.h:519
+msgid "Spain"
+msgstr "스페�"
+
+#: ../rules/base.xml.in.h:520 ../rules/sun.xml.in.h:103
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "특수 키 조합� (Ctrl+Alt+&lt;키&gt;) 서버�서 처리합니다."
+
+#: ../rules/base.xml.in.h:521
+msgid "SrL"
+msgstr "스리랑카"
+
+#: ../rules/base.xml.in.h:522
+msgid "Sri Lanka"
+msgstr "스리랑카"
+
+#: ../rules/base.xml.in.h:523 ../rules/sun.xml.in.h:104
+msgid "Standard"
+msgstr "표준"
+
+#: ../rules/base.xml.in.h:524
+msgid "Standard (Cedilla)"
+msgstr "표준 (세딜�)"
+
+#: ../rules/base.xml.in.h:525
+msgid "Standard (Commabelow)"
+msgstr "표준 (아래 쉼표)"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:527
+msgid "Standard RSTU"
+msgstr "표준 RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:529
+msgid "Standard RSTU on Russian layout"
+msgstr "표준 RSTU 러시아어 배치"
+
+#: ../rules/base.xml.in.h:530 ../rules/sun.xml.in.h:112
+msgid "Sun dead keys"
+msgstr "� �드키"
+
+#: ../rules/base.xml.in.h:531
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power 멀티미디어 키보드"
+
+#: ../rules/base.xml.in.h:532
+msgid "Super is mapped to the Win-keys."
+msgstr "Super 키가 윈�우 키로 매핑�니다."
+
+#: ../rules/base.xml.in.h:533
+msgid "Svdvorak"
+msgstr "슬로바키아 드보�"
+
+#: ../rules/base.xml.in.h:534 ../rules/sun.xml.in.h:113
+msgid "Svk"
+msgstr "슬로바키아"
+
+#: ../rules/base.xml.in.h:535
+msgid "Svn"
+msgstr "슬로베니아"
+
+#: ../rules/base.xml.in.h:536
+msgid "Swap Ctrl and CapsLock."
+msgstr "Ctrl과 CapsLock 뒤바꾸기."
+
+#: ../rules/base.xml.in.h:537
+msgid "Swap ESC and CapsLock."
+msgstr "ESC와 CapsLock 뒤바꾸기."
+
+#: ../rules/base.xml.in.h:538
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr "맥 키보드를 커�� 잘못 검색했� 때 키 �개� 코드 뒤바꾸기."
+
+#: ../rules/base.xml.in.h:539 ../rules/sun.xml.in.h:115
+msgid "Swe"
+msgstr "스웨�"
+
+#: ../rules/base.xml.in.h:540
+msgid "Sweden"
+msgstr "스웨�"
+
+#: ../rules/base.xml.in.h:541
+msgid "Switzerland"
+msgstr "스위스"
+
+#: ../rules/base.xml.in.h:542
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (타블렛 PC)"
+
+#: ../rules/base.xml.in.h:543
+msgid "Syr"
+msgstr "시리아"
+
+#: ../rules/base.xml.in.h:544
+msgid "Syria"
+msgstr "시리아"
+
+#: ../rules/base.xml.in.h:545
+msgid "Syriac"
+msgstr "시리아어"
+
+#: ../rules/base.xml.in.h:546
+msgid "Syriac phonetic"
+msgstr "시리아어 �성 기호"
+
+#: ../rules/base.xml.in.h:547
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:548
+msgid "Tajikistan"
+msgstr "타지키스탄"
+
+#: ../rules/base.xml.in.h:549
+msgid "Tamil"
+msgstr "타밀어"
+
+#: ../rules/base.xml.in.h:550
+msgid "Tamil TAB Typewriter"
+msgstr "타밀어 TAB 타�기"
+
+#: ../rules/base.xml.in.h:551
+msgid "Tamil TSCII Typewriter"
+msgstr "타밀어 TSCII 타�기"
+
+#: ../rules/base.xml.in.h:552
+msgid "Tamil Unicode"
+msgstr "타밀어 유니코드"
+
+#: ../rules/base.xml.in.h:553
+msgid "Tatar"
+msgstr "Tatar"
+
+#: ../rules/base.xml.in.h:554
+msgid "Telugu"
+msgstr "텔루구어"
+
+#: ../rules/base.xml.in.h:555
+msgid "Tha"
+msgstr "태국"
+
+#: ../rules/base.xml.in.h:556
+msgid "Thailand"
+msgstr "태국"
+
+#: ../rules/base.xml.in.h:557 ../rules/sun.xml.in.h:119
+msgid "Third level choosers"
+msgstr "세번째 단계 선� 키"
+
+#: ../rules/base.xml.in.h:558
+msgid "Tibetan"
+msgstr "티베트"
+
+#: ../rules/base.xml.in.h:559
+msgid "Tibetan (with ASCII numerals)"
+msgstr "티베트 (ASCII 숫� �함)"
+
+#: ../rules/base.xml.in.h:560
+msgid "Tifinagh"
+msgstr "티피나그"
+
+#: ../rules/base.xml.in.h:561
+msgid "Tifinagh Alternative"
+msgstr "티피나그 다른 버전"
+
+#: ../rules/base.xml.in.h:562
+msgid "Tifinagh Alternative Phonetic"
+msgstr "티피나그 다른 �성 기호 버전"
+
+#: ../rules/base.xml.in.h:563
+msgid "Tifinagh Extended"
+msgstr "티피나그 확장"
+
+#: ../rules/base.xml.in.h:564
+msgid "Tifinagh Extended Phonetic"
+msgstr "티피나그 확장 �성 기호"
+
+#: ../rules/base.xml.in.h:565
+msgid "Tifinagh Phonetic"
+msgstr "티피나그 �성 기호"
+
+#: ../rules/base.xml.in.h:566
+msgid "Tilde (~) variant"
+msgstr "틸드 (~) 변형"
+
+#: ../rules/base.xml.in.h:567
+msgid "Tjk"
+msgstr "타지키스탄"
+
+#: ../rules/base.xml.in.h:568
+msgid "Toshiba Satellite S3000"
+msgstr "�시바 Satellite S3000"
+
+#: ../rules/base.xml.in.h:569
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access 키보드"
+
+#: ../rules/base.xml.in.h:570
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:571 ../rules/sun.xml.in.h:120
+msgid "Tur"
+msgstr "터키"
+
+#: ../rules/base.xml.in.h:572
+msgid "Turkey"
+msgstr "터키"
+
+#: ../rules/base.xml.in.h:573
+msgid "Typewriter"
+msgstr "타�기"
+
+#: ../rules/base.xml.in.h:574
+msgid "US keyboard with Bosnian digraphs"
+msgstr "미국� 키보드, 보스니아 �중 글� �함"
+
+#: ../rules/base.xml.in.h:575
+msgid "US keyboard with Bosnian letters"
+msgstr "미국� 키보드, 보스니아 글� �함"
+
+#: ../rules/base.xml.in.h:576
+msgid "US keyboard with Croatian digraphs"
+msgstr "미국� 키보드, �로아티아 �중 글� �함"
+
+#: ../rules/base.xml.in.h:577
+msgid "US keyboard with Croatian letters"
+msgstr "미국� 키보드, �로아티아 글� �함"
+
+#: ../rules/base.xml.in.h:578
+msgid "US keyboard with Estonian letters"
+msgstr "미국� 키보드, �스토니아 글� �함"
+
+#: ../rules/base.xml.in.h:579
+msgid "US keyboard with Lithuanian letters"
+msgstr "미국� 키보드, 리투아니아 글� �함"
+
+#: ../rules/base.xml.in.h:580
+msgid "US keyboard with Slovenian digraphs"
+msgstr "미국� 키보드, 슬로베니아 �중 글� �함"
+
+#: ../rules/base.xml.in.h:581
+msgid "US keyboard with Slovenian letters"
+msgstr "미국� 키보드, 슬로베니아 글� �함"
+
+#: ../rules/base.xml.in.h:582 ../rules/sun.xml.in.h:126
+msgid "USA"
+msgstr "미국"
+
+# http://ko.wikipedia.org/wiki/%EC%9A%B0%EB%93%9C%EB%AC%B4%EB%A5%B4%ED%8A%B8%EC%96%B4
+#: ../rules/base.xml.in.h:583
+msgid "Udmurt"
+msgstr "우드무르트어"
+
+#: ../rules/base.xml.in.h:584
+msgid "Ukr"
+msgstr "우���나"
+
+#: ../rules/base.xml.in.h:585
+msgid "Ukraine"
+msgstr "우���나"
+
+#: ../rules/base.xml.in.h:586
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:587 ../rules/sun.xml.in.h:127
+msgid "United Kingdom"
+msgstr "�국"
+
+# �� 방언
+#: ../rules/base.xml.in.h:588
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../rules/base.xml.in.h:589
+msgid "Use Bosnian digraphs"
+msgstr "보스니아 �중 글� 사용"
+
+#: ../rules/base.xml.in.h:590
+msgid "Use Croatian digraphs"
+msgstr "�로아티아 �중 글� 사용"
+
+#: ../rules/base.xml.in.h:591
+msgid "Use Slovenian digraphs"
+msgstr "슬로베니아 �중 글� 사용"
+
+#: ../rules/base.xml.in.h:592
+msgid "Use guillemets for quotes"
+msgstr "따옴표� �괄호 사용"
+
+#: ../rules/base.xml.in.h:593
+msgid "Use keyboard LED to show alternative layout."
+msgstr "키보드 LED를 사용해 다른 배치 표시."
+
+#: ../rules/base.xml.in.h:594
+msgid "Using space key to input non-breakable space character"
+msgstr "스페�스 키가 강제 공백 출력."
+
+#: ../rules/base.xml.in.h:595
+msgid "Uzb"
+msgstr "우즈베키스탄"
+
+#: ../rules/base.xml.in.h:596
+msgid "Uzbekistan"
+msgstr "우즈베키스탄"
+
+#: ../rules/base.xml.in.h:597
+msgid "Vietnam"
+msgstr "베트남"
+
+#: ../rules/base.xml.in.h:598
+msgid "Vnm"
+msgstr "베트남"
+
+#: ../rules/base.xml.in.h:599
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Wang 724 키패드 유니코드 추가 (화살표 � 수학 기호)"
+
+#: ../rules/base.xml.in.h:600
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Wang 724 키패드 유니코드 추가 (화살표 � 수학 기호). 수학 기호를 기본 단계�."
+
+#: ../rules/base.xml.in.h:601
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 AZERTY"
+
+#: ../rules/base.xml.in.h:602
+msgid "Western"
+msgstr "서부"
+
+#: ../rules/base.xml.in.h:603
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:604
+msgid "Winkeys"
+msgstr "윈�우 키"
+
+#: ../rules/base.xml.in.h:605
+msgid "With &lt;\\|&gt; key"
+msgstr "&lt;\\|&gt; 키 �함"
+
+#: ../rules/base.xml.in.h:606
+msgid "With EuroSign on 5"
+msgstr "유로 기호를 5 키�"
+
+#: ../rules/base.xml.in.h:607
+msgid "With guillemets"
+msgstr "�괄호 �함"
+
+#: ../rules/base.xml.in.h:608
+msgid "Yahoo! Internet Keyboard"
+msgstr "야후! �터넷 키보드"
+
+# 나�지리아 변형
+#: ../rules/base.xml.in.h:609
+msgid "Yoruba"
+msgstr "요루바어"
+
+#: ../rules/base.xml.in.h:610
+msgid "Z and ZHE swapped"
+msgstr "Z와 ZHE 뒤바꾸기"
+
+#: ../rules/base.xml.in.h:611
+msgid "Zar"
+msgstr "남아공"
+
+#: ../rules/base.xml.in.h:612
+msgid "azerty"
+msgstr "AZERTY"
+
+#: ../rules/base.xml.in.h:613
+msgid "azerty/digits"
+msgstr "AZERTY/숫�"
+
+#: ../rules/base.xml.in.h:614
+msgid "digits"
+msgstr "숫�"
+
+#: ../rules/base.xml.in.h:615
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "세미콜론과 따옴표 없애기 (없어진 기능)"
+
+#: ../rules/base.xml.in.h:616
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:617 ../rules/sun.xml.in.h:132
+msgid "qwerty"
+msgstr "QWERTY"
+
+#: ../rules/base.xml.in.h:618
+msgid "qwerty, extended Backslash"
+msgstr "QWERTY, 백슬래시 확장"
+
+#: ../rules/base.xml.in.h:619
+msgid "qwerty/digits"
+msgstr "QWERTY/숫�"
+
+#: ../rules/base.xml.in.h:620
+msgid "qwertz"
+msgstr "QWERTZ"
+
+#: ../rules/sun.xml.in.h:1
+msgid "\"Typewriter\""
+msgstr "\"타�기\""
+
+#: ../rules/sun.xml.in.h:17
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr "Shift처럼 �작하고 �태를 고정. Shift를 누르면 대문� �태 취소."
+
+#: ../rules/sun.xml.in.h:18
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "Shift처럼 �작하고 �태를 고정. Shift는 대문� �태 취소하지 않�."
+
+#: ../rules/sun.xml.in.h:19
+msgid "Alt+Control changes group"
+msgstr "Alt+Ctrl로 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:20
+msgid "Alt+Shift changes group"
+msgstr "Alt+Shift로 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:21
+msgid "Basic"
+msgstr "기본"
+
+#: ../rules/sun.xml.in.h:23
+msgid "Belgian"
+msgstr "벨기�"
+
+#: ../rules/sun.xml.in.h:25
+msgid "Both Alt keys together change group"
+msgstr "Alt 키 � 개로 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:26
+msgid "Both Ctrl keys together change group"
+msgstr "Ctrl 키 � 개로 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:27
+msgid "Both Shift keys together change group"
+msgstr "Shift 키 � 개로 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:28
+msgid "Bulgarian"
+msgstr "불가리아어"
+
+#: ../rules/sun.xml.in.h:30
+msgid "Canadian"
+msgstr "�나다"
+
+#: ../rules/sun.xml.in.h:31
+msgid "Caps Lock is Compose"
+msgstr "Caps Lock� 조합 키입니다"
+
+#: ../rules/sun.xml.in.h:32
+msgid "Caps Lock key changes group"
+msgstr "Caps Lock 키로 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:34
+msgid "Caps_Lock LED shows alternative group"
+msgstr "Caps_Lock LED가 다른 그룹� 표시합니다"
+
+#: ../rules/sun.xml.in.h:35
+msgid "Control Key Position"
+msgstr "Ctrl 키 위치"
+
+#: ../rules/sun.xml.in.h:36
+msgid "Control key at bottom left"
+msgstr "맨 아래 왼쪽� Ctrl 키"
+
+#: ../rules/sun.xml.in.h:37
+msgid "Control key at left of 'A'"
+msgstr "'A' 왼쪽� Ctrl 키"
+
+#: ../rules/sun.xml.in.h:38
+msgid "Control+Shift changes group"
+msgstr "Ctrl+Shift로 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:40
+msgid "Czech"
+msgstr "ì²´ì½”"
+
+#: ../rules/sun.xml.in.h:41
+msgid "Danish"
+msgstr "�마�어"
+
+#: ../rules/sun.xml.in.h:45
+msgid "DeuCH"
+msgstr "��어 스위스"
+
+#: ../rules/sun.xml.in.h:47
+msgid "Dvo"
+msgstr "드보�"
+
+#: ../rules/sun.xml.in.h:52
+msgid "Finnish"
+msgstr "핀란드어"
+
+#: ../rules/sun.xml.in.h:54
+msgid "FraCH"
+msgstr "프랑스어 스위스"
+
+#: ../rules/sun.xml.in.h:57
+msgid "German"
+msgstr "��어"
+
+#: ../rules/sun.xml.in.h:58
+msgid "Group Shift/Lock behavior"
+msgstr "그룹 바꾸기/고정 �작"
+
+#: ../rules/sun.xml.in.h:60
+msgid "Hungarian"
+msgstr "�가리어"
+
+#: ../rules/sun.xml.in.h:64
+msgid "Italian"
+msgstr "�탈리아어"
+
+#: ../rules/sun.xml.in.h:65
+msgid "Japanese"
+msgstr "�본어"
+
+#: ../rules/sun.xml.in.h:67
+msgid "Left Alt key changes group"
+msgstr "왼쪽 Alt 키로 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:68
+msgid "Left Alt key switches group while pressed"
+msgstr "왼쪽 Alt 키를 누르면 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:69
+msgid "Left Ctrl key changes group"
+msgstr "왼쪽 Ctrl 키로 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:70
+msgid "Left Shift key changes group"
+msgstr "왼쪽 Shift 키로 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:71
+msgid "Make CapsLock an additional Control"
+msgstr "CapsLock� � 하나� Ctrl로 만듭니다."
+
+#: ../rules/sun.xml.in.h:76
+msgid "Norwegian"
+msgstr "노르웨�어"
+
+#: ../rules/sun.xml.in.h:77
+msgid "Num_Lock LED shows alternative group"
+msgstr "Num_Lock LED가 다른 그룹� 표시합니다"
+
+#: ../rules/sun.xml.in.h:80
+msgid "Polish"
+msgstr "�란드어"
+
+#: ../rules/sun.xml.in.h:81
+msgid "Polish with Polish quotes on key \"1/!\""
+msgstr "�란드어, \"1/!\" 키� �란드어 따옴표 �함"
+
+#: ../rules/sun.xml.in.h:82
+msgid "Portuguese"
+msgstr "�르투갈어"
+
+#: ../rules/sun.xml.in.h:83
+msgid "Press Left Alt key to choose 3rd level"
+msgstr "왼쪽 Alt 키를 누르면 3번째 단계를 선�합니다"
+
+#: ../rules/sun.xml.in.h:84
+msgid "Press Right Alt key to choose 3rd level"
+msgstr "오른쪽 Alt 키를 누르면 3번째 단계를 선�합니다"
+
+#: ../rules/sun.xml.in.h:85
+msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr "오른쪽 Alt 키를 누르면 3번째 단계를 선�합니다. Shift+오른쪽 Alt 키가 Multi_Key입니다"
+
+#: ../rules/sun.xml.in.h:86
+msgid "Press Right Control to choose 3rd level"
+msgstr "오른쪽 Ctrl 키를 누르면 3번째 단계를 선�합니다"
+
+#: ../rules/sun.xml.in.h:87
+msgid "Press any of Alt keys to choose 3rd level"
+msgstr "아무 Alt 키를 누르면 3번째 단계를 선�합니다"
+
+#: ../rules/sun.xml.in.h:89
+msgid "Right Alt key changes group"
+msgstr "오른쪽 Alt 키로 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:91
+msgid "Right Alt switches group while pressed"
+msgstr "오른쪽 Alt 키를 누르면 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:92
+msgid "Right Control key works as Right Alt"
+msgstr "오른쪽 Ctrl 키가 오른쪽 Alt로 �작합니다"
+
+#: ../rules/sun.xml.in.h:93
+msgid "Right Ctrl key changes group"
+msgstr "오른쪽 Ctrl 키로 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:94
+msgid "Right Shift key changes group"
+msgstr "오른쪽 Shift 키로 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:97
+msgid "Scroll Lock changes group"
+msgstr "Scroll Lock 키로 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:98
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "Scroll_Lock LED가 다른 그룹� 표시합니다"
+
+#: ../rules/sun.xml.in.h:99
+msgid "Shift with numpad keys works as in MS Windows"
+msgstr "Shift 키와 �시� 숫� 키를 누를 때 MS 윈�우즈와 ��하게 �작"
+
+#: ../rules/sun.xml.in.h:100
+msgid "Shift+CapsLock changes group"
+msgstr "Shift+CapsLock으로 그룹� 바꿉니다"
+
+#: ../rules/sun.xml.in.h:101
+msgid "Slovak"
+msgstr "슬로바키아어"
+
+#: ../rules/sun.xml.in.h:102
+msgid "Spanish"
+msgstr "스페�어"
+
+#: ../rules/sun.xml.in.h:105
+msgid "Sun Type 4"
+msgstr "� 타입 4"
+
+#: ../rules/sun.xml.in.h:106
+msgid "Sun Type 5"
+msgstr "� 타입 5"
+
+#: ../rules/sun.xml.in.h:107
+msgid "Sun Type 5 European"
+msgstr "� 타입 5 유럽"
+
+#: ../rules/sun.xml.in.h:108
+msgid "Sun Type 5 Unix"
+msgstr "� 타입 5 유닉스"
+
+#: ../rules/sun.xml.in.h:109
+msgid "Sun Type 6"
+msgstr "� 타입 6"
+
+#: ../rules/sun.xml.in.h:110
+msgid "Sun Type 6 Unix"
+msgstr "� 타입 6 유닉스"
+
+#: ../rules/sun.xml.in.h:111
+msgid "Sun Type 6 with Euro key"
+msgstr "� 타입 6 유로 키 �함"
+
+#: ../rules/sun.xml.in.h:114
+msgid "Swap Control and Caps Lock"
+msgstr "Ctrl과 Caps Lock 키 뒤바꾸기"
+
+#: ../rules/sun.xml.in.h:116
+msgid "Swedish"
+msgstr "스웨�어"
+
+#: ../rules/sun.xml.in.h:117
+msgid "Swiss French"
+msgstr "스위스 프랑스어"
+
+#: ../rules/sun.xml.in.h:118
+msgid "Swiss German"
+msgstr "스위스 ��어"
+
+#: ../rules/sun.xml.in.h:121
+msgid "Turkish"
+msgstr "터키어"
+
+#: ../rules/sun.xml.in.h:122
+msgid "Turkish (F)"
+msgstr "터키어 (F)"
+
+#: ../rules/sun.xml.in.h:123
+msgid "Turkish Alt-Q Layout"
+msgstr "터키어 Alt-Q 배치"
+
+#: ../rules/sun.xml.in.h:124
+msgid "U.S. English"
+msgstr "미국 �어"
+
+#: ../rules/sun.xml.in.h:125
+msgid "U.S. English w/ ISO9995-3"
+msgstr "미국 �어, ISO9995-3 사용"
+
+#: ../rules/sun.xml.in.h:128
+msgid "Use keyboard LED to show alternative group"
+msgstr "키보드 LED를 사용해 다른 그룹 표시"
+
+#: ../rules/sun.xml.in.h:129
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr "내부 대소문� 사용. Shift키가 대문� �태를 취소."
+
+#: ../rules/sun.xml.in.h:130
+msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+msgstr "내부 대소문� 사용. Shift키가 대문� �태를 취소하지 않�."
+
+#: ../rules/sun.xml.in.h:131
+msgid "bksl"
+msgstr "bksl"
+
+#: ../rules/sun.xml.in.h:133
+msgid "type4"
+msgstr "type4"
+
+#~ msgid "Acer TravelMate 800"
+#~ msgstr "��서 TravelMate 800"
+
+#~ msgid "Adding the nobreakspace keysym to space key"
+#~ msgstr "스페�스 키� 강제 공백 키심볼 추가"
+
+#~ msgid "BenQ X-Touch 800"
+#~ msgstr "벤� X-Touch 800"
+
+#~ msgid "Dell SK-8125 USB Multimedia Keybard"
+#~ msgstr "� SK-8125 USB 멀티미디어 키보드"
+
+#~ msgid "Dell SK-8135 USB Multimedia Keybard"
+#~ msgstr "� SK-8135 USB 멀티미디어 키보드"
+
+#~ msgid "Force standard legacy keypad"
+#~ msgstr "표준 구형 키패드 강제 사용"
+
+# 핀란드
+#~ msgid "Kotoistus"
+#~ msgstr "Kotoistus"
+
+#~ msgid "Logitech Cordless Desktop Optical"
+#~ msgstr "로지� Cordless Desktop Optical"
+
+#~ msgid "Logitech Cordless Desktop iTouch"
+#~ msgstr "로지� Cordless Desktop iTouch"
+
+#~ msgid "SCG"
+#~ msgstr "세르비아 몬테네그로"
diff --git a/xorg-server/xkbdata.src/po/nl.po b/xorg-server/xkbdata.src/po/nl.po
new file mode 100644
index 000000000..44a8c4c0b
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/nl.po
@@ -0,0 +1,2933 @@
+# Dutch translation of xkeyboard-config.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+# Taco Witte <tcwitte@cs.uu.nl>, 2003, 2004, 2005, 2006.
+# Tino Meinen <a.t.meinen@chello.nl>, 2007, 2008.
+# ------------------------------------------------------------------------
+# Compose        -samensteltoets
+# guillemets     -Franse aanhalingstekens
+#                 (zie http://slackware.jiten.nl/index.cgi?list=leestekens)
+# layout         -indeling/layout/toetsindeling/toetsenbordindeling
+# LED            -lampje (LED-lampje)
+# legacy         -historisch/oud/verouderd
+# level          -niveau
+# non-breakable space character - niet-afbrekende spatie/harde spatie
+# numeric keypad -cijferblok
+# while pressed  -gedurende het indrukken
+# win-key        -windows-toets/win-toets
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.4-pre1\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2008-09-15 23:52+0100\n"
+"PO-Revision-Date: 2008-09-18 02:41+0200\n"
+"Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
+"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../rules/base.xml.in.h:1 ../rules/evdev.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2 ../rules/evdev.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(Historisch) alternatief"
+
+#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Historisch) alternatief, Sun ‘dode toetsen’"
+
+#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Historisch) alternatief, zonder dode toetsen"
+
+#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
+msgid "101/104 key Compatible"
+msgstr "101/104-toetsen compatibel"
+
+#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/komma/dode toetsen"
+
+#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/komma/zonder dode toetsen"
+
+#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/punt/dode toetsen"
+
+#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/punt/zonder dode toetsen"
+
+#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/komma/dode toetsen"
+
+#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/komma/zonder dode toetsen"
+
+#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/punt/dode toetsen"
+
+#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/punt/zonder dode toetsen"
+
+#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/komma/dode toetsen"
+
+#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/komma/zonder dode toetsen"
+
+#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/punt/dode toetsen"
+
+#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/punt/zonder dode toetsen"
+
+#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/komma/dode toetsen"
+
+#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/komma/zonder dode toetsen"
+
+#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/punt/dode toetsen"
+
+#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/punt/zonder dode toetsen"
+
+#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:23 ../rules/evdev.xml.in.h:23
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech draadloos toetsenbord RFKB-23"
+
+#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
+msgid "ACPI Standard"
+msgstr "ACPI standaard"
+
+#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
+msgid "ATM/phone-style hexadecimal keypad"
+msgstr "ATM/hexadecimaal toetsenbord, telefoonstijl"
+
+#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
+msgid "Acer Laptop"
+msgstr "Acer laptop"
+
+# toevoegen/toekennen
+#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
+msgid "Add the EuroSign to the 2 key."
+msgstr "Het Euro-teken toevoegen aan de 2-toets."
+
+# toevoegen/toekennen
+#: ../rules/base.xml.in.h:32 ../rules/evdev.xml.in.h:32
+msgid "Add the EuroSign to the 4 key."
+msgstr "Het Euro-teken toevoegen aan de 4-toets."
+
+#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "Het Euro-teken toevoegen aan de 5-toets."
+
+#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "Het Euro-teken toevoegen aan de E-toets."
+
+#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "Het standaard gedrag toevoegen aan Menu-toets."
+
+# op afbeelden/aan toekennen
+#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Het Euro-teken aan bepaalde toetsen toevoegen"
+
+#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38 ../rules/evdev.xml.in.h:38
+msgid "Afg"
+msgstr "Afg"
+
+#: ../rules/base.xml.in.h:39 ../rules/evdev.xml.in.h:39
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+#: ../rules/base.xml.in.h:40 ../rules/evdev.xml.in.h:40
+msgid "Akan"
+msgstr "Akaans"
+
+#: ../rules/base.xml.in.h:41 ../rules/evdev.xml.in.h:41
+msgid "Alb"
+msgstr "Alb"
+
+#: ../rules/base.xml.in.h:42 ../rules/evdev.xml.in.h:42
+msgid "Albania"
+msgstr "Albanië"
+
+#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt en Meta zijn op de Alt-toetsen."
+
+#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt wordt afgebeeld op de rechter Win-toets en Super op Menu."
+
+#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Alt+CapsLock verandert de indeling."
+
+#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+Ctrl verandert de indeling."
+
+#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Alt+Shift verandert de indeling."
+
+#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win-toets gedrag"
+
+#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
+msgid "Alternative"
+msgstr "Alternatief"
+
+#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "Alternatief oosters"
+
+#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "Alternatief fonetisch"
+
+#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "Alternatief internationaal (voormalig us_intl)"
+
+#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "Alternatief, Sun-dode toetsen"
+
+#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "Alternatief, zonder dode toetsen"
+
+#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "Alternatief, enkel latin-9"
+
+#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "Apostrof (') variant"
+
+#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Apple laptop"
+
+#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
+msgid "Arabic"
+msgstr "Arabisch"
+
+#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
+msgid "Armenia"
+msgstr "Armenië"
+
+#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "Asturische variant met onder-punt H en onder-punt L"
+
+#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
+msgid "Asus Laptop"
+msgstr "Asus laptop"
+
+#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
+msgid "Azerbaijan"
+msgstr "Azerbeidzjan"
+
+#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 draadloos internettoetsenbord"
+
+#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF multimedia"
+
+#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
+
+#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
+msgid "Baltic+"
+msgstr "Baltisch+"
+
+#: ../rules/base.xml.in.h:80 ../rules/evdev.xml.in.h:80
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
+msgid "Bel"
+msgstr "Wit"
+
+#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
+msgid "Belarus"
+msgstr "Wit-Rusland"
+
+#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
+msgid "Belgium"
+msgstr "België"
+
+#: ../rules/base.xml.in.h:85 ../rules/evdev.xml.in.h:85
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
+msgid "Bengali"
+msgstr "Bengaals"
+
+#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
+msgid "Bengali Probhat"
+msgstr "Bengaals Probhat"
+
+#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonomisch, Dvorak wijze"
+
+#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonomisch, Dvorak wijze, enkel latin-9"
+
+#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Bijbels Hebreeuws (Tiro)"
+
+#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnië-Herzegovina"
+
+# verandert/wijzigt hier beter dan veranderen/wijzigen
+#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
+msgid "Both Alt keys together change layout."
+msgstr "Beide Alt-toetsen samen verandert de indeling."
+
+#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
+msgid "Both Ctrl keys together change layout."
+msgstr "Beide Ctrl-toetsen samen verandert de indeling."
+
+#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
+msgid "Both Shift keys together change layout."
+msgstr "Beide Shift-toetsen samen verandert de indeling."
+
+#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
+msgid "Both Win-keys switch layout while pressed."
+msgstr "Beide Win-toetsen wisselen de indeling gedurende het indrukken."
+
+#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
+msgid "Braille"
+msgstr "Braille"
+
+#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+msgid "Brazil"
+msgstr "Brazilië"
+
+#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
+msgid "Brazilian ABNT2"
+msgstr "Braziliaans ABNT2"
+
+#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
+msgid "Brother Internet Keyboard"
+msgstr "Brother internet toetsenbord"
+
+#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
+msgid "Bulgaria"
+msgstr "Bulgarije"
+
+#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
+msgid "Cambodia"
+msgstr "Cambodja"
+
+#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
+msgid "Canada"
+msgstr "Canada"
+
+#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
+msgid "Caps Lock is Compose."
+msgstr "Caps Lock is samensteltoets."
+
+#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
+msgid "CapsLock LED shows alternative layout."
+msgstr "CapsLock-lampje toont de alternatieve indeling."
+
+#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "CapsLock werkt als Shift met blokkering, Shift heft CapsLock tijdelijk op."
+
+#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "CapsLock werkt als Shift met blokkering. Shift heft CapsLock niet op."
+
+#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
+msgid "CapsLock just locks the Shift modifier."
+msgstr "CapsLock blokkeert slechts de Shift-toets."
+
+#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
+msgid "CapsLock key behavior"
+msgstr "CapsLock-toets gedrag"
+
+#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
+msgid "CapsLock key changes layout."
+msgstr "CapsLock-toets verandert de indeling."
+
+#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
+msgid "CapsLock switch to first layout, Shift+CapsLock switch to last layout."
+msgstr "CapsLock wisselt naar de eerste indeling, Shift+CapsLock wisselt naar de laatste indeling."
+
+#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "CapsLock wisselt Shift op alle toetsen."
+
+# werkt alleen op de alfabetische toetsen/
+# bepaalt hoofdletters/kleine letters bij alfabetische tekens.<
+#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "CapsLock wisselt Shift alleen op de alfabetische toetsen."
+
+#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "CapsLock gebruikt interne conversie naar hoofdletters. Shift heft CapsLock tijdelijk op."
+
+#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "CapsLock gebruikt interne conversie naar hoofdletters. Shift heft CapsLock niet op."
+
+#: ../rules/base.xml.in.h:126 ../rules/evdev.xml.in.h:126
+msgid "Catalan variant with middle-dot L"
+msgstr "Catalaanse variant met midden-punt L"
+
+#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
+msgid "Cedilla"
+msgstr "Cedilla"
+
+#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+msgid "Cherokee"
+msgstr "Cherokee"
+
+#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternatieve optie)"
+
+#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony internet toetsenbord"
+
+#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
+msgid "China"
+msgstr "China"
+
+#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+msgid "Chuvash"
+msgstr "Tsjoevasjisch"
+
+#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
+msgid "Chuvash Latin"
+msgstr "Tsjoevasjisch Latijns"
+
+#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
+msgid "Classic"
+msgstr "Klassiek"
+
+#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
+msgid "Classic Dvorak"
+msgstr "Dvorak klassiek"
+
+#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access toetsenbord"
+
+#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq internet toetsenbord (13 toetsen)"
+
+#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq internet toetsenbord (18 toetsen)"
+
+#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq internet toetsenbord (7 toetsen)"
+
+#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq toetsenbord"
+
+#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
+msgid "Compose key position"
+msgstr "Samensteltoets positie"
+
+#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
+msgid "Congo, Democratic Republic of the"
+msgstr "Congo, Democratisch republiek van"
+
+#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "Ctrl wordt afgebeeld op de Win-toetsen (en de gebruikelijke Ctrl-toetsen)."
+
+#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
+msgid "Croatia"
+msgstr "Kroatië"
+
+#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
+msgid "Ctrl key at bottom left"
+msgstr "Ctrl-toets zit linksonder"
+
+#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
+msgid "Ctrl key at left of 'A'"
+msgstr "Ctrl-toets links van ‘A’"
+
+#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
+msgid "Ctrl key position"
+msgstr "Ctrl-toetspositie"
+
+#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
+msgid "Ctrl+Shift change layout."
+msgstr "Ctrl+Shift verandert de indeling."
+
+#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
+msgid "Cyrillic"
+msgstr "Cyrillisch"
+
+# Guillemets of ook quillemets zijn Franse aanhalingstekens.
+# Dit is "Nederlands" en dit is de «Franse manier» van aanhalen.
+#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
+msgid "Cyrillic with guillemets"
+msgstr "Cyrillisch met Franse aanhalingstekens"
+
+# verwisseld/gewisseld/omgewisseld
+#: ../rules/base.xml.in.h:161 ../rules/evdev.xml.in.h:161
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Cyrillisch, Z en ZHE omgewisseld"
+
+#: ../rules/base.xml.in.h:162 ../rules/evdev.xml.in.h:162
+msgid "Cze"
+msgstr "Tsj"
+
+#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
+msgid "Czechia"
+msgstr "Tsjechië"
+
+#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
+msgid "Dan"
+msgstr "Dan"
+
+#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
+msgid "Dead acute"
+msgstr "Dood acutus"
+
+#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
+msgid "Dead grave acute"
+msgstr "Dood gravis-acutus"
+
+# dubbelop numeriek/cijfer
+#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
+msgid "Default numeric keypad keys."
+msgstr "Standaard cijferblok-toetsen."
+
+#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
+msgid "Dell 101-key PC"
+msgstr "Dell 101-toetsen PC"
+
+#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Laptop/notebook Precision M series"
+
+#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude laptopserie"
+
+#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB multimediatoetsenbord"
+
+#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
+msgid "Denmark"
+msgstr "Denemarken"
+
+#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
+msgid "Deu"
+msgstr "Deu"
+
+#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop toetsenbord"
+
+#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 serie"
+
+#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+msgid "Dvorak"
+msgstr "Dvorak"
+
+# interpunctie/leestekens
+# het gaat hier waarschijnlijk over de indeling, waar het vraagteken en de
+# puntkomma etc. staan.
+#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+msgid "Dvorak (UK Punctuation)"
+msgstr "Dvorak (UK-leestekens)"
+
+#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+msgid "Dvorak international"
+msgstr "Dvorak internationaal"
+
+#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak, Poolse aanhalingstekens op toets \"1/!\""
+
+#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, Poolse aanhalingstekens op aanhalingstekentoets"
+
+# oostelijk/oosters
+#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
+msgid "Eastern"
+msgstr "Oosters"
+
+#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
+msgid "Eliminate dead keys"
+msgstr "Geen dode toetsen"
+
+#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
+msgid "Ergonomic"
+msgstr "Ergonomisch"
+
+#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
+msgid "Estonia"
+msgstr "Estland"
+
+#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
+msgid "Eth"
+msgstr "Eth"
+
+#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+msgid "Ethiopia"
+msgstr "Ethiopië"
+
+#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
+msgid "Evdev-managed keyboard"
+msgstr "Evdev-beheerd toetsenbord"
+
+#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
+msgid "Extended"
+msgstr "Uitgebreid"
+
+#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
+msgid "Extended Backslash"
+msgstr "Brede backslash"
+
+#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
+msgid "F-letter (F) variant"
+msgstr "F-letter (F) variant"
+
+#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
+msgid "Faroe Islands"
+msgstr "Faeröer-eilanden"
+
+#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
+msgid "Finland"
+msgstr "Finland"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
+msgid "Four-level key with abstract separators"
+msgstr "Vier-niveaus toets met abstracte scheidingstekens"
+
+#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
+msgid "Four-level key with comma"
+msgstr "Vier-niveaus toets met komma"
+
+#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
+msgid "Four-level key with dot"
+msgstr "Vier-niveaus toets met punt"
+
+#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+msgid "Four-level key with momayyez"
+msgstr "Vier-niveaus toets met momayyez"
+
+#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
+msgid "France"
+msgstr "Frankrijk"
+
+#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
+msgid "French"
+msgstr "Frans"
+
+#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
+msgid "French (Macintosh)"
+msgstr "Frans (Macintosh)"
+
+#: ../rules/base.xml.in.h:219 ../rules/evdev.xml.in.h:219
+msgid "French (legacy)"
+msgstr "Frans (oud)"
+
+#: ../rules/base.xml.in.h:220 ../rules/evdev.xml.in.h:220
+msgid "French Dvorak"
+msgstr "Frans-Dvorak"
+
+#: ../rules/base.xml.in.h:221 ../rules/evdev.xml.in.h:221
+msgid "French, Sun dead keys"
+msgstr "Frans, Sun-dode toetsen"
+
+#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
+msgid "French, eliminate dead keys"
+msgstr "Frans, zonder dode toetsen"
+
+#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
+msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
+msgstr "Fujitsu-Siemens Computers AMILO A1667G laptop"
+
+#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
+msgid "Fula"
+msgstr "Fula"
+
+#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
+msgid "Generic 101-key PC"
+msgstr "Algemeen 101-toetsen PC"
+
+#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
+msgid "Generic 102-key (Intl) PC"
+msgstr "Algemeen 102-toetsen (internationaal) PC"
+
+#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
+msgid "Generic 104-key PC"
+msgstr "Algemeen 104-toetsen PC"
+
+#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
+msgid "Generic 105-key (Intl) PC"
+msgstr "Algemeen 105-toetsen (internationaal) PC"
+
+#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM toetsenbord KWD-910"
+
+#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
+msgid "Georgia"
+msgstr "Georgië"
+
+#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
+msgid "Georgian"
+msgstr "Georgisch"
+
+#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
+msgid "Georgian AZERTY Tskapo"
+msgstr "Georgisch AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
+msgid "German (Macintosh)"
+msgstr "Duits (Macintosh)"
+
+#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
+msgid "German, Sun dead keys"
+msgstr "Duits, Sun-dode toetsen"
+
+#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
+msgid "German, eliminate dead keys"
+msgstr "Duits, zonder dode toetsen"
+
+#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
+msgid "Germany"
+msgstr "Duitsland"
+
+#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
+msgid "Gre"
+msgstr "Gri"
+
+#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
+msgid "Greece"
+msgstr "Griekenland"
+
+#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
+msgid "Group toggle on multiply/divide key"
+msgstr "Groepswissel met de toets vermenigvuldigen/delen"
+
+#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
+msgid "Gui"
+msgstr "Gui"
+
+#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
+msgid "Guinea"
+msgstr "Guinea"
+
+#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
+msgid "Gurmukhi Jhelum"
+msgstr "Gurmukhi Jhelum"
+
+# het zal wel een merk zijn
+#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking toetsenbord"
+
+#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking toetsenbord voor Mac"
+
+#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
+msgid "Hausa"
+msgstr "Hausa"
+
+#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard internet toetsenbord"
+
+#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
+msgid "Hewlett-Packard Internet Keyboard 5181"
+msgstr "Hewlett-Packard internet toetsenbord 5181"
+
+#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
+msgid "Hewlett-Packard Internet Keyboard 5185"
+msgstr "Hewlett-Packard internet toetsenbord 5185"
+
+#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 multimedia toetsenbord"
+
+#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 internet toetsenbord"
+
+#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
+msgid "Hindi Bolnagri"
+msgstr "Hindi Bolnagri"
+
+# gelijkklinkend/homofonetisch/homofonisch
+#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
+msgid "Homophonic"
+msgstr "Homofonisch"
+
+#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+# Kro/Hrv
+#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
+msgid "Hun"
+msgstr "Hon"
+
+#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
+msgid "Hungary"
+msgstr "Hongarije"
+
+#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper wordt afgebeeld op de Win-toetsen."
+
+#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (alternatieve optie)"
+
+#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
+
+#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+msgid "ISO Alternate"
+msgstr "ISO alternatief"
+
+#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
+msgid "Iceland"
+msgstr "IJsland"
+
+#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+msgid "India"
+msgstr "India"
+
+#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
+msgid "International (AltGr dead keys)"
+msgstr "Internationaal (AltGr dode toetsen)"
+
+#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
+msgid "International (with dead keys)"
+msgstr "Internationaal (met dode toetsen)"
+
+#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+msgid "Iran"
+msgstr "Iran"
+
+#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
+msgid "Ireland"
+msgstr "Ierland"
+
+#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
+msgid "Irq"
+msgstr "Irq"
+
+#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
+msgid "Israel"
+msgstr "Israël"
+
+#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
+msgid "Italy"
+msgstr "Italië"
+
+#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
+msgid "Japan"
+msgstr "Japan"
+
+#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
+msgid "Japan (PC-98xx Series)"
+msgstr "Japan (PC-98xx serie)"
+
+#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
+msgid "Japanese 106-key"
+msgstr "Japans 106-toetsen"
+
+#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
+msgid "Japanese keyboard options"
+msgstr "Japanse toetsenbordopties"
+
+#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
+msgid "Kana Lock key is locking"
+msgstr "Kana Lock-toets is blokkerend"
+
+#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
+msgid "Kashubian"
+msgstr "Kasjoebiaans"
+
+#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
+msgid "Kaz"
+msgstr "Kaz"
+
+# de taal Kazachstaans
+#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
+msgid "Kazakh with Russian"
+msgstr "Kazachstaans met Russisch"
+
+#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
+msgid "Kazakhstan"
+msgstr "Kazachstan"
+
+# nummerblok/
+#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
+msgid "Keypad"
+msgstr "Nummerblok"
+
+#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
+msgid "Keypad with unicode additions (arrows and math operators)"
+msgstr "Cijferblok met unicode-aanvullingen (pijlen en wiskundige operatoren)"
+
+#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
+msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Cijferblok met unicode-aanvullingen (pijlen en wiskundige operatoren). Wiskundige operatoren op het standaard niveau."
+
+#: ../rules/base.xml.in.h:320 ../rules/evdev.xml.in.h:320
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
+msgid "Khm"
+msgstr "Khm"
+
+#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
+msgid "Kir"
+msgstr "Kir"
+
+#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
+msgid "Komi"
+msgstr "Komi"
+
+#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
+msgid "Korea, Republic of"
+msgstr "Korea, Republiek"
+
+#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
+msgid "Korean 106-key"
+msgstr "Koreaans 106-toetsen"
+
+#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
+msgid "Ktunaxa"
+msgstr "Ktunaxa"
+
+#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+msgid "Kurdish, (F)"
+msgstr "Koerdisch, (F)"
+
+#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+msgid "Kurdish, Arabic-Latin"
+msgstr "Koerdisch, Arabisch-Latijns"
+
+#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Koerdisch, Latijns Alt-Q"
+
+#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
+msgid "Kurdish, Latin Q"
+msgstr "Koerdisch, Latijns Q"
+
+#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
+msgid "Kyrgyzstan"
+msgstr "Kirgizië"
+
+#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
+msgid "LCtrl+LShift change layout."
+msgstr "Linker Ctrl+Linker Shift verandert de indeling."
+
+#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
+msgid "LEKP"
+msgstr "LEKP"
+
+#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
+msgid "LEKPa"
+msgstr "LEKPa"
+
+#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq (bijv. Armada) laptop toetsenbord"
+
+#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq (bijv. Presario) internet toetsenbord"
+
+#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Laptop/notebook eMachines m68xx"
+
+#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
+msgid "Latin"
+msgstr "Latijns"
+
+#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
+msgid "Latin American"
+msgstr "Latijns-Amerika"
+
+#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
+msgid "Latin Unicode"
+msgstr "Latijns-Unicode"
+
+#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
+msgid "Latin Unicode qwerty"
+msgstr "Latijns-Unicode qwerty"
+
+#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
+msgid "Latin qwerty"
+msgstr "Latijns qwerty"
+
+#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
+msgid "Latin unicode"
+msgstr "Latijns-unicode"
+
+#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
+msgid "Latin unicode qwerty"
+msgstr "Latijns-unicode qwerty"
+
+# Guillemets of ook quillemets zijn Franse aanhalingstekens.
+# Dit is "Nederlands" en dit is de «Franse manier» van aanhalen.
+#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
+msgid "Latin with guillemets"
+msgstr "Latijns met Franse aanhalingstekens"
+
+#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
+msgid "Latvia"
+msgstr "Letland"
+
+#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
+msgid "Lav"
+msgstr "Lav"
+
+#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
+msgid "Layout switching"
+msgstr "Wisselen van indeling"
+
+#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
+msgid "Left Alt is swapped with left Win-key."
+msgstr "De linker Alt-toets wordt omgewisseld met de linker Win-toets."
+
+#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
+msgid "Left Alt key changes layout."
+msgstr "Linker Alt-toets verandert de indeling."
+
+#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
+msgid "Left Alt key switches layout while pressed."
+msgstr "Linker Alt-toets wisselt de indeling gedurende het indrukken."
+
+#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
+msgid "Left Ctrl key changes layout."
+msgstr "Linker Ctrl-toets verandert de indeling."
+
+#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
+msgid "Left Shift key changes layout."
+msgstr "Linker Shift-toets verandert de indeling."
+
+#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
+msgid "Left Win-key changes layout."
+msgstr "Linker Win-toets verandert de indeling."
+
+#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
+msgid "Left Win-key is Compose."
+msgstr "Linker Win-toets is samensteltoets."
+
+#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
+msgid "Left Win-key switches layout while pressed."
+msgstr "Linker Win-toets wisselt de indeling gedurende het indrukken."
+
+#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
+msgid "Left hand"
+msgstr "Linkshandig"
+
+#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
+msgid "Left handed Dvorak"
+msgstr "Linkshandige Dvorak"
+
+#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+msgid "Legacy"
+msgstr "Historisch"
+
+#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
+msgid "Legacy Wang 724 keypad"
+msgstr "Historisch Wang 724 cijferblok"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+msgid "Legacy key with comma"
+msgstr "Historisch cijferblok met komma"
+
+#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+msgid "Legacy key with dot"
+msgstr "Historisch cijferblok met punt"
+
+#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
+msgid "Legacy keypad"
+msgstr "Historisch cijferblok"
+
+#: ../rules/base.xml.in.h:369 ../rules/evdev.xml.in.h:369
+msgid "Less-than/Greater-than is Compose."
+msgstr "Groter dan/Kleiner dan is samensteltoets."
+
+#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+msgid "Lithuania"
+msgstr "Litouwen"
+
+#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access toetsenbord"
+
+#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (alternatieve optie)"
+
+#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:375 ../rules/evdev.xml.in.h:375
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optisch"
+
+#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (alternatieve optie2)"
+
+#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 extra toetsen via G15daemon"
+
+#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech algemeen toetsenbord"
+
+#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech internet 350 toetsenbord"
+
+#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech internet toetsenbord"
+
+#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator toetsenbord"
+
+#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite toetsenbord"
+
+#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop toetsenbord"
+
+#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X toetsenbord"
+
+#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge toetsenbord"
+
+#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo toetsenbord"
+
+#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch draadloos toetsenbord (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator toetsenbord SE"
+
+#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator toetsenbord SE (USB)"
+
+#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
+msgid "MNE"
+msgstr "MNE"
+
+#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
+
+#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
+msgid "Macedonia"
+msgstr "Macedonisch"
+
+#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
+msgid "Macintosh Old"
+msgstr "Macintosh oud"
+
+#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, Sun-‘dode toetsen’"
+
+#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, zonder dode toetsen"
+
+#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Van CapsLock een extra Ctrl maken."
+
+#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
+msgid "Mal"
+msgstr "Mal"
+
+# een van de 23 Indische talen
+#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
+msgid "Malayalam"
+msgstr "Malayalam"
+
+# een van de 23 Indische talen
+#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
+msgid "Malayalam Lalitha"
+msgstr "Malayalam Lalitha"
+
+# kan ook als Malediven worden geschreven.
+#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
+msgid "Maldives"
+msgstr "Maldiven"
+
+#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
+msgid "Malta"
+msgstr "Malta"
+
+# VS/US/
+#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
+msgid "Maltese keyboard with US layout"
+msgstr "Maltees toetsenbord met US-indeling"
+
+#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
+msgid "Maori"
+msgstr "Maori"
+
+#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access toetsenbord"
+
+#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
+msgid "Menu is Compose."
+msgstr "Menu is samensteltoets."
+
+#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
+msgid "Menu key changes layout."
+msgstr "Menu-toets verandert de indeling."
+
+#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta wordt afgebeeld op de Win-toetsen."
+
+#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta wordt afgebeeld op de linker Win-toets."
+
+#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft internet toetsenbord"
+
+#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Zweeds"
+
+#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
+
+#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:428 ../rules/evdev.xml.in.h:428
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office toetsenbord"
+
+#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft draadloos multimediatoetsenbord 1.0A"
+
+#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+msgid "Miscellaneous compatibility options"
+msgstr "Overige compatibiliteitsopties"
+
+#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
+msgid "Mongolia"
+msgstr "Mongolië"
+
+# Servië en Montenegro
+#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
+msgid "Montenegro"
+msgstr "Montenegro"
+
+#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
+msgid "Morocco"
+msgstr "Marokko"
+
+#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
+msgid "Multilingual"
+msgstr "Meertalig"
+
+#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
+msgid "Multilingual, first part"
+msgstr "Meertalig, eerste deel"
+
+#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
+msgid "Multilingual, second part"
+msgstr "Meertalig, tweede deel"
+
+#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
+msgid "NICOLA-F style Backspace"
+msgstr "NICOLA-F stijl backspace"
+
+#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
+msgid "Neostyle"
+msgstr "Neostijl"
+
+#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
+msgid "Netherlands"
+msgstr "Nederland"
+
+#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
+msgid "Nig"
+msgstr "Nig"
+
+#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
+msgid "Northern Saami"
+msgstr "Noord-Lapland"
+
+#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Noord-Lapland, zonder dode toetsen"
+
+#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
+msgid "Norway"
+msgstr "Noorwegen"
+
+#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
+msgid "NumLock LED shows alternative layout."
+msgstr "NumLock-lampje toont alternatieve indeling."
+
+#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
+msgid "Numeric keypad delete key behaviour"
+msgstr "Cijferblok del-toetsgedrag"
+
+#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
+msgid "Numeric keypad keys work as with Mac."
+msgstr "Cijferblok-toetsen werken net als bij een Mac."
+
+#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
+msgid "Numeric keypad layout selection"
+msgstr "Cijferblok-indeling selecteren"
+
+#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
+msgid "OLPC"
+msgstr "OLPC"
+
+#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
+msgid "OLPC Dari"
+msgstr "OLPC Dari"
+
+#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
+msgid "OLPC Pashto"
+msgstr "OLPC Pashto"
+
+#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
+msgid "OLPC Southern Uzbek"
+msgstr "OLPC Zuid-Oezbekistan"
+
+#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
+msgid "Ogham"
+msgstr "Oghamees"
+
+#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
+msgid "Ogham IS434"
+msgstr "Oghamees IS434"
+
+#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet toetsenbord"
+
+#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+msgid "Ossetian"
+msgstr "Osetisch"
+
+#: ../rules/base.xml.in.h:469 ../rules/evdev.xml.in.h:469
+msgid "Ossetian, Winkeys"
+msgstr "Osetisch, Win-toetsen"
+
+#: ../rules/base.xml.in.h:470 ../rules/evdev.xml.in.h:470
+msgid "Ossetian, legacy"
+msgstr "Osetisch, historisch"
+
+#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+msgid "PC-98xx Series"
+msgstr "PC-98xx serie"
+
+#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:473 ../rules/evdev.xml.in.h:473
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:474 ../rules/evdev.xml.in.h:474
+msgid "Pashto"
+msgstr "Pashto"
+
+#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
+msgid "Phonetic"
+msgstr "Fonetisch"
+
+#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
+msgid "Poland"
+msgstr "Polen"
+
+#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
+msgid "Polytonic"
+msgstr "Meertonig"
+
+#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+msgid "Portugal"
+msgstr "Portugal"
+
+#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "De linker Alt-toets geeft het 3e niveau."
+
+#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "De linker Win-toets geeft het 3e niveau."
+
+#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
+msgid "Press Menu key to choose 3rd level."
+msgstr "De Menu-toets geeft het 3e niveau."
+
+#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "De rechter Alt-toets geeft het 3e niveau, Shift + rechter Alt-toets is Multi_Key."
+
+#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "De rechter Alt-toets geeft het 3e niveau."
+
+#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "De rechter Ctrl-toets geeft het 3e niveau."
+
+#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "De rechter Win-toets geeft het 3e niveau."
+
+# dubbelzinnig "beide"
+#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Zowel de linker als de rechter Alt-toets geeft het 3e niveau."
+
+#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Zowel de linker als de rechter Win-toets geeft het 3e niveau."
+
+#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
+msgid "Pro Keypad"
+msgstr "Pro toetsenbord"
+
+#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
+msgid "Programmer Dvorak"
+msgstr "Programmeer-Dvorak"
+
+#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
+msgid "R-Alt switches layout while pressed."
+msgstr "Rechter Alt wisselt de indeling gedurende het indrukken."
+
+#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
+msgid "Right Alt is Compose."
+msgstr "Rechter Alt is samensteltoets."
+
+#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
+msgid "Right Alt key changes layout."
+msgstr "Rechter Alt-toets verandert de indeling."
+
+#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
+msgid "Right Alt key never chooses 3rd level."
+msgstr "Rechter Alt-toets geeft het 3e niveau."
+
+#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
+msgid "Right Ctrl is Compose."
+msgstr "Rechter Control is samensteltoets."
+
+#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
+msgid "Right Ctrl key changes layout."
+msgstr "Rechter Ctrl-toets verandert de indeling."
+
+#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "Rechter Ctrl-toets wisselt indeling gedurende het indrukken."
+
+#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Rechter Ctrl-toets doet hetzelfde als de rechter Alt-toets."
+
+#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
+msgid "Right Shift key changes layout."
+msgstr "Rechter Shift-toets verandert de indeling."
+
+#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
+msgid "Right Win-key changes layout."
+msgstr "Rechter Win-toets verandert de indeling."
+
+#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
+msgid "Right Win-key is Compose."
+msgstr "Rechter Win-toets is samensteltoets."
+
+#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
+msgid "Right Win-key switches layout while pressed."
+msgstr "Rechter Win-toets wisselt de indeling gedurende het indrukken."
+
+#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+msgid "Right hand"
+msgstr "Rechtshandig"
+
+#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
+msgid "Right handed Dvorak"
+msgstr "Rechtshandige Dvorak"
+
+#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
+msgid "Romania"
+msgstr "Roemenië"
+
+#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
+msgid "Romanian keyboard with German letters"
+msgstr "Roemeens toetsenbord met Duitse lettertekens"
+
+#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Roemeens toetsenbord met Duitse lettertekens, zonder dode toetsen"
+
+#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+msgid "Russia"
+msgstr "Rusland"
+
+#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+msgid "Russian"
+msgstr "Russisch"
+
+#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+msgid "Russian phonetic"
+msgstr "Russisch fonetisch"
+
+#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+msgid "Russian phonetic Dvorak"
+msgstr "Russisch-fonetisch Dvorak"
+
+#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Russisch fonetisch, zonder dode toetsen"
+
+#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+msgid "Russian with Kazakh"
+msgstr "Russisch met Kazachstaans"
+
+# draadloos toetsenbord
+#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
+msgid "ScrollLock LED shows alternative layout."
+msgstr "ScrollLock-lampje toont alternatieve indeling."
+
+# Canadees-Indiaanse taal (Shuswap)
+#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
+msgid "Serbia"
+msgstr "Servisch"
+
+#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
+msgid "Shift cancels CapsLock."
+msgstr "Shift heft CapsLock op"
+
+#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "Shift met cijferblok-toetsen werkt zoals in MS Windows."
+
+#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
+msgid "Shift+CapsLock changes layout."
+msgstr "Shift+CapsLock verandert de indeling."
+
+#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
+msgid "Simple"
+msgstr "Simpel"
+
+#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
+msgid "Slovakia"
+msgstr "Slowakije"
+
+#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
+msgid "Slovenia"
+msgstr "Slovenië"
+
+#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
+msgid "South Africa"
+msgstr "Zuid-Afrika"
+
+#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
+msgid "Southern Uzbek"
+msgstr "Zuid-Oezbekistan"
+
+# BUG geen punt op eind
+# sixth level? hoeveel levels zijn er wel niet?
+#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Spatiebalk geeft harde spatie op het vierde niveau, smalle harde spatie op het zesde niveau."
+
+# BUG geen sluithaakje op eind
+# sixth level? hoeveel levels zijn er wel niet?
+#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift"
+msgstr "Spatiebalk geeft harde spatie op het vierde niveau, smalle harde spatie op het zesde niveau (via Ctrl+Shift)."
+
+#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr "Spatiebalk geeft harde spatie op het vierde niveau."
+
+#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
+msgid "Space key outputs non-breakable space character at second level."
+msgstr "Spatiebalk geeft harde spatie op het tweede niveau."
+
+#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr "Spatiebalk geeft harde spatie op het derde niveau, niets op het vierde niveau."
+
+# BUG geen punt op het einde
+#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Spatiebalk geeft harde spatie op het derde niveau, smalle harde spatie op het vierde niveau."
+
+#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
+msgid "Space key outputs non-breakable space character at third level."
+msgstr "Spatiebalk geeft harde spatie op het derde niveau."
+
+#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
+msgid "Space key outputs usual space at any level."
+msgstr "Spatiebalk geeft de gebruikelijke spatie op elk niveau."
+
+#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+msgid "Spain"
+msgstr "Spanje"
+
+#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Speciale toetsen (Ctrl+Alt+&lt;toets&gt;) afgehandeld in een server."
+
+#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
+msgid "Standard"
+msgstr "Standaard"
+
+#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
+msgid "Standard (Cedilla)"
+msgstr "Standaard (Cedilla)"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
+msgid "Standard RSTU"
+msgstr "Standaard RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:560 ../rules/evdev.xml.in.h:560
+msgid "Standard RSTU on Russian layout"
+msgstr "Standaard RSTU op Russische indeling"
+
+#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
+msgid "Sun Type 5/6"
+msgstr "Sun type 5/6"
+
+#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
+msgid "Sun dead keys"
+msgstr "Sun dode toetsen"
+
+#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power multimediatoetsenbord"
+
+#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
+msgid "Super is mapped to the Win-keys."
+msgstr "Super wordt afgebeeld op de Win-toetsen."
+
+# Slovaaks Dvorak?
+#: ../rules/base.xml.in.h:565 ../rules/evdev.xml.in.h:565
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:567 ../rules/evdev.xml.in.h:567
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
+msgid "Swap Ctrl and CapsLock."
+msgstr "Ctrl en CapsLock omwisselen."
+
+#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
+msgid "Swap ESC and CapsLock."
+msgstr "Esc en CapsLock omwisselen."
+
+# dit is de uitleg van bovenstaand bericht
+#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr "De keycodes van twee toetsen omwisselen wanneer Mac-toetsenborden niet juist herkend worden door de kernel."
+
+#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+msgid "Sweden"
+msgstr "Zweden"
+
+#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
+msgid "Switzerland"
+msgstr "Zwitserland"
+
+#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+msgid "Syria"
+msgstr "Syrië"
+
+#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+msgid "Syriac"
+msgstr "Syrisch"
+
+#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
+msgid "Syriac phonetic"
+msgstr "Syrisch fonetisch"
+
+#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
+msgid "Tajikistan"
+msgstr "Tadzjikistan"
+
+#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
+msgid "Tamil TAB Typewriter"
+msgstr "Tamil TAB typmachine"
+
+#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamil TSCII typmachine"
+
+#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
+msgid "Tamil Unicode"
+msgstr "Tamil unicode"
+
+#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
+msgid "Tatar"
+msgstr "Tatar"
+
+#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
+msgid "Thailand"
+msgstr "Thailand"
+
+#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
+msgid "Third level choosers"
+msgstr "3e niveau kiezers"
+
+#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
+msgid "Tibetan"
+msgstr "Tibetaans"
+
+#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetaans (met ASCII-cijfers)"
+
+#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
+msgid "Tifinagh Alternative"
+msgstr "Tifinagh alternatief"
+
+#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Tifinagh alternatief fonetisch"
+
+#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
+msgid "Tifinagh Extended"
+msgstr "Tifinagh uitgebreid"
+
+#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
+msgid "Tifinagh Extended Phonetic"
+msgstr "Tifinagh fonetisch uitgebreid"
+
+#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
+msgid "Tifinagh Phonetic"
+msgstr "Tifinagh fonetisch"
+
+#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
+msgid "Tilde (~) variant"
+msgstr "Tilde (~) variant"
+
+#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access toetsenbord"
+
+# classic is hier onderdeel van merknaam?
+#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
+msgid "Turkey"
+msgstr "Turkije"
+
+#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
+msgid "Typewriter"
+msgstr "Typmachine"
+
+#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
+msgid "UCW layout (accented letters only)"
+msgstr "UCW-indeling (allen lettertekens met accenten)"
+
+# lettersamenstelling?
+#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Amerikaans toetsenbord met Bosnische digrafen"
+
+#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
+msgid "US keyboard with Bosnian letters"
+msgstr "Amerikaans toetsenbord met Bosnische lettertekens"
+
+#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
+msgid "US keyboard with Croatian digraphs"
+msgstr "Amerikaans toetsenbord met Kroatische digrafen"
+
+#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
+msgid "US keyboard with Croatian letters"
+msgstr "Amerikaans toetsenbord met Kroatische lettertekens"
+
+#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
+msgid "US keyboard with Estonian letters"
+msgstr "Amerikaans toetsenbord met Estlandse lettertekens"
+
+#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
+msgid "US keyboard with Lithuanian letters"
+msgstr "Amerikaans toetsenbord met Litouwse lettertekens"
+
+#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Amerikaans toetsenbord met Sloveense digrafen"
+
+#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
+msgid "US keyboard with Slovenian letters"
+msgstr "Amerikaans toetsenbord met Sloveense lettertekens"
+
+#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+msgid "USA"
+msgstr "VS"
+
+#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
+msgid "Udmurt"
+msgstr "Udmurts"
+
+#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
+msgid "Ukraine"
+msgstr "Oekraïne"
+
+#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
+msgid "United Kingdom"
+msgstr "Verenigd Koninkrijk"
+
+#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
+msgid "Use Bosnian digraphs"
+msgstr "Bosnische digrafen gebruiken"
+
+#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
+msgid "Use Croatian digraphs"
+msgstr "Kroatische digrafen gebruiken"
+
+#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
+msgid "Use Slovenian digraphs"
+msgstr "Sloveense digrafen gebruiken"
+
+# Guillemets of ook quillemets zijn Franse aanhalingstekens.
+# Dit is de "Nederlandse" en dit is de «Franse manier» van aanhalen.
+#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
+msgid "Use guillemets for quotes"
+msgstr "Franse aanhalingstekens gebruiken voor citaten"
+
+#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Toetsenbord-lampje gebruiken om alternatieve indeling te tonen."
+
+#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
+msgid "Using space key to input non-breakable space character"
+msgstr "Spatiebalk gebruiken voor het invoeren van niet-afbrekende (harde) spaties"
+
+#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+msgid "Uzbekistan"
+msgstr "Oezbekistan"
+
+#: ../rules/base.xml.in.h:630 ../rules/evdev.xml.in.h:630
+msgid "Vietnam"
+msgstr "Viëtnam"
+
+#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 internet toetsenbord"
+
+#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Wang 724 cijferblok met unicode-aanvullingen (pijlen en wiskundige operatoren)"
+
+#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Wang 724 cijferblok met unicode aanvullingen (pijlen en wiskundige operatoren). Wiskundige operatoren op het standaard niveau."
+
+#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+msgid "Western"
+msgstr "Westers"
+
+#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
+msgid "Winkeys"
+msgstr "Win-toetsen"
+
+#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
+msgid "With &lt;\\|&gt; key"
+msgstr "Met &lt;\\|&gt;-toets"
+
+#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
+msgid "With EuroSign on 5"
+msgstr "Met het Euro-teken bij de 5"
+
+# Guillemets of ook quillemets zijn Franse aanhalingstekens.
+# Dit is "Nederlands" en dit is de «Franse manier» van aanhalen.
+#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+msgid "With guillemets"
+msgstr "Met Franse aanhalingstekens"
+
+#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! internettoetsenbord"
+
+#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+msgid "Yakut"
+msgstr "Yakut"
+
+#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
+msgid "Yoruba"
+msgstr "Yoruba"
+
+#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
+msgid "Z and ZHE swapped"
+msgstr "Z en ZHE omgewisseld"
+
+#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
+msgid "azerty/digits"
+msgstr "azerty/cijfers"
+
+#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
+msgid "digits"
+msgstr "cijfers"
+
+#: ../rules/base.xml.in.h:650 ../rules/evdev.xml.in.h:650
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "puntkomma en aanhalingsteken op afwijkende plek (historisch)"
+
+#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
+msgid "qwerty"
+msgstr "qwerty"
+
+# brede backslash/uitgebreide backslash
+#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, brede backslash"
+
+#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
+msgid "qwerty/digits"
+msgstr "qwerty/cijfers"
+
+#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
+msgid "qwertz"
+msgstr "qwertz"
+
+#~ msgid "(Legacy) Dvorak"
+#~ msgstr "(Historisch) Dvorak"
+
+# Caps ipv CapsLock?
+#~ msgid "Acts as Shift with locking. Shift cancels Caps."
+#~ msgstr "Werkt als Shift met blokkering. Shift heft CapsLock op."
+
+# Caps ipv CapsLock?
+#~ msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+#~ msgstr "Werkt als Shift met blokkering. Shift heft CapsLock niet op."
+
+#~ msgid "Alt+Control changes group"
+#~ msgstr "Alt+Ctrl verandert de groep"
+
+#~ msgid "Alt+Shift changes group"
+#~ msgstr "Alt+Shift verandert de groep"
+
+#~ msgid "Belgian"
+#~ msgstr "Belgisch"
+
+# verandert/wijzigt hier beter dan veranderen/wijzigen
+#~ msgid "Both Alt keys together change group"
+#~ msgstr "Beide Alt-toetsen samen verandert de groep."
+
+#~ msgid "Both Ctrl keys together change group"
+#~ msgstr "Beide Ctrl-toetsen samen verandert de groep."
+
+#~ msgid "Both Shift keys together change group"
+#~ msgstr "Beide Shift-toetsen samen verandert de groep."
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgaars"
+
+#~ msgid "Canadian"
+#~ msgstr "Canadees"
+
+# BUG Caps Lock los van elkaar
+#~ msgid "Caps Lock is Compose"
+#~ msgstr "Caps Lock is samensteltoets"
+
+#~ msgid "Caps Lock key changes group"
+#~ msgstr "Caps Lock-toets verandert de groep"
+
+#~ msgid "Caps_Lock LED shows alternative group"
+#~ msgstr "CapsLock-lampje toont de alternatieve groep"
+
+#~ msgid "Control Key Position"
+#~ msgstr "Ctrl-toetspositie"
+
+#~ msgid "Control key at bottom left"
+#~ msgstr "Ctrl-toets zit linksonder"
+
+#~ msgid "Control key at left of 'A'"
+#~ msgstr "Ctrl-toets zit links van ‘A’"
+
+#~ msgid "Control+Shift changes group"
+#~ msgstr "Ctrl+Shift verandert de groep"
+
+#~ msgid "Czech"
+#~ msgstr "Tsjechisch"
+
+#~ msgid "Danish"
+#~ msgstr "Deens"
+
+# (Zwitsers Duits)
+#~ msgid "DeuCH"
+#~ msgstr "DeuCH"
+
+#~ msgid "Dvo"
+#~ msgstr "Dvo"
+
+#~ msgid "Finnish"
+#~ msgstr "Fins"
+
+# (Zwitsers Frans)
+#~ msgid "FraCH"
+#~ msgstr "FraCH"
+
+#~ msgid "German"
+#~ msgstr "Duits"
+
+#~ msgid "Group Shift/Lock behavior"
+#~ msgstr "Groepgedrag Shift/Lock"
+
+#~ msgid "Hungarian"
+#~ msgstr "Hongaars"
+
+#~ msgid "Italian"
+#~ msgstr "Italiaans"
+
+#~ msgid "Japanese"
+#~ msgstr "Japans"
+
+#~ msgid "Left Alt key changes group"
+#~ msgstr "Linker Alt-toets verandert de groep"
+
+#~ msgid "Left Alt key switches group while pressed"
+#~ msgstr "Linker Alt-toets wisselt de groep gedurende het indrukken"
+
+#~ msgid "Left Ctrl key changes group"
+#~ msgstr "Linker Ctrl-toets verandert de groep"
+
+#~ msgid "Left Shift key changes group"
+#~ msgstr "Linker Shift-toets verandert de groep"
+
+#~ msgid "Make CapsLock an additional Control"
+#~ msgstr "Van CapsLock een extra Ctrl maken"
+
+#~ msgid "Norwegian"
+#~ msgstr "Noors"
+
+#~ msgid "Num_Lock LED shows alternative group"
+#~ msgstr "NumLock-lampje toont alternatieve groep"
+
+#~ msgid "Polish"
+#~ msgstr "Pools"
+
+#~ msgid "Polish with Polish quotes on key \"1/!\""
+#~ msgstr "Pools met Poolse aanhalingstekens op toets ‘1/!’"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugees"
+
+#~ msgid "Press Left Alt key to choose 3rd level"
+#~ msgstr "De linker Alt-toets geeft het 3e niveau"
+
+#~ msgid "Press Right Alt key to choose 3rd level"
+#~ msgstr "De rechter Alt-toets geeft het 3e niveau"
+
+#~ msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+#~ msgstr "De rechter Alt-toets geeft het 3e niveau, Shift+rechter Alt-toets is Multi_Key"
+
+#~ msgid "Press Right Control to choose 3rd level"
+#~ msgstr "De rechter Ctrl-toets geeft het 3e niveau"
+
+# dubbelzinnig "beide"
+#~ msgid "Press any of Alt keys to choose 3rd level"
+#~ msgstr "Zowel de linker als de rechter Alt-toets geeft het 3e niveau"
+
+#~ msgid "Right Alt key changes group"
+#~ msgstr "Rechter Alt-toets verandert de groep"
+
+# BUG Alt ipv Alt key
+#~ msgid "Right Alt switches group while pressed"
+#~ msgstr "Rechter Alt wisselt de groep gedurende het indrukken"
+
+#~ msgid "Right Control key works as Right Alt"
+#~ msgstr "Rechter Ctrl-toets doet hetzelfde als de rechter Alt-toets"
+
+#~ msgid "Right Ctrl key changes group"
+#~ msgstr "Rechter Control-toets verandert de groep"
+
+#~ msgid "Right Shift key changes group"
+#~ msgstr "Rechter Shift-toets verandert de groep"
+
+#~ msgid "Scroll Lock changes group"
+#~ msgstr "ScrollLock verandert de groep"
+
+#~ msgid "Scroll_Lock LED shows alternative group"
+#~ msgstr "ScrollLock-lampje toont alternatieve groep"
+
+#~ msgid "Shift with numpad keys works as in MS Windows"
+#~ msgstr "Shift met cijferblok-toetsen werkt zoals in MS Windows"
+
+#~ msgid "Shift+CapsLock changes group"
+#~ msgstr "Shift+CapsLock verandert de groep"
+
+#~ msgid "Slovak"
+#~ msgstr "Slowaaks"
+
+#~ msgid "Spanish"
+#~ msgstr "Spaans"
+
+#~ msgid "Sun Type 4"
+#~ msgstr "Sun type 4"
+
+#~ msgid "Sun Type 5 European"
+#~ msgstr "Sun type 5 Europees"
+
+#~ msgid "Sun Type 5 Unix"
+#~ msgstr "Sun type 5 Unix"
+
+#~ msgid "Sun Type 6"
+#~ msgstr "Sun type 6"
+
+#~ msgid "Sun Type 6 Unix"
+#~ msgstr "Sun type 6 Unix"
+
+#~ msgid "Sun Type 6 with Euro key"
+#~ msgstr "Sun type 6 met Euro-teken"
+
+#~ msgid "Swedish"
+#~ msgstr "Zweeds"
+
+#~ msgid "Swiss French"
+#~ msgstr "Zwitsers Frans"
+
+#~ msgid "Swiss German"
+#~ msgstr "Zwitsers Duits"
+
+#~ msgid "Turkish"
+#~ msgstr "Turks"
+
+#~ msgid "Turkish (F)"
+#~ msgstr "Turks (F)"
+
+#~ msgid "Turkish Alt-Q Layout"
+#~ msgstr "Turks Alt-Q indeling"
+
+#~ msgid "U.S. English w/ ISO9995-3"
+#~ msgstr "Amerikaans-Engels w/ ISO9995-3"
+
+#~ msgid "Use keyboard LED to show alternative group"
+#~ msgstr "Toetsenbord-lampje gebruiken om alternatieve groep te tonen"
+
+# Caps ipv CapsLock?
+#~ msgid "Uses internal capitalization. Shift cancels Caps."
+#~ msgstr "Gebruikt interne conversie naar hoofdletters. Shift heft CapsLock op."
+
+# Caps ipv CapsLock?
+#~ msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+#~ msgstr "Gebruikt interne conversie naar hoofdletters. Shift heft CapsLock niet op."
+
+#~ msgid "Dell SK-8125 USB Multimedia Keybard"
+#~ msgstr "Dell SK-8125 multimediatoetsenbord"
+
+#~ msgid "Dell SK-8135 USB Multimedia Keybard"
+#~ msgstr "Dell SK-8135 multimediatoetsenbord"
+
+#~ msgid "Force standard legacy keypad"
+#~ msgstr "Standaard historisch cijferblok afdwingen"
+
+#~ msgid "\"Standard\""
+#~ msgstr "‘Standaard’"
+
+#~ msgid "Dhivehi"
+#~ msgstr "Dhivehi"
+
+#~ msgid "Logitech Deluxe Access Keyboard"
+#~ msgstr "Logitech Deluxe Access toetsenbord"
+
+#~ msgid "Logitech iTouch keyboard Internet Navigator"
+#~ msgstr "Logitech iTouch toetsenbord Internet Navigator"
+
+#~ msgid "PowerPC PS/2"
+#~ msgstr "PowerPC PS/2"
+
+# http://en.wikipedia.org/wiki/Non-breaking_space
+# niet afbreekbaar spatieteken/nietafbrekenspatie/
+# 'niet afbreken' spatie/niet-afbrekende spatie/
+# beschermd/ondeelbaar spatieteken/harde spatie/
+# vaste spatie
+#~ msgid "Adding the nobreakspace keysym to space key"
+#~ msgstr "Een niet-afbrekende spatie toekennen aan spatiebalk"
diff --git a/xorg-server/xkbdata.src/po/ru.po b/xorg-server/xkbdata.src/po/ru.po
new file mode 100644
index 000000000..98fd37bcc
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/ru.po
@@ -0,0 +1,2447 @@
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Sergey V. Udaltsov<svu@users.sourceforge.net>
+# Sergey E Kvyato <kvantos@plotinka.ru>, 2006.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: xfree86_xkb_xml 0.1\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2006-11-28 00:34+0300\n"
+"PO-Revision-Date: 2006-11-28 16:17+0000\n"
+"Last-Translator: Nickolay V. Shmyrev <nshmyrev@yandex.ru>\n"
+"Language-Team: <gnome-cyr@gnome.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(У�тарело) �льтернативна�"
+
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(У�тарело) �льтернативна�, �пециальные клавиши (dead keys) Sun"
+
+#: ../rules/base.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(У�тарело) �льтернативна�, и�ключить �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:5
+msgid "(Legacy) Dvorak"
+msgstr "(У�тарело) Dvorak"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/104 key Compatible"
+msgstr "Cовме�тима� c 101/104 кнопочной"
+
+#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
+msgid "101/qwerty/comma/Dead keys"
+msgstr "pc101, qwerty, зап�та�, �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "pc101, qwerty, зап�та�, и�ключить �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
+msgid "101/qwerty/dot/Dead keys"
+msgstr "pc101, qwerty, точка, и�ключить �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "pc101, qwerty, точка, и�ключить �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
+msgid "101/qwertz/comma/Dead keys"
+msgstr "pc101, qwertz, зап�та�, �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "pc101, qwertz, зап�та�, и�ключить �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
+msgid "101/qwertz/dot/Dead keys"
+msgstr "pc101, qwertz, точка, �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "pc101, qwertz, точка, и�ключить �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
+msgid "102/qwerty/comma/Dead keys"
+msgstr "pc102, qwerty, зап�та�, �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "pc102, qwerty, зап�та�, и�ключить �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
+msgid "102/qwerty/dot/Dead keys"
+msgstr "pc102, qwerty, точка, �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "pc102, qwerty, точка, и�ключить �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
+msgid "102/qwertz/comma/Dead keys"
+msgstr "pc102, qwertz, зап�та�, �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "pc102, qwertz, зап�та�, и�ключить �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
+msgid "102/qwertz/dot/Dead keys"
+msgstr "pc102, qwertz, точка, �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "pc102, qwertz, точка, и�ключить �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:23
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:24
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:25
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:26
+msgid "ACPI Standard"
+msgstr "Стандартна� ACPI"
+
+#: ../rules/base.xml.in.h:27
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:28
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:29
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:30
+msgid "Acer TravelMate 800"
+msgstr "Acer TravelMate 800"
+
+#: ../rules/base.xml.in.h:31
+msgid "Add the EuroSign to the 2 key."
+msgstr "Добавить знак Евро к клавише 2."
+
+#: ../rules/base.xml.in.h:32
+msgid "Add the EuroSign to the 5 key."
+msgstr "Добавить знак Евро к клавише 5."
+
+#: ../rules/base.xml.in.h:33
+msgid "Add the EuroSign to the E key."
+msgstr "Добавить знак Евро к клавише E."
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the standard behavior to Menu key."
+msgstr "�азначить обыкновенное поведение на клавишу Menu"
+
+#: ../rules/base.xml.in.h:35
+msgid "Adding the EuroSign to certain keys"
+msgstr "Добавить знак Евро к некоторым клавишам"
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding the nobreakspace keysym to space key"
+msgstr "Добавить код запрета разрыва к коду пробела"
+
+#: ../rules/base.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38
+msgid "Afg"
+msgstr "�фг"
+
+#: ../rules/base.xml.in.h:39
+msgid "Afghanistan"
+msgstr "�фгани�тан"
+
+#: ../rules/base.xml.in.h:40
+msgid "Akan"
+msgstr "�кан"
+
+#: ../rules/base.xml.in.h:41
+msgid "Alb"
+msgstr "�лб"
+
+#: ../rules/base.xml.in.h:42
+msgid "Albania"
+msgstr "�лбани�"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Alt и Meta на клавишах Alt (по умолчанию)."
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt �оответ�твует правой клавише Win, а Super - Menu."
+
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock changes group."
+msgstr "Клавиши Alt и Caps Lock, нажатые вме�те, мен�ют группу."
+
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl changes group."
+msgstr "Alt+Ctrl мен�ют группу."
+
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift changes group."
+msgstr "Alt+Shift мен�ют группу."
+
+#: ../rules/base.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Клавиши Alt/Win"
+
+#: ../rules/base.xml.in.h:50
+msgid "Alternative"
+msgstr "�льтернативна�"
+
+#: ../rules/base.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "�льтернативна� Во�точна�"
+
+#: ../rules/base.xml.in.h:52
+msgid "Alternative international (former us_intl)"
+msgstr "�льтернативна� международна� (бывша� us_intl)"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative, Sun dead keys"
+msgstr "�льтернативна�, �пециальные клавиши (dead keys) Sun"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative, eliminate dead keys"
+msgstr "�льтернативна�, и�ключить �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, latin-9 only"
+msgstr "�льтернативна�, только latin-9"
+
+#: ../rules/base.xml.in.h:56
+msgid "And"
+msgstr "�нд"
+
+#: ../rules/base.xml.in.h:57
+msgid "Andorra"
+msgstr "�ндорра"
+
+#: ../rules/base.xml.in.h:58
+msgid "Apostrophe (') variant"
+msgstr "Вариант � апо�трофом (')"
+
+#: ../rules/base.xml.in.h:59
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:60
+msgid "Apple Laptop"
+msgstr "�оутбук Apple"
+
+#: ../rules/base.xml.in.h:61
+msgid "Ara"
+msgstr "�ра"
+
+#: ../rules/base.xml.in.h:62
+msgid "Arabic"
+msgstr "�раб�ка�"
+
+#: ../rules/base.xml.in.h:63
+msgid "Arm"
+msgstr "�рм"
+
+#: ../rules/base.xml.in.h:64
+msgid "Armenia"
+msgstr "�рмени�"
+
+#: ../rules/base.xml.in.h:65
+msgid "Aze"
+msgstr "�зер"
+
+#: ../rules/base.xml.in.h:66
+msgid "Azerbaijan"
+msgstr "�зербайджан"
+
+#: ../rules/base.xml.in.h:67
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 бе�проводна� \"интернет\" клавиатура"
+
+#: ../rules/base.xml.in.h:68
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:69
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:70
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:71
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:72
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:73
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:74
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:75
+msgid "Ban"
+msgstr "Бан"
+
+#: ../rules/base.xml.in.h:76
+msgid "Bangladesh"
+msgstr "Бангладеш"
+
+#: ../rules/base.xml.in.h:77 ../rules/sun.xml.in.h:22
+msgid "Bel"
+msgstr "Бельг"
+
+#: ../rules/base.xml.in.h:78
+msgid "Belarus"
+msgstr "Белору��и�"
+
+#: ../rules/base.xml.in.h:79
+msgid "Belgium"
+msgstr "Бельги�"
+
+#: ../rules/base.xml.in.h:80
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:81
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:82
+msgid "Bengali"
+msgstr "Бенгаль�ка�"
+
+#: ../rules/base.xml.in.h:83
+msgid "Bengali Probhat"
+msgstr "Бенгаль�ка� Пробат"
+
+#: ../rules/base.xml.in.h:84
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Бепо, �ргономична�, похожа� на Dvorak"
+
+#: ../rules/base.xml.in.h:85
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Бепо, �ргономична�, похожа� на Dvorak, только latin-9"
+
+#: ../rules/base.xml.in.h:86 ../rules/sun.xml.in.h:24
+msgid "Bgr"
+msgstr "Болг"
+
+#: ../rules/base.xml.in.h:87
+msgid "Bhu"
+msgstr "Бут"
+
+#: ../rules/base.xml.in.h:88
+msgid "Bhutan"
+msgstr "Бутан"
+
+#: ../rules/base.xml.in.h:89
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Библей�кий иврит (Tiro)"
+
+#: ../rules/base.xml.in.h:90
+msgid "Bih"
+msgstr "Бо�н"
+
+#: ../rules/base.xml.in.h:91
+msgid "Blr"
+msgstr "Бел"
+
+#: ../rules/base.xml.in.h:92
+msgid "Bosnia and Herzegovina"
+msgstr "Бо�ни� и Герцеговина"
+
+#: ../rules/base.xml.in.h:93
+msgid "Both Alt keys together change group."
+msgstr "Обе клавиши Alt, нажатые вме�те, мен�ют группу."
+
+#: ../rules/base.xml.in.h:94
+msgid "Both Ctrl keys together change group."
+msgstr "Обе клавиши Ctrl, нажатые вме�те, мен�ют группу."
+
+#: ../rules/base.xml.in.h:95
+msgid "Both Shift keys together change group."
+msgstr "Обе клавиши Shift, нажатые вме�те, мен�ют группу."
+
+#: ../rules/base.xml.in.h:96
+msgid "Both Win-keys switch group while pressed."
+msgstr "Кажда� из Win клавиш переключает группу на врем� нажати�."
+
+#: ../rules/base.xml.in.h:97
+msgid "Bra"
+msgstr "Браз"
+
+#: ../rules/base.xml.in.h:98
+msgid "Brazil"
+msgstr "Бразили�"
+
+#: ../rules/base.xml.in.h:99
+msgid "Brazilian ABNT2"
+msgstr "ABNT2"
+
+#: ../rules/base.xml.in.h:100
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:101
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:102
+msgid "Bulgaria"
+msgstr "Болгари�"
+
+#: ../rules/base.xml.in.h:103
+msgid "Cambodia"
+msgstr "Камбоджа"
+
+#: ../rules/base.xml.in.h:104 ../rules/sun.xml.in.h:29
+msgid "Can"
+msgstr "Кан"
+
+#: ../rules/base.xml.in.h:105
+msgid "Canada"
+msgstr "Канада"
+
+#: ../rules/base.xml.in.h:106
+msgid "Caps Lock is Compose."
+msgstr "Клавиша Caps Lock �оответ�твует клавише Compose."
+
+#: ../rules/base.xml.in.h:107
+msgid "CapsLock LED shows alternative group."
+msgstr "Индикатор CapsLock отображает другую группу."
+
+#: ../rules/base.xml.in.h:108
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr ""
+"Дей�твует как Shift � блокировкой. Shift прио�танавливает дей�твие CapsLock."
+
+#: ../rules/base.xml.in.h:109
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "Дей�твует как Shift � блокировкой. Shift не вли�ет на CapsLock."
+
+#: ../rules/base.xml.in.h:110
+msgid "CapsLock just locks the Shift modifier."
+msgstr "Про�то блокирует модификатор Shift."
+
+#: ../rules/base.xml.in.h:111 ../rules/sun.xml.in.h:33
+msgid "CapsLock key behavior"
+msgstr "Клавиша Caps Lock"
+
+#: ../rules/base.xml.in.h:112
+msgid "CapsLock key changes group."
+msgstr "Клавиша CapsLock мен�ет группу."
+
+#: ../rules/base.xml.in.h:113
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr ""
+"CapsLock включает Shift, таким образом что, он дей�твует �разу на в�е "
+"клавиши."
+
+#: ../rules/base.xml.in.h:114
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "Включает обычную капитализацию �имволов алфавита."
+
+#: ../rules/base.xml.in.h:115
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr ""
+"Включает внутреннюю капитализацию. Shift прио�танавливает дей�твие CapsLock."
+
+#: ../rules/base.xml.in.h:116
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "Включает внутреннюю капитализацию. Shift не вли�ет на CapsLock."
+
+#: ../rules/base.xml.in.h:117
+msgid "Catalan variant with middle-dot L"
+msgstr "Каталон�кий вариант �о �редней L"
+
+#: ../rules/base.xml.in.h:118
+msgid "Che"
+msgstr "Швейц."
+
+#: ../rules/base.xml.in.h:119
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:120
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (альтернативный вариант)"
+
+#: ../rules/base.xml.in.h:121
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:122
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:123
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:124
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:125
+msgid "Classic Dvorak"
+msgstr "Кла��иче�ка� Dvorak"
+
+#: ../rules/base.xml.in.h:126
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:127
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:128
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 клавиш)"
+
+#: ../rules/base.xml.in.h:129
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 клавиш)"
+
+#: ../rules/base.xml.in.h:130
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 клавиш)"
+
+#: ../rules/base.xml.in.h:131
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:132
+msgid "Compose key position"
+msgstr "Положение клавиши Compose"
+
+#: ../rules/base.xml.in.h:133
+msgid "Congo, Democratic Republic of the"
+msgstr "Конго, Демократиче�ка� ре�публика"
+
+#: ../rules/base.xml.in.h:134
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "Control и�пользует�� в каче�тве клавиш Win (и как обычный Control)."
+
+#: ../rules/base.xml.in.h:135
+msgid "Croatia"
+msgstr "Хорвати�"
+
+#: ../rules/base.xml.in.h:136
+msgid "Ctrl key at bottom left"
+msgstr "Клавиша Ctrl �низу �лева"
+
+#: ../rules/base.xml.in.h:137
+msgid "Ctrl key at left of 'A'"
+msgstr "Клавиша Ctrl �лева от 'Ф'"
+
+#: ../rules/base.xml.in.h:138
+msgid "Ctrl key position"
+msgstr "Положение клавиши Ctrl"
+
+#: ../rules/base.xml.in.h:139
+msgid "Ctrl+Shift changes group."
+msgstr "Ctrl+Shift мен�ют группу."
+
+#: ../rules/base.xml.in.h:140
+msgid "Cyrillic"
+msgstr "Кириллица"
+
+#: ../rules/base.xml.in.h:141 ../rules/sun.xml.in.h:39
+msgid "Cze"
+msgstr "Чех"
+
+#: ../rules/base.xml.in.h:142
+msgid "Czechia"
+msgstr "Чехи�"
+
+#: ../rules/base.xml.in.h:143
+msgid "DRC"
+msgstr "ДРК"
+
+#: ../rules/base.xml.in.h:144
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:145 ../rules/sun.xml.in.h:42
+msgid "Dead acute"
+msgstr "Спец. �имвол Dead acute"
+
+#: ../rules/base.xml.in.h:146 ../rules/sun.xml.in.h:43
+msgid "Dead grave acute"
+msgstr "Спец. �имвол Dead grave acute"
+
+#: ../rules/base.xml.in.h:147
+msgid "Default numpad keys."
+msgstr "Клавиши цифровой клавиатуры по умолчанию"
+
+#: ../rules/base.xml.in.h:148
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:149
+msgid "Dell 101-key PC"
+msgstr "Dell 101-клавишный PC"
+
+#: ../rules/base.xml.in.h:150
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "�оутбуки Dell Inspiron �ерий 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:151
+msgid "Dell Latitude series laptop"
+msgstr "�оутбук Dell �ерии Latitude"
+
+#: ../rules/base.xml.in.h:152
+msgid "Dell USB Multimedia Keybard"
+msgstr "Dell USB Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:153
+msgid "Denmark"
+msgstr "Дани�"
+
+#: ../rules/base.xml.in.h:154 ../rules/sun.xml.in.h:44
+msgid "Deu"
+msgstr "�ем"
+
+#: ../rules/base.xml.in.h:155
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:156
+msgid "Diamond 9801 / 9802 series"
+msgstr "Модели Diamond 9801/9802"
+
+#: ../rules/base.xml.in.h:157 ../rules/sun.xml.in.h:46
+msgid "Dnk"
+msgstr "Дат"
+
+#: ../rules/base.xml.in.h:158 ../rules/sun.xml.in.h:48
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:159
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak, поль�кие кавычки на клавише \"1/!\""
+
+#: ../rules/base.xml.in.h:160
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, поль�кие кавычки на клавишах � кавычками"
+
+#: ../rules/base.xml.in.h:161
+msgid "Eastern"
+msgstr "Во�точный"
+
+#: ../rules/base.xml.in.h:162 ../rules/sun.xml.in.h:49
+msgid "Eliminate dead keys"
+msgstr "И�ключить �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:163
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:164
+msgid "Epo"
+msgstr "Э�п"
+
+#: ../rules/base.xml.in.h:165 ../rules/sun.xml.in.h:50
+msgid "Esp"
+msgstr "И�п"
+
+#: ../rules/base.xml.in.h:166
+msgid "Esperanto"
+msgstr "Э�перанто"
+
+#: ../rules/base.xml.in.h:167
+msgid "Est"
+msgstr "Э�т"
+
+#: ../rules/base.xml.in.h:168
+msgid "Estonia"
+msgstr "Э�тони�"
+
+#: ../rules/base.xml.in.h:169
+msgid "Evdev-managed keyboard"
+msgstr "Клавиатура управл�ема� по�ред�твом Evdev"
+
+#: ../rules/base.xml.in.h:170
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:171
+msgid "Ewe"
+msgstr "Эве"
+
+#: ../rules/base.xml.in.h:172
+msgid "Extended"
+msgstr "Ра�ширенна�"
+
+#: ../rules/base.xml.in.h:173
+msgid "Extended Backslash"
+msgstr "Ра�ширенные функции Backslash"
+
+#: ../rules/base.xml.in.h:174
+msgid "F-letter (F) variant"
+msgstr "Вариант � F"
+
+#: ../rules/base.xml.in.h:175
+msgid "Fao"
+msgstr "Фар"
+
+#: ../rules/base.xml.in.h:176
+msgid "Faroe Islands"
+msgstr "О�трова Фаро"
+
+#: ../rules/base.xml.in.h:177 ../rules/sun.xml.in.h:51
+msgid "Fin"
+msgstr "Фин"
+
+#: ../rules/base.xml.in.h:178
+msgid "Finland"
+msgstr "Финл�нди�"
+
+#: ../rules/base.xml.in.h:179 ../rules/sun.xml.in.h:53
+msgid "Fra"
+msgstr "Фр"
+
+#: ../rules/base.xml.in.h:180
+msgid "France"
+msgstr "Франци�"
+
+#: ../rules/base.xml.in.h:181 ../rules/sun.xml.in.h:55
+msgid "French"
+msgstr "Француз�ка�"
+
+#: ../rules/base.xml.in.h:182
+msgid "French (Macintosh)"
+msgstr "Француз�ка� (Macintosh)"
+
+#: ../rules/base.xml.in.h:183 ../rules/sun.xml.in.h:56
+msgid "French (legacy)"
+msgstr "Француз�ка� (уна�ледованна�)"
+
+#: ../rules/base.xml.in.h:184
+msgid "French Dvorak"
+msgstr "Француз�ка� Dvorak"
+
+#: ../rules/base.xml.in.h:185
+msgid "French, Sun dead keys"
+msgstr "Француз�ка�, �пециальные клавиши (dead keys) Sun"
+
+#: ../rules/base.xml.in.h:186
+msgid "French, eliminate dead keys"
+msgstr "Француз�ка�, и�ключить �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:187
+msgid "Fula"
+msgstr "Фула"
+
+#: ../rules/base.xml.in.h:188
+msgid "GBr"
+msgstr "Брит"
+
+#: ../rules/base.xml.in.h:189
+msgid "Ga"
+msgstr "Га"
+
+#: ../rules/base.xml.in.h:190
+msgid "Generic 101-key PC"
+msgstr "Обычный 101-клавишный PC"
+
+#: ../rules/base.xml.in.h:191
+msgid "Generic 102-key (Intl) PC"
+msgstr "Обычный 102-клавишный PC"
+
+#: ../rules/base.xml.in.h:192
+msgid "Generic 104-key PC"
+msgstr "Обычный 104-клавишный PC"
+
+#: ../rules/base.xml.in.h:193
+msgid "Generic 105-key (Intl) PC"
+msgstr "Обычный 105-клавишный (Инт.) РС"
+
+#: ../rules/base.xml.in.h:194
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:195
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:196
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:197
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:198
+msgid "Geo"
+msgstr "Груз"
+
+#: ../rules/base.xml.in.h:199
+msgid "Georgia"
+msgstr "Грузи�"
+
+#: ../rules/base.xml.in.h:200
+msgid "German (Macintosh)"
+msgstr "�емецка� (Macintosh)"
+
+#: ../rules/base.xml.in.h:201
+msgid "German, Sun dead keys"
+msgstr "�емецка�, �пециальные клавиши (dead keys) Sun"
+
+#: ../rules/base.xml.in.h:202
+msgid "German, eliminate dead keys"
+msgstr "�емецка�, и�ключить �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:203
+msgid "Germany"
+msgstr "Германи�"
+
+#: ../rules/base.xml.in.h:204
+msgid "Gha"
+msgstr "Ган"
+
+#: ../rules/base.xml.in.h:205
+msgid "Ghana"
+msgstr "Гана"
+
+#: ../rules/base.xml.in.h:206
+msgid "Gre"
+msgstr "Гре"
+
+#: ../rules/base.xml.in.h:207
+msgid "Greece"
+msgstr "Греци�"
+
+#: ../rules/base.xml.in.h:208 ../rules/sun.xml.in.h:58
+msgid "Group Shift/Lock behavior"
+msgstr "Функци� �мены ра�кладки"
+
+#: ../rules/base.xml.in.h:209
+msgid "Gujarati"
+msgstr "Гуджарати"
+
+#: ../rules/base.xml.in.h:210
+msgid "Gurmukhi"
+msgstr "Гурмукхи"
+
+#: ../rules/base.xml.in.h:211
+msgid "Gyration"
+msgstr "Гирашн"
+
+#: ../rules/base.xml.in.h:212
+msgid "Hausa"
+msgstr "Хауза"
+
+#: ../rules/base.xml.in.h:213
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:214
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:215
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:216
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:217
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:218
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:219
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:220
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:221
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:222
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:223
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:224
+msgid "Hrv"
+msgstr "Хорв"
+
+#: ../rules/base.xml.in.h:225 ../rules/sun.xml.in.h:59
+msgid "Hun"
+msgstr "Венг"
+
+#: ../rules/base.xml.in.h:226
+msgid "Hungary"
+msgstr "Венгри�"
+
+#: ../rules/base.xml.in.h:227
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper �оответ�твует клавишам Win"
+
+#: ../rules/base.xml.in.h:228
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:229
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:230
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:231
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (альтернативный вариант)"
+
+#: ../rules/base.xml.in.h:232
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:233
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:234 ../rules/sun.xml.in.h:61
+msgid "ISO Alternate"
+msgstr "Дополнительна� ISO"
+
+#: ../rules/base.xml.in.h:235
+msgid "Iceland"
+msgstr "И�ланди�"
+
+#: ../rules/base.xml.in.h:236
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:237
+msgid "Ind"
+msgstr "Инд"
+
+#: ../rules/base.xml.in.h:238
+msgid "India"
+msgstr "Инди�"
+
+#: ../rules/base.xml.in.h:239 ../rules/sun.xml.in.h:62
+msgid "International (with dead keys)"
+msgstr "Международна�, �о �пец. клавишами (dead keys)"
+
+#: ../rules/base.xml.in.h:240
+msgid "Inuktitut"
+msgstr "Иннуит�ка�"
+
+#: ../rules/base.xml.in.h:241
+msgid "Iran"
+msgstr "Иран"
+
+#: ../rules/base.xml.in.h:242
+msgid "Iraq"
+msgstr "Ирак"
+
+#: ../rules/base.xml.in.h:243
+msgid "Ireland"
+msgstr "Ирланди�"
+
+#: ../rules/base.xml.in.h:244
+msgid "Irl"
+msgstr "Ирл"
+
+#: ../rules/base.xml.in.h:245
+msgid "Irn"
+msgstr "Пер�"
+
+#: ../rules/base.xml.in.h:246
+msgid "Irq"
+msgstr "Ирк"
+
+#: ../rules/base.xml.in.h:247
+msgid "Isl"
+msgstr "И�л"
+
+#: ../rules/base.xml.in.h:248
+msgid "Isr"
+msgstr "Ивр"
+
+#: ../rules/base.xml.in.h:249
+msgid "Israel"
+msgstr "Израиль"
+
+#: ../rules/base.xml.in.h:250 ../rules/sun.xml.in.h:63
+msgid "Ita"
+msgstr "Ит"
+
+#: ../rules/base.xml.in.h:251
+msgid "Italy"
+msgstr "Итали�"
+
+#: ../rules/base.xml.in.h:252
+msgid "Japan"
+msgstr "Япони�"
+
+#: ../rules/base.xml.in.h:253
+msgid "Japan (PC-98xx Series)"
+msgstr "Japan (PC-98xx Series)"
+
+#: ../rules/base.xml.in.h:254
+msgid "Japanese 106-key"
+msgstr "Япон�ка� 106-клавишна�"
+
+#: ../rules/base.xml.in.h:255 ../rules/sun.xml.in.h:66
+msgid "Jpn"
+msgstr "Яп"
+
+#: ../rules/base.xml.in.h:256
+msgid "Kana"
+msgstr "Кана"
+
+#: ../rules/base.xml.in.h:257
+msgid "Kannada"
+msgstr "Каннада"
+
+#: ../rules/base.xml.in.h:258
+msgid "Kashubian"
+msgstr "Кашуб�кий"
+
+#: ../rules/base.xml.in.h:259
+msgid "Kaz"
+msgstr "Каз"
+
+#: ../rules/base.xml.in.h:260
+msgid "Kazakh with Russian"
+msgstr "Казах�кий � Ру��ким"
+
+#: ../rules/base.xml.in.h:261
+msgid "Kazakhstan"
+msgstr "Казах�тан"
+
+#: ../rules/base.xml.in.h:262
+msgid "Keypad"
+msgstr "С доп. панелью"
+
+#: ../rules/base.xml.in.h:263
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:264
+msgid "Khm"
+msgstr "Кхм"
+
+#: ../rules/base.xml.in.h:265
+msgid "Kor"
+msgstr "Кор"
+
+#: ../rules/base.xml.in.h:266
+msgid "Korea, Republic of"
+msgstr "Ре�публика Коре�"
+
+#: ../rules/base.xml.in.h:267
+msgid "Korean 106-key"
+msgstr "Корей�ка� 106-клавишна�"
+
+#: ../rules/base.xml.in.h:268
+msgid "Kotoistus"
+msgstr "Котои�ту�"
+
+#: ../rules/base.xml.in.h:269
+msgid "Kurdish, (F)"
+msgstr "Курд�ка�, (F)"
+
+#: ../rules/base.xml.in.h:270
+msgid "Kurdish, Arabic-Latin"
+msgstr "Курд�ка�, �раб�ко-латин�ка�"
+
+#: ../rules/base.xml.in.h:271
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Курд�ка�, Латиница Alt-Q"
+
+#: ../rules/base.xml.in.h:272
+msgid "Kurdish, Latin Q"
+msgstr "Курд�ка�, Латиница Q"
+
+#: ../rules/base.xml.in.h:273
+msgid "Kyr"
+msgstr "Кыр"
+
+#: ../rules/base.xml.in.h:274
+msgid "Kyrgyzstan"
+msgstr "Киргизи�"
+
+#: ../rules/base.xml.in.h:275
+msgid "LAm"
+msgstr "Лат�м"
+
+#: ../rules/base.xml.in.h:276
+msgid "LCtrl+LShift changes group."
+msgstr "LCtrl+LShift мен�ют группу."
+
+#: ../rules/base.xml.in.h:277
+msgid "Lao"
+msgstr "Лао"
+
+#: ../rules/base.xml.in.h:278
+msgid "Laos"
+msgstr "Лао�"
+
+#: ../rules/base.xml.in.h:279
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Клавиатура дл� ноутбуков Compaq (например Armada)"
+
+#: ../rules/base.xml.in.h:280
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "\"Интернет\" клавиатура дл� ноутбуков Compaq (например Presario)"
+
+#: ../rules/base.xml.in.h:281
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "�оутбуки eMachines m68xx"
+
+#: ../rules/base.xml.in.h:282
+msgid "Latin"
+msgstr "Латин�ка�"
+
+#: ../rules/base.xml.in.h:283
+msgid "Latin American"
+msgstr "Латиноамерикан�ка�"
+
+#: ../rules/base.xml.in.h:284
+msgid "Latin Unicode"
+msgstr "Латин�ка� Unicode"
+
+#: ../rules/base.xml.in.h:285
+msgid "Latin Unicode qwerty"
+msgstr "Латин�ка� Unicode qwerty"
+
+#: ../rules/base.xml.in.h:286
+msgid "Latin qwerty"
+msgstr "Латин�ка� qwerty"
+
+#: ../rules/base.xml.in.h:287
+msgid "Latin with guillemets"
+msgstr "Латин�ка� � француз�кими кавычками"
+
+#: ../rules/base.xml.in.h:288
+msgid "Latvia"
+msgstr "Латви�"
+
+#: ../rules/base.xml.in.h:289
+msgid "Left Alt is swapped with left Win-key."
+msgstr "Левый Alt помен�н ме�тами � левой клавишей Win"
+
+#: ../rules/base.xml.in.h:290
+msgid "Left Alt key changes group."
+msgstr "Лева� клавиша Alt мен�ет группу."
+
+#: ../rules/base.xml.in.h:291
+msgid "Left Alt key switches group while pressed."
+msgstr "Лева� клавиша Alt переключает группу на врем� нажати�."
+
+#: ../rules/base.xml.in.h:292
+msgid "Left Ctrl key changes group."
+msgstr "Лева� клавиша Ctrl мен�ет группу."
+
+#: ../rules/base.xml.in.h:293
+msgid "Left Shift key changes group."
+msgstr "Лева� клавиша Shift мен�ет группу."
+
+#: ../rules/base.xml.in.h:294
+msgid "Left Win-key changes group."
+msgstr "Лева� клавиша Win мен�ет группу."
+
+#: ../rules/base.xml.in.h:295
+msgid "Left Win-key is Compose."
+msgstr "Лева� клавиша Win �оответ�твует клавише Compose."
+
+#: ../rules/base.xml.in.h:296
+msgid "Left Win-key switches group while pressed."
+msgstr "Лева� клавиша Win переключает группу на врем� нажати�."
+
+#: ../rules/base.xml.in.h:297
+msgid "Left handed Dvorak"
+msgstr "Dvorak дл� левшей"
+
+#: ../rules/base.xml.in.h:298
+msgid "Lithuania"
+msgstr "Литва"
+
+#: ../rules/base.xml.in.h:299
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:300
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:301
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:302
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:303
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:304
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: ../rules/base.xml.in.h:305
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (альтернативный вариант)"
+
+#: ../rules/base.xml.in.h:306
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (альтернативный вариант 2)"
+
+#: ../rules/base.xml.in.h:307
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:308
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:309
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Дополнительные клавиши Logitech G15 � помощью демона G15"
+
+#: ../rules/base.xml.in.h:310
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:311
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:312
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:313
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:314
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:315
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (модель Y-RB6)"
+
+#: ../rules/base.xml.in.h:316
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:317
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+#: ../rules/base.xml.in.h:318
+msgid "Ltu"
+msgstr "Лит"
+
+#: ../rules/base.xml.in.h:319
+msgid "Lva"
+msgstr "Латв"
+
+#: ../rules/base.xml.in.h:320
+msgid "Macedonia"
+msgstr "Македони�"
+
+#: ../rules/base.xml.in.h:321
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:322
+msgid "Macintosh Old"
+msgstr "Старый Macintosh"
+
+#: ../rules/base.xml.in.h:323
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, �пециальные клавиши (dead keys) Sun"
+
+#: ../rules/base.xml.in.h:324
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, и�ключить �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:325
+msgid "Make CapsLock an additional Ctrl."
+msgstr "И�пользовать CapsLock как дополнительную клавишу Ctrl."
+
+#: ../rules/base.xml.in.h:326
+msgid "Mal"
+msgstr "Мал"
+
+#: ../rules/base.xml.in.h:327
+msgid "Malayalam"
+msgstr "Малайaлам"
+
+#: ../rules/base.xml.in.h:328
+msgid "Maldives"
+msgstr "Мальдивы"
+
+#: ../rules/base.xml.in.h:329
+msgid "Malta"
+msgstr "Мальта"
+
+#: ../rules/base.xml.in.h:330
+msgid "Maltese keyboard with US layout"
+msgstr "Мальтий�ка� клавиатура � ра�кладкой US"
+
+#: ../rules/base.xml.in.h:331
+msgid "Mao"
+msgstr "Мао"
+
+#: ../rules/base.xml.in.h:332
+msgid "Maori"
+msgstr "Маори"
+
+#: ../rules/base.xml.in.h:333
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:334
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:335
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:336
+msgid "Menu is Compose."
+msgstr "Клавиша Menu �оответ�твует клавише Compose."
+
+#: ../rules/base.xml.in.h:337
+msgid "Menu key changes group."
+msgstr "Клавиша Menu мен�ет группу."
+
+#: ../rules/base.xml.in.h:338
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta �оответ�твует клавишам Win"
+
+#: ../rules/base.xml.in.h:339
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta �оответ�твует левой клавише Win"
+
+#: ../rules/base.xml.in.h:340
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:341
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, швед�ка�"
+
+#: ../rules/base.xml.in.h:342
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:343
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:344
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:345
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:346
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:347
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:348 ../rules/sun.xml.in.h:72
+msgid "Miscellaneous compatibility options"
+msgstr "Разные параметры �овме�тимо�ти"
+
+#: ../rules/base.xml.in.h:349
+msgid "Mkd"
+msgstr "Мак"
+
+#: ../rules/base.xml.in.h:350
+msgid "Mlt"
+msgstr "Мальт"
+
+#: ../rules/base.xml.in.h:351
+msgid "Mmr"
+msgstr "Мь�нм"
+
+#: ../rules/base.xml.in.h:352
+msgid "Mng"
+msgstr "Монг"
+
+#: ../rules/base.xml.in.h:353
+msgid "Mongolia"
+msgstr "Монголи�"
+
+#: ../rules/base.xml.in.h:354 ../rules/sun.xml.in.h:73
+msgid "Multilingual"
+msgstr "Много�зычна�"
+
+#: ../rules/base.xml.in.h:355
+msgid "Multilingual, first part"
+msgstr "Много�зычна�, перва� ча�ть"
+
+#: ../rules/base.xml.in.h:356 ../rules/sun.xml.in.h:74
+msgid "Multilingual, second part"
+msgstr "Много�зычна�, втора� ча�ть"
+
+#: ../rules/base.xml.in.h:357
+msgid "Myanmar"
+msgstr "Мь�нмар"
+
+#: ../rules/base.xml.in.h:358
+msgid "Neostyle"
+msgstr "Neostyle"
+
+#: ../rules/base.xml.in.h:359
+msgid "Nep"
+msgstr "�еп"
+
+#: ../rules/base.xml.in.h:360
+msgid "Nepal"
+msgstr "�епал"
+
+#: ../rules/base.xml.in.h:361
+msgid "Netherlands"
+msgstr "�идерланды"
+
+#: ../rules/base.xml.in.h:362
+msgid "Nigeria"
+msgstr "�игери�"
+
+#: ../rules/base.xml.in.h:363
+msgid "Nld"
+msgstr "Флам"
+
+#: ../rules/base.xml.in.h:364 ../rules/sun.xml.in.h:75
+msgid "Nor"
+msgstr "�ор"
+
+#: ../rules/base.xml.in.h:365
+msgid "Northern Saami"
+msgstr "Северна� Саам�ка�"
+
+#: ../rules/base.xml.in.h:366
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Северна� Саам�ка�, и�ключа� �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:367
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:368
+msgid "Norway"
+msgstr "�орвеги�"
+
+#: ../rules/base.xml.in.h:369
+msgid "NumLock LED shows alternative group."
+msgstr "Индикатор NumLock отображает доп. группу."
+
+#: ../rules/base.xml.in.h:370
+msgid "Numpad keys work as with Mac."
+msgstr "Клавиши цифровой клавиатуры работают как в Mac."
+
+#: ../rules/base.xml.in.h:371
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:372
+msgid "Ogham"
+msgstr "Огхам (древнеирлан�ка�)"
+
+#: ../rules/base.xml.in.h:373
+msgid "Ogham IS434"
+msgstr "Огхам IS434"
+
+#: ../rules/base.xml.in.h:374
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/Internet keyboard"
+
+#: ../rules/base.xml.in.h:375
+msgid "Oriya"
+msgstr "Орий�"
+
+#: ../rules/base.xml.in.h:376
+msgid "Ossetian"
+msgstr "О�етин�ка�"
+
+#: ../rules/base.xml.in.h:377
+msgid "Ossetian, Winkeys"
+msgstr "О�етин�ка� клавиатура Windows"
+
+#: ../rules/base.xml.in.h:378
+msgid "PC-98xx Series"
+msgstr "PC-98xx"
+
+#: ../rules/base.xml.in.h:379
+msgid "Pak"
+msgstr "Пак"
+
+#: ../rules/base.xml.in.h:380
+msgid "Pakistan"
+msgstr "Паки�тан"
+
+#: ../rules/base.xml.in.h:381
+msgid "Pashto"
+msgstr "Пуштун�ка�"
+
+#: ../rules/base.xml.in.h:382
+msgid "Pattachote"
+msgstr "Паттачот"
+
+#: ../rules/base.xml.in.h:383 ../rules/sun.xml.in.h:78
+msgid "Phonetic"
+msgstr "Фонетиче�ка�"
+
+#: ../rules/base.xml.in.h:384 ../rules/sun.xml.in.h:79
+msgid "Pol"
+msgstr "Поль�к"
+
+#: ../rules/base.xml.in.h:385
+msgid "Poland"
+msgstr "Польша"
+
+#: ../rules/base.xml.in.h:386
+msgid "Polytonic"
+msgstr "Полифониче�ка�"
+
+#: ../rules/base.xml.in.h:387
+msgid "Portugal"
+msgstr "Португали�"
+
+#: ../rules/base.xml.in.h:388
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Выбор 3-го уровн� нажатием левой клавиши Alt."
+
+#: ../rules/base.xml.in.h:389
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Выбор 3-го уровн� нажатием левой клавиши Win."
+
+#: ../rules/base.xml.in.h:390
+msgid "Press Menu key to choose 3rd level."
+msgstr "Выбор 3-го уровн� нажатием клавиши Menu."
+
+#: ../rules/base.xml.in.h:391
+msgid ""
+"Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr ""
+"Выбор 3-го уровн� нажатием правой клавиши Alt. Shift и правый Alt вме�те "
+"работают как Multi_Key."
+
+#: ../rules/base.xml.in.h:392
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Выбор 3-го уровн� нажатием правой клавиши Alt."
+
+#: ../rules/base.xml.in.h:393
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Выбор 3-го уровн� нажатием правой клавиши Ctrl."
+
+#: ../rules/base.xml.in.h:394
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Выбор 3-го уровн� нажатием правой клавиши Win."
+
+#: ../rules/base.xml.in.h:395
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Выбор 3-го уровн� нажатием любой клавиши Alt."
+
+#: ../rules/base.xml.in.h:396
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Выбор 3-го уровн� нажатием любой клавиши Win."
+
+#: ../rules/base.xml.in.h:397
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:398
+msgid "Pro Keypad"
+msgstr "Pro � доп. панелью"
+
+#: ../rules/base.xml.in.h:399
+msgid "Probhat"
+msgstr "Пробат"
+
+#: ../rules/base.xml.in.h:400
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:401 ../rules/sun.xml.in.h:88
+msgid "Prt"
+msgstr "Порт"
+
+#: ../rules/base.xml.in.h:402
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:403
+msgid "R-Alt switches group while pressed."
+msgstr "Права� клавиша Alt переключает группу на врем� нажати�."
+
+#: ../rules/base.xml.in.h:404
+msgid "Right Alt is Compose."
+msgstr "Права� клавиша Alt �оответ�твует клавише Alt."
+
+#: ../rules/base.xml.in.h:405
+msgid "Right Alt key changes group."
+msgstr "Права� клавиша Alt мен�ет группу."
+
+#: ../rules/base.xml.in.h:406
+msgid "Right Ctrl is Compose."
+msgstr "Права� клавиша Ctrl �оответ�твует клавише Compose."
+
+#: ../rules/base.xml.in.h:407
+msgid "Right Ctrl key changes group."
+msgstr "Права� клавиша Ctrl мен�ет группу."
+
+#: ../rules/base.xml.in.h:408
+msgid "Right Ctrl key switches group while pressed."
+msgstr "Права� клавиша Ctrl переключает группу на врем� нажати�."
+
+#: ../rules/base.xml.in.h:409
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Права� клавиша Ctrl работает как права� клавиша Alt."
+
+#: ../rules/base.xml.in.h:410
+msgid "Right Shift key changes group."
+msgstr "Права� клавиша Shift мен�ет группу."
+
+#: ../rules/base.xml.in.h:411
+msgid "Right Win-key changes group."
+msgstr "Права� клавиша Win мен�ет группу."
+
+#: ../rules/base.xml.in.h:412
+msgid "Right Win-key is Compose."
+msgstr "Права� клавиша Win �оответ�твует клавише Compose."
+
+#: ../rules/base.xml.in.h:413
+msgid "Right Win-key switches group while pressed."
+msgstr "Права� клавиша Win переключает группу на врем� нажати�."
+
+#: ../rules/base.xml.in.h:414
+msgid "Right handed Dvorak"
+msgstr "Dvorak дл� правшей"
+
+#: ../rules/base.xml.in.h:415
+msgid "Romania"
+msgstr "Румыни�"
+
+#: ../rules/base.xml.in.h:416
+msgid "Romanian keyboard with German letters"
+msgstr "Румын�ка� клавиатура � немецкими буквами"
+
+#: ../rules/base.xml.in.h:417
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr ""
+"Румын�ка� клавиатура � немецкими буквами, и�ключить �пециальные клавиши "
+"(dead keys)"
+
+#: ../rules/base.xml.in.h:418
+msgid "Rou"
+msgstr "Рум"
+
+#: ../rules/base.xml.in.h:419 ../rules/sun.xml.in.h:94
+msgid "Rus"
+msgstr "Ру�"
+
+#: ../rules/base.xml.in.h:420
+msgid "Russia"
+msgstr "Ро��и�"
+
+#: ../rules/base.xml.in.h:421 ../rules/sun.xml.in.h:95
+msgid "Russian"
+msgstr "Ру��ка�"
+
+#: ../rules/base.xml.in.h:422
+msgid "Russian phonetic"
+msgstr "Ру��ка� фонетиче�ка�"
+
+#: ../rules/base.xml.in.h:423
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Ру��ка� фонетиче�ка�, и�ключить �пециальные клавиши (dead keys)"
+
+#: ../rules/base.xml.in.h:424
+msgid "Russian with Kazakh"
+msgstr "Ру��кий � Казах�ким"
+
+#: ../rules/base.xml.in.h:425
+msgid "SCG"
+msgstr "СМ�"
+
+#: ../rules/base.xml.in.h:426
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:427
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:428
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:429
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:430
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:431
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:432
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:433
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:434
+msgid "ScrollLock LED shows alternative group."
+msgstr "Индикатор ScrollLock отображает доп. группу."
+
+#: ../rules/base.xml.in.h:435
+msgid "Serbia and Montenegro"
+msgstr "Серби� и Черногори�"
+
+#: ../rules/base.xml.in.h:436
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr ""
+"Клавиша Shift � клавишами цифровой клавиатуры работают также как в MS "
+"Windows."
+
+#: ../rules/base.xml.in.h:437
+msgid "Shift+CapsLock changes group."
+msgstr "Клавиши Shift и Caps Lock, нажатые вме�те, мен�ют группу."
+
+#: ../rules/base.xml.in.h:438
+msgid "Slovakia"
+msgstr "Словаки�"
+
+#: ../rules/base.xml.in.h:439
+msgid "Slovenia"
+msgstr "Словени�"
+
+#: ../rules/base.xml.in.h:440
+msgid "South Africa"
+msgstr "Южна� �фрика"
+
+#: ../rules/base.xml.in.h:441
+msgid "Southern Uzbek"
+msgstr "Южно-узбек�ка�"
+
+#: ../rules/base.xml.in.h:442
+msgid "Space key output nobreakspace at fourth level."
+msgstr "Пробел выдаёт нераздел�емый пробел на четвёртом уровне."
+
+#: ../rules/base.xml.in.h:443
+msgid "Space key output nobreakspace at second level."
+msgstr "Пробел выдаёт нераздел�емый пробел на втором уровне."
+
+#: ../rules/base.xml.in.h:444
+msgid "Space key output nobreakspace at third level."
+msgstr "Пробел выдаёт нераздел�емый пробел на третьем уровне."
+
+#: ../rules/base.xml.in.h:445
+msgid "Space key output space at any level."
+msgstr "Пробел выдаёт пробел на каждом уровне."
+
+#: ../rules/base.xml.in.h:446
+msgid "Spain"
+msgstr "И�пани�"
+
+#: ../rules/base.xml.in.h:447 ../rules/sun.xml.in.h:102
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Специальные клавиши (Ctrl+Alt+&lt;клв&gt;) обрабатывают�� �ервером."
+
+#: ../rules/base.xml.in.h:448
+msgid "SrL"
+msgstr "ШрЛ"
+
+#: ../rules/base.xml.in.h:449
+msgid "Sri Lanka"
+msgstr "Шри Ланка"
+
+#: ../rules/base.xml.in.h:450 ../rules/sun.xml.in.h:103
+msgid "Standard"
+msgstr "Стандартна�"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:452
+msgid "Standard RSTU"
+msgstr "Стандартна� RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:454
+msgid "Standard RSTU on Russian layout"
+msgstr "Стандартна� RSTU, ру��ка�"
+
+#: ../rules/base.xml.in.h:455 ../rules/sun.xml.in.h:111
+msgid "Sun dead keys"
+msgstr "Специальные клавиши (dead keys) Sun"
+
+#: ../rules/base.xml.in.h:456
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:457
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "Super �оответ�твует клавишам Win (по умолчанию)"
+
+#: ../rules/base.xml.in.h:458 ../rules/sun.xml.in.h:112
+msgid "Svk"
+msgstr "Слов"
+
+#: ../rules/base.xml.in.h:459
+msgid "Svn"
+msgstr "Cловен"
+
+#: ../rules/base.xml.in.h:460
+msgid "Swap Ctrl and CapsLock."
+msgstr "Помен�ть ме�тами клавиши Ctrl и CapsLock."
+
+#: ../rules/base.xml.in.h:461
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr ""
+"Пере�тавить коды двух клавиш когда клавиатура Mac неправильно определ�ет�� "
+"�дром."
+
+#: ../rules/base.xml.in.h:462 ../rules/sun.xml.in.h:114
+msgid "Swe"
+msgstr "Швед"
+
+#: ../rules/base.xml.in.h:463
+msgid "Sweden"
+msgstr "Швеци�"
+
+#: ../rules/base.xml.in.h:464
+msgid "Switzerland"
+msgstr "Швейцари�"
+
+#: ../rules/base.xml.in.h:465
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (карманный ПК)"
+
+#: ../rules/base.xml.in.h:466
+msgid "Syr"
+msgstr "���"
+
+#: ../rules/base.xml.in.h:467
+msgid "Syria"
+msgstr "Сирий�ка�"
+
+#: ../rules/base.xml.in.h:468
+msgid "Syriac"
+msgstr "Сирий�ка�"
+
+#: ../rules/base.xml.in.h:469
+msgid "Syriac phonetic"
+msgstr "Сирий�ка� фонетиче�ка�"
+
+#: ../rules/base.xml.in.h:470
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:471
+msgid "Tajikistan"
+msgstr "Таджики�тан"
+
+#: ../rules/base.xml.in.h:472
+msgid "Tamil"
+msgstr "Тамиль�ка�"
+
+#: ../rules/base.xml.in.h:473
+msgid "Tamil TAB Typewriter"
+msgstr "Тамиль�ка� \"Печатна� машинка\" TAB"
+
+#: ../rules/base.xml.in.h:474
+msgid "Tamil TSCII Typewriter"
+msgstr "Тамиль�ка� \"Печатна� машинка\" TSCII"
+
+#: ../rules/base.xml.in.h:475
+msgid "Tamil Unicode"
+msgstr "Тамиль�ка� Unicode"
+
+#: ../rules/base.xml.in.h:476
+msgid "Tatar"
+msgstr "Татар�ка�"
+
+#: ../rules/base.xml.in.h:477
+msgid "Telugu"
+msgstr "Телугу"
+
+#: ../rules/base.xml.in.h:478
+msgid "Tha"
+msgstr "Таи"
+
+#: ../rules/base.xml.in.h:479
+msgid "Thailand"
+msgstr "Таиланд"
+
+#: ../rules/base.xml.in.h:480 ../rules/sun.xml.in.h:118
+msgid "Third level choosers"
+msgstr "Выбор 3-го уровн�"
+
+#: ../rules/base.xml.in.h:481
+msgid "Tilde (~) variant"
+msgstr "Вариант � тильдой (~)"
+
+#: ../rules/base.xml.in.h:482
+msgid "Tjk"
+msgstr "Тадж"
+
+#: ../rules/base.xml.in.h:483
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:484
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:485
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:486 ../rules/sun.xml.in.h:119
+msgid "Tur"
+msgstr "Тур"
+
+#: ../rules/base.xml.in.h:487
+msgid "Turkey"
+msgstr "Турци�"
+
+#: ../rules/base.xml.in.h:488
+msgid "Typewriter"
+msgstr "Печатна� машинка"
+
+#: ../rules/base.xml.in.h:489 ../rules/sun.xml.in.h:123
+msgid "U.S. English"
+msgstr "�нглий�ка� (СШ�)"
+
+#: ../rules/base.xml.in.h:490
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Клавиатура СШ� � бо�ний�кими диграфами"
+
+#: ../rules/base.xml.in.h:491
+msgid "US keyboard with Bosnian letters"
+msgstr "Клавиатура СШ� � бо�ний�кими буквами"
+
+#: ../rules/base.xml.in.h:492
+msgid "US keyboard with Croatian digraphs"
+msgstr "Клавиатура СШ� � хорват�кими диграфами"
+
+#: ../rules/base.xml.in.h:493
+msgid "US keyboard with Croatian letters"
+msgstr "Клавиатура СШ� � хорват�кими буквами"
+
+#: ../rules/base.xml.in.h:494
+msgid "US keyboard with Lithuanian letters"
+msgstr "Клавиатура СШ� � литов�кими буквами"
+
+#: ../rules/base.xml.in.h:495
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Клавиатура СШ� �о �ловен�кими диграфами"
+
+#: ../rules/base.xml.in.h:496
+msgid "US keyboard with Slovenian letters"
+msgstr "Клавиатура СШ� �о �ловен�кими буквами"
+
+#: ../rules/base.xml.in.h:497 ../rules/sun.xml.in.h:125
+msgid "USA"
+msgstr "СШ�"
+
+#: ../rules/base.xml.in.h:498
+msgid "Ukr"
+msgstr "Укр"
+
+#: ../rules/base.xml.in.h:499
+msgid "Ukraine"
+msgstr "Украина"
+
+#: ../rules/base.xml.in.h:500
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:501 ../rules/sun.xml.in.h:126
+msgid "United Kingdom"
+msgstr "�нглий�ка� (Великобритани�)"
+
+#: ../rules/base.xml.in.h:502
+msgid "Urdu"
+msgstr "Урду"
+
+#: ../rules/base.xml.in.h:503
+msgid "Use Bosnian digraphs"
+msgstr "И�пользовать бо�ний�кие диграфы"
+
+#: ../rules/base.xml.in.h:504
+msgid "Use Croatian digraphs"
+msgstr "И�пользовать хорват�кие диграфы"
+
+#: ../rules/base.xml.in.h:505
+msgid "Use Slovenian digraphs"
+msgstr "И�пользовать �ловен�кие диграфы"
+
+#: ../rules/base.xml.in.h:506
+msgid "Use guillemets for quotes"
+msgstr "И�пользовать француз�кие кавычки как кавычки"
+
+#: ../rules/base.xml.in.h:507
+msgid "Use keyboard LED to show alternative group."
+msgstr "И�пользование клавиатурных индикаторов дл� отображени� доп. групп."
+
+#: ../rules/base.xml.in.h:508
+msgid "Uzb"
+msgstr "Узб"
+
+#: ../rules/base.xml.in.h:509
+msgid "Uzbekistan"
+msgstr "Узбеки�тан"
+
+#: ../rules/base.xml.in.h:510
+msgid "Vietnam"
+msgstr "Вьетнам"
+
+#: ../rules/base.xml.in.h:511
+msgid "Vnm"
+msgstr "Вьет"
+
+#: ../rules/base.xml.in.h:512
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:513
+msgid "Western"
+msgstr "Западна�"
+
+#: ../rules/base.xml.in.h:514
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:515
+msgid "Winkeys"
+msgstr "Клавиатура Windows"
+
+#: ../rules/base.xml.in.h:516
+msgid "With &lt;\\|&gt; key"
+msgstr "С клавишей &lt;\\|&gt;"
+
+#: ../rules/base.xml.in.h:517
+msgid "With guillemets"
+msgstr "С француз�кими кавычками"
+
+#: ../rules/base.xml.in.h:518
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:519
+msgid "Yoruba"
+msgstr "Йоруба"
+
+#: ../rules/base.xml.in.h:520
+msgid "Z and ZHE swapped"
+msgstr "З и Ж пере�тавлены"
+
+#: ../rules/base.xml.in.h:521
+msgid "Zar"
+msgstr "Ю�Р"
+
+#: ../rules/base.xml.in.h:522
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:523
+msgid "azerty/digits"
+msgstr "azerty/цифры"
+
+#: ../rules/base.xml.in.h:524
+msgid "digits"
+msgstr "цифры"
+
+#: ../rules/base.xml.in.h:525
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:526 ../rules/sun.xml.in.h:131
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:527
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, ра�ширенные функции Backslash"
+
+#: ../rules/base.xml.in.h:528
+msgid "qwerty/digits"
+msgstr "qwerty/цифры"
+
+#: ../rules/base.xml.in.h:529
+msgid "qwertz"
+msgstr "qwertz"
+
+#: ../rules/sun.xml.in.h:1
+msgid "\"Typewriter\""
+msgstr "Печатна� машинка"
+
+#: ../rules/sun.xml.in.h:17
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr ""
+"Дей�твует как Shift � блокировкой. Shift прио�танавливает дей�твие Caps."
+
+#: ../rules/sun.xml.in.h:18
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "Дей�твует как Shift � блокировкой. Shift не вли�ет на Caps."
+
+#: ../rules/sun.xml.in.h:19
+msgid "Alt+Control changes group"
+msgstr "Alt+Control мен�ют группу"
+
+#: ../rules/sun.xml.in.h:20
+msgid "Alt+Shift changes group"
+msgstr "Alt+Shift мен�ют группу"
+
+#: ../rules/sun.xml.in.h:21
+msgid "Basic"
+msgstr "О�новные"
+
+#: ../rules/sun.xml.in.h:23
+msgid "Belgian"
+msgstr "Бельгий�ка�"
+
+#: ../rules/sun.xml.in.h:25
+msgid "Both Alt keys together change group"
+msgstr "Обе клавиши Alt, нажатые вме�те, мен�ют группу"
+
+#: ../rules/sun.xml.in.h:26
+msgid "Both Ctrl keys together change group"
+msgstr "Обе клавиши Ctrl, нажатые вме�те, мен�ют группу"
+
+#: ../rules/sun.xml.in.h:27
+msgid "Both Shift keys together change group"
+msgstr "Обе клавиши Shift, нажатые вме�те, мен�ют группу"
+
+#: ../rules/sun.xml.in.h:28
+msgid "Bulgarian"
+msgstr "Болгар�ка�"
+
+#: ../rules/sun.xml.in.h:30
+msgid "Canadian"
+msgstr "Канад�ка�"
+
+#: ../rules/sun.xml.in.h:31
+msgid "Caps Lock is Compose"
+msgstr "Клавиша Caps Lock �оответ�твует клавише Compose"
+
+#: ../rules/sun.xml.in.h:32
+msgid "Caps Lock key changes group"
+msgstr "Клавиша Caps Lock мен�ет группу"
+
+#: ../rules/sun.xml.in.h:34
+msgid "Caps_Lock LED shows alternative group"
+msgstr "Индикатор Caps_Lock отображает другую группу"
+
+#: ../rules/sun.xml.in.h:35
+msgid "Control Key Position"
+msgstr "Положение клавиши Control"
+
+#: ../rules/sun.xml.in.h:36
+msgid "Control key at bottom left"
+msgstr "Клавиша Control �низу �лева"
+
+#: ../rules/sun.xml.in.h:37
+msgid "Control key at left of 'A'"
+msgstr "Клавиша Control �лева от 'Ф'"
+
+#: ../rules/sun.xml.in.h:38
+msgid "Control+Shift changes group"
+msgstr "Control+Shift мен�ют группу"
+
+#: ../rules/sun.xml.in.h:40
+msgid "Czech"
+msgstr "Чеш�кий"
+
+#: ../rules/sun.xml.in.h:41
+msgid "Danish"
+msgstr "Дат�кий"
+
+#: ../rules/sun.xml.in.h:45
+msgid "DeuCH"
+msgstr "�емШВ"
+
+#: ../rules/sun.xml.in.h:47
+msgid "Dvo"
+msgstr "Dvo"
+
+#: ../rules/sun.xml.in.h:52
+msgid "Finnish"
+msgstr "Фин�ка�"
+
+#: ../rules/sun.xml.in.h:54
+msgid "FraCH"
+msgstr "ФраШВ"
+
+#: ../rules/sun.xml.in.h:57
+msgid "German"
+msgstr "�емецка�"
+
+#: ../rules/sun.xml.in.h:60
+msgid "Hungarian"
+msgstr "Венгер�ка�"
+
+#: ../rules/sun.xml.in.h:64
+msgid "Italian"
+msgstr "Италь�н�ка�"
+
+#: ../rules/sun.xml.in.h:65
+msgid "Japanese"
+msgstr "Япон�ка�"
+
+#: ../rules/sun.xml.in.h:67
+msgid "Left Alt key changes group"
+msgstr "Лева� клавиша Alt мен�ет группу"
+
+#: ../rules/sun.xml.in.h:68
+msgid "Left Alt key switches group while pressed"
+msgstr "Лева� клавиша Alt переключает группу на врем� нажати�"
+
+#: ../rules/sun.xml.in.h:69
+msgid "Left Ctrl key changes group"
+msgstr "Лева� клавиша Ctrl мен�ет группу"
+
+#: ../rules/sun.xml.in.h:70
+msgid "Left Shift key changes group"
+msgstr "Лева� клавиша Shift мен�ет группу"
+
+#: ../rules/sun.xml.in.h:71
+msgid "Make CapsLock an additional Control"
+msgstr "И�пользовать CapsLock как дополнительную клавишу Control"
+
+#: ../rules/sun.xml.in.h:76
+msgid "Norwegian"
+msgstr "�орвеж�ка�"
+
+#: ../rules/sun.xml.in.h:77
+msgid "Num_Lock LED shows alternative group"
+msgstr "Индикатор Num_Lock отображает дополнительную группу"
+
+#: ../rules/sun.xml.in.h:80
+msgid "Polish"
+msgstr "Поль�ка�"
+
+#: ../rules/sun.xml.in.h:81
+msgid "Polish with Polish quotes on key \"1/!\""
+msgstr "Поль�ка� � поль�кими кавычками на клавишах \"1/!\""
+
+#: ../rules/sun.xml.in.h:82
+msgid "Portuguese"
+msgstr "Португаль�ка�"
+
+#: ../rules/sun.xml.in.h:83
+msgid "Press Left Alt key to choose 3rd level"
+msgstr "Выбор 3-го уровн� нажатием левой клавиши Alt"
+
+#: ../rules/sun.xml.in.h:84
+msgid "Press Right Alt key to choose 3rd level"
+msgstr "Выбор 3-го уровн� нажатием правой клавиши Alt"
+
+#: ../rules/sun.xml.in.h:85
+msgid ""
+"Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr ""
+"Выбор 3-го уровн� нажатием правой клавиши Alt. Shift и правый Alt вме�те "
+"работают как Multi_Key"
+
+#: ../rules/sun.xml.in.h:86
+msgid "Press Right Control to choose 3rd level"
+msgstr "Выбор 3-го уровн� нажатием правой клавиши Control"
+
+#: ../rules/sun.xml.in.h:87
+msgid "Press any of Alt keys to choose 3rd level"
+msgstr "Выбор 3-го уровн� нажатием любой клавиши Alt"
+
+#: ../rules/sun.xml.in.h:89
+msgid "Right Alt key changes group"
+msgstr "Права� клавиша Alt мен�ет группу"
+
+#: ../rules/sun.xml.in.h:90
+msgid "Right Alt switches group while pressed"
+msgstr "Права� клавиша Alt переключает группу на врем� нажати�"
+
+#: ../rules/sun.xml.in.h:91
+msgid "Right Control key works as Right Alt"
+msgstr "Права� клавиша Control работает как права� клавиша Alt"
+
+#: ../rules/sun.xml.in.h:92
+msgid "Right Ctrl key changes group"
+msgstr "Права� клавиша Ctrl мен�ет группу"
+
+#: ../rules/sun.xml.in.h:93
+msgid "Right Shift key changes group"
+msgstr "Права� клавиша Shift мен�ет группу"
+
+#: ../rules/sun.xml.in.h:96
+msgid "Scroll Lock changes group"
+msgstr "Scroll Lock мен�ет группу"
+
+#: ../rules/sun.xml.in.h:97
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "Индикатор Scroll_Lock отображает дополнительную группу"
+
+#: ../rules/sun.xml.in.h:98
+msgid "Shift with numpad keys works as in MS Windows"
+msgstr ""
+"Клавиша Shift � клавишами цифровой клавиатуры работают также как в MS Windows"
+
+#: ../rules/sun.xml.in.h:99
+msgid "Shift+CapsLock changes group"
+msgstr "Клавиши Shift и Caps Lock, нажатые вме�те, мен�ют группу"
+
+#: ../rules/sun.xml.in.h:100
+msgid "Slovak"
+msgstr "Словацка�"
+
+#: ../rules/sun.xml.in.h:101
+msgid "Spanish"
+msgstr "И�пан�ка�"
+
+#: ../rules/sun.xml.in.h:104
+msgid "Sun Type 4"
+msgstr "Sun Type 4"
+
+#: ../rules/sun.xml.in.h:105
+msgid "Sun Type 5"
+msgstr "Sun Type 5"
+
+#: ../rules/sun.xml.in.h:106
+msgid "Sun Type 5 European"
+msgstr "Sun Type 5 Европей�ка�"
+
+#: ../rules/sun.xml.in.h:107
+msgid "Sun Type 5 Unix"
+msgstr "Sun Type 5 дл� Unix"
+
+#: ../rules/sun.xml.in.h:108
+msgid "Sun Type 6"
+msgstr "Sun Type 6"
+
+#: ../rules/sun.xml.in.h:109
+msgid "Sun Type 6 Unix"
+msgstr "Sun Type 6 дл� Unix"
+
+#: ../rules/sun.xml.in.h:110
+msgid "Sun Type 6 with Euro key"
+msgstr "Sun Type 6 �о знаком евро"
+
+#: ../rules/sun.xml.in.h:113
+msgid "Swap Control and Caps Lock"
+msgstr "Помен�ть ме�тами клавиши Control и Caps Lock"
+
+#: ../rules/sun.xml.in.h:115
+msgid "Swedish"
+msgstr "Швед�ка�"
+
+#: ../rules/sun.xml.in.h:116
+msgid "Swiss French"
+msgstr "Швейцар�ка� француз�ка�"
+
+#: ../rules/sun.xml.in.h:117
+msgid "Swiss German"
+msgstr "Швейцар�ка� немецка�"
+
+#: ../rules/sun.xml.in.h:120
+msgid "Turkish"
+msgstr "Турецка�"
+
+#: ../rules/sun.xml.in.h:121
+msgid "Turkish (F)"
+msgstr "Турецка� � (F)"
+
+#: ../rules/sun.xml.in.h:122
+msgid "Turkish Alt-Q Layout"
+msgstr "Турецка� ра�кладка � Alt-Q"
+
+#: ../rules/sun.xml.in.h:124
+msgid "U.S. English w/ ISO9995-3"
+msgstr "�нглий�ка� (СШ�) � ISO9995-3"
+
+#: ../rules/sun.xml.in.h:127
+msgid "Use keyboard LED to show alternative group"
+msgstr ""
+"И�пользование клавиатурных индикаторов дл� отображени� дополнительных групп"
+
+#: ../rules/sun.xml.in.h:128
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr ""
+"Включает внутреннюю ра��тановку заглавных. Shift прио�танавливает дей�твие "
+"CapsLock."
+
+#: ../rules/sun.xml.in.h:129
+msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+msgstr ""
+"Включает внутреннюю ра��тановку заглавных. Shift не вли�ет на CapsLock."
+
+#: ../rules/sun.xml.in.h:130
+msgid "bksl"
+msgstr "bksl"
+
+#: ../rules/sun.xml.in.h:132
+msgid "type4"
+msgstr "type4"
diff --git a/xorg-server/xkbdata.src/po/rw.po b/xorg-server/xkbdata.src/po/rw.po
new file mode 100644
index 000000000..935d6c33e
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/rw.po
@@ -0,0 +1,1827 @@
+# Kinyarwanda translations for xkeyboard-config package.
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+# Steve Murphy <murf@e-tools.com>, 2005.
+# Steve performed initial rough translation from compendium built from translations provided by the following translators:
+# Philibert Ndandali  <ndandali@yahoo.fr>, 2005.
+# Viateur MUGENZI <muvia1@yahoo.fr>, 2005.
+# Noëlla Mupole <s24211045@tuks.co.za>, 2005.
+# Carole Karema <karemacarole@hotmail.com>, 2005.
+# JEAN BAPTISTE NGENDAHAYO <ngenda_denis@yahoo.co.uk>, 2005.
+# Augustin KIBERWA  <akiberwa@yahoo.co.uk>, 2005.
+# Donatien NSENGIYUMVA <ndonatienuk@yahoo.co.uk>, 2005.
+# Antoine Bigirimana <antoine@e-tools.com>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 0.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-01-24 22:57+0000\n"
+"PO-Revision-Date: 2005-04-04 10:55-0700\n"
+"Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
+"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+# sc/source\ui\src\scstring.src:SCSTR_STDFILTER.text
+#: rules/base.xml.in.h:1
+#, fuzzy
+msgid "\"Standard\""
+msgstr "\"Bisanzwe-"
+
+#: rules/base.xml.in.h:2
+msgid "\"Typewriter\""
+msgstr ""
+
+#: rules/base.xml.in.h:3
+msgid "(F)"
+msgstr ""
+
+#: rules/base.xml.in.h:4
+#, fuzzy
+msgid "101/qwerty/comma/Dead keys"
+msgstr "Akitso Utubuto"
+
+#: rules/base.xml.in.h:5
+#, fuzzy
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "Akitso Utubuto"
+
+#: rules/base.xml.in.h:6
+#, fuzzy
+msgid "101/qwerty/dot/Dead keys"
+msgstr "Akadomo Utubuto"
+
+#: rules/base.xml.in.h:7
+#, fuzzy
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "Akadomo Utubuto"
+
+#: rules/base.xml.in.h:8
+#, fuzzy
+msgid "101/qwertz/comma/Dead keys"
+msgstr "Akitso Utubuto"
+
+#: rules/base.xml.in.h:9
+#, fuzzy
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "Akitso Utubuto"
+
+#: rules/base.xml.in.h:10
+#, fuzzy
+msgid "101/qwertz/dot/Dead keys"
+msgstr "Akadomo Utubuto"
+
+#: rules/base.xml.in.h:11
+#, fuzzy
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "Akadomo Utubuto"
+
+#: rules/base.xml.in.h:12
+#, fuzzy
+msgid "102/qwerty/comma/Dead keys"
+msgstr "Akitso Utubuto"
+
+#: rules/base.xml.in.h:13
+#, fuzzy
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "Akitso Utubuto"
+
+#: rules/base.xml.in.h:14
+#, fuzzy
+msgid "102/qwerty/dot/Dead keys"
+msgstr "Akadomo Utubuto"
+
+#: rules/base.xml.in.h:15
+#, fuzzy
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "Akadomo Utubuto"
+
+#: rules/base.xml.in.h:16
+#, fuzzy
+msgid "102/qwertz/comma/Dead keys"
+msgstr "Akitso Utubuto"
+
+#: rules/base.xml.in.h:17
+#, fuzzy
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "Akitso Utubuto"
+
+#: rules/base.xml.in.h:18
+#, fuzzy
+msgid "102/qwertz/dot/Dead keys"
+msgstr "Akadomo Utubuto"
+
+#: rules/base.xml.in.h:19
+#, fuzzy
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "Akadomo Utubuto"
+
+#: rules/base.xml.in.h:20
+#, fuzzy
+msgid "A4Tech KB-21"
+msgstr "21"
+
+#: rules/base.xml.in.h:21
+#, fuzzy
+msgid "A4Tech KBS-8"
+msgstr "8"
+
+#: rules/base.xml.in.h:22
+msgid "ACPI Standard"
+msgstr ""
+
+#: rules/base.xml.in.h:23
+#, fuzzy
+msgid "Acer AirKey V"
+msgstr "V"
+
+#: rules/base.xml.in.h:24
+#, fuzzy
+msgid "Add the EuroSign to the 2 key."
+msgstr "i Kuri i 2. Urufunguzo"
+
+#: rules/base.xml.in.h:25
+#, fuzzy
+msgid "Add the EuroSign to the 5 key."
+msgstr "i Kuri i 5 Urufunguzo"
+
+#: rules/base.xml.in.h:26
+#, fuzzy
+msgid "Add the EuroSign to the E key."
+msgstr "i Kuri i E Urufunguzo"
+
+#: rules/base.xml.in.h:27
+#, fuzzy
+msgid "Add the standard behavior to Menu key."
+msgstr "i Bisanzwe imyitwarire Kuri Urufunguzo"
+
+#: rules/base.xml.in.h:28
+#, fuzzy
+msgid "Adding the EuroSign to certain keys"
+msgstr "i Kuri Utubuto"
+
+#: rules/base.xml.in.h:29
+msgid "Advance Scorpius KI"
+msgstr ""
+
+#: rules/base.xml.in.h:30
+msgid "Alb"
+msgstr ""
+
+#: rules/base.xml.in.h:31
+msgid "Albania"
+msgstr "Alubaniya"
+
+#: rules/base.xml.in.h:32
+#, fuzzy
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Na ku i Utubuto Mburabuzi"
+
+#: rules/base.xml.in.h:33
+#, fuzzy
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "ni Kuri i Iburyo: Urufunguzo Na Kuri"
+
+#: rules/base.xml.in.h:34
+#, fuzzy
+msgid "Alt+Control changes group."
+msgstr "Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:35
+#, fuzzy
+msgid "Alt+Shift changes group."
+msgstr "Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:36
+msgid "Alt-Q"
+msgstr ""
+
+#: rules/base.xml.in.h:37
+#, fuzzy
+msgid "Alt/Win key behavior"
+msgstr "Urufunguzo imyitwarire"
+
+#: rules/base.xml.in.h:38
+msgid "Alternative"
+msgstr ""
+
+#: rules/base.xml.in.h:39
+#, fuzzy
+msgid "Alternative international (former us_intl)"
+msgstr "Mpuzamahanga"
+
+#: rules/base.xml.in.h:40
+#, fuzzy
+msgid "Alternative, Sun dead keys"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:41
+#, fuzzy
+msgid "Alternative, eliminate dead keys"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:42
+msgid "Apostrophe (') variant"
+msgstr ""
+
+#: rules/base.xml.in.h:43
+msgid "Ara"
+msgstr ""
+
+#: rules/base.xml.in.h:44
+msgid "Arabic"
+msgstr "Icyarabu"
+
+#: rules/base.xml.in.h:45
+msgid "Arm"
+msgstr ""
+
+#: rules/base.xml.in.h:46
+msgid "Armenia"
+msgstr "Arumeniya"
+
+#: rules/base.xml.in.h:47
+msgid "Aze"
+msgstr ""
+
+#: rules/base.xml.in.h:48
+msgid "Azerbaijan"
+msgstr "Azeribayijani"
+
+#: rules/base.xml.in.h:49
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:50
+msgid "BTC 5090"
+msgstr ""
+
+#: rules/base.xml.in.h:51
+msgid "BTC 5113RF Multimedia"
+msgstr ""
+
+#: rules/base.xml.in.h:52
+msgid "BTC 5126T"
+msgstr ""
+
+#: rules/base.xml.in.h:53
+msgid "BTC 9000"
+msgstr ""
+
+#: rules/base.xml.in.h:54
+msgid "BTC 9000A"
+msgstr ""
+
+#: rules/base.xml.in.h:55
+msgid "BTC 9001AH"
+msgstr ""
+
+#: rules/base.xml.in.h:56
+msgid "Bel"
+msgstr ""
+
+#: rules/base.xml.in.h:57
+msgid "Belarus"
+msgstr "Belarusi"
+
+#: rules/base.xml.in.h:58
+msgid "Belgium"
+msgstr "Ububiligi"
+
+#: rules/base.xml.in.h:59
+msgid "Ben"
+msgstr ""
+
+#: rules/base.xml.in.h:60
+msgid "Bengali"
+msgstr "Bengali"
+
+#: rules/base.xml.in.h:61
+msgid "Bgr"
+msgstr ""
+
+#: rules/base.xml.in.h:62
+msgid "Bih"
+msgstr ""
+
+#: rules/base.xml.in.h:63
+msgid "Blr"
+msgstr ""
+
+#: rules/base.xml.in.h:64
+msgid "Bosnia and Herzegovina"
+msgstr "Bosiniya na Herizegovina"
+
+#: rules/base.xml.in.h:65
+#, fuzzy
+msgid "Both Alt keys together change group."
+msgstr "Utubuto Guhindura>> Itsinda"
+
+#: rules/base.xml.in.h:66
+#, fuzzy
+msgid "Both Ctrl keys together change group."
+msgstr "Utubuto Guhindura>> Itsinda"
+
+#: rules/base.xml.in.h:67
+#, fuzzy
+msgid "Both Shift keys together change group."
+msgstr "Utubuto Guhindura>> Itsinda"
+
+#: rules/base.xml.in.h:68
+#, fuzzy
+msgid "Both Win-keys switch group while pressed."
+msgstr "Utubuto Hindura Itsinda"
+
+#: rules/base.xml.in.h:69
+msgid "Bra"
+msgstr ""
+
+#: rules/base.xml.in.h:70
+msgid "Brazil"
+msgstr "Burezile"
+
+#: rules/base.xml.in.h:71
+msgid "Brazilian ABNT2"
+msgstr ""
+
+#: rules/base.xml.in.h:72
+msgid "Brother Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:73
+msgid "Bulgaria"
+msgstr "Buligariya"
+
+#: rules/base.xml.in.h:74
+msgid "Can"
+msgstr ""
+
+#: rules/base.xml.in.h:75
+msgid "Canada"
+msgstr "Kanada"
+
+#: rules/base.xml.in.h:76
+#, fuzzy
+msgid "CapsLock LED shows alternative group."
+msgstr "Itsinda"
+
+#: rules/base.xml.in.h:77
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "Nka Na:"
+
+#: rules/base.xml.in.h:78
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "Nka Na: Kureka"
+
+#: rules/base.xml.in.h:79
+#, fuzzy
+msgid "CapsLock just locks the Shift modifier."
+msgstr "i"
+
+#: rules/base.xml.in.h:80
+#, fuzzy
+msgid "CapsLock key behavior"
+msgstr "Urufunguzo imyitwarire"
+
+#: rules/base.xml.in.h:81
+#, fuzzy
+msgid "CapsLock key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:82
+#, fuzzy
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "Byose Utubuto"
+
+#: rules/base.xml.in.h:83
+#, fuzzy
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "Bisanzwe Bya Inyuguti"
+
+#: rules/base.xml.in.h:84
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr "By'imbere"
+
+#: rules/base.xml.in.h:85
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr "By'imbere Kureka"
+
+#: rules/base.xml.in.h:86
+msgid "Che"
+msgstr ""
+
+#: rules/base.xml.in.h:87
+msgid "Cherry Blue Line CyBo@rd"
+msgstr ""
+
+#: rules/base.xml.in.h:88
+#, fuzzy
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Ihitamo"
+
+#: rules/base.xml.in.h:89
+msgid "Chicony Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:90
+msgid "Chicony KB-9885"
+msgstr ""
+
+#: rules/base.xml.in.h:91
+msgid "CloGaelach"
+msgstr ""
+
+#: rules/base.xml.in.h:92
+msgid "CloGaelach Laptop"
+msgstr ""
+
+#: rules/base.xml.in.h:93
+msgid "Compaq Easy Access Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:94
+#, fuzzy
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:95
+#, fuzzy
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:96
+#, fuzzy
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "7 Utubuto"
+
+#: rules/base.xml.in.h:97
+msgid "Compaq iPaq Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:98
+msgid "Control Key Position"
+msgstr ""
+
+#: rules/base.xml.in.h:99
+#, fuzzy
+msgid "Control key at bottom left"
+msgstr "Urufunguzo ku Hasi: Ibumoso:"
+
+#: rules/base.xml.in.h:100
+#, fuzzy
+msgid "Control key at left of 'A'"
+msgstr "Urufunguzo ku Ibumoso: Bya"
+
+#: rules/base.xml.in.h:101
+#, fuzzy
+msgid "Control+Shift changes group."
+msgstr "Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:102
+msgid "Croatia"
+msgstr "Korowatiya"
+
+#: rules/base.xml.in.h:103
+msgid "Cyrillic"
+msgstr "Nyasilike"
+
+#: rules/base.xml.in.h:104
+msgid "Cze"
+msgstr ""
+
+#: rules/base.xml.in.h:105
+msgid "Czechia"
+msgstr ""
+
+#: rules/base.xml.in.h:106
+msgid "DTK2000"
+msgstr ""
+
+#: rules/base.xml.in.h:107
+msgid "Dead acute"
+msgstr ""
+
+#: rules/base.xml.in.h:108
+msgid "Dead grave acute"
+msgstr ""
+
+#: rules/base.xml.in.h:109
+msgid "Dell"
+msgstr ""
+
+#: rules/base.xml.in.h:110
+#, fuzzy
+msgid "Dell 101-key PC"
+msgstr "Urufunguzo"
+
+#: rules/base.xml.in.h:111
+msgid "Denmark"
+msgstr "Danimarike"
+
+#: rules/base.xml.in.h:112
+msgid "Deu"
+msgstr ""
+
+#: rules/base.xml.in.h:113
+msgid "Deva"
+msgstr ""
+
+#: rules/base.xml.in.h:114
+msgid "Devanagari"
+msgstr "Devanagari"
+
+#: rules/base.xml.in.h:115
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:116
+#, fuzzy
+msgid "Diamond 9801 / 9802 series"
+msgstr "Ibyiciro"
+
+#: rules/base.xml.in.h:117
+msgid "Dnk"
+msgstr ""
+
+#: rules/base.xml.in.h:118
+msgid "Dvorak"
+msgstr ""
+
+#: rules/base.xml.in.h:119
+#, fuzzy
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "ku Urufunguzo 1."
+
+#: rules/base.xml.in.h:120
+#, fuzzy
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "ku Urufunguzo"
+
+#: rules/base.xml.in.h:121
+msgid "Dzo"
+msgstr ""
+
+#: rules/base.xml.in.h:122
+msgid "Dzongkha"
+msgstr "Ikinyazongika"
+
+#: rules/base.xml.in.h:123
+#, fuzzy
+msgid "Eliminate dead keys"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:124
+msgid "Ennyah DKB-1008"
+msgstr ""
+
+#: rules/base.xml.in.h:125
+msgid "Esp"
+msgstr ""
+
+#: rules/base.xml.in.h:126
+msgid "Est"
+msgstr ""
+
+#: rules/base.xml.in.h:127
+msgid "Estonia"
+msgstr "Esitoniya"
+
+#: rules/base.xml.in.h:128
+msgid "Everex STEPnote"
+msgstr ""
+
+#: rules/base.xml.in.h:129
+msgid "Extended"
+msgstr "cya/byagutse"
+
+#: rules/base.xml.in.h:130
+msgid "Extended Backslash"
+msgstr ""
+
+#: rules/base.xml.in.h:131
+#, fuzzy
+msgid "F-letter (F) variant"
+msgstr "Ibaruwa..."
+
+#: rules/base.xml.in.h:132
+msgid "Fao"
+msgstr ""
+
+#: rules/base.xml.in.h:133
+msgid "Faroe Islands"
+msgstr "Ibirwa bya Farowe"
+
+#: rules/base.xml.in.h:134
+msgid "Fin"
+msgstr ""
+
+#: rules/base.xml.in.h:135
+#, fuzzy
+msgid "Finish and Swedish"
+msgstr "Na"
+
+#: rules/base.xml.in.h:136
+msgid "Finland"
+msgstr "Finilande"
+
+#: rules/base.xml.in.h:137
+msgid "Fra"
+msgstr ""
+
+#: rules/base.xml.in.h:138
+msgid "France"
+msgstr "Ubufaransa"
+
+#: rules/base.xml.in.h:139
+msgid "French"
+msgstr "Igifaransa"
+
+#: rules/base.xml.in.h:140
+msgid "French (legacy)"
+msgstr ""
+
+#: rules/base.xml.in.h:141
+msgid "French Dvorak"
+msgstr ""
+
+#: rules/base.xml.in.h:142
+#, fuzzy
+msgid "French, Sun dead keys"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:143
+#, fuzzy
+msgid "French, eliminate dead keys"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:144
+msgid "GBr"
+msgstr ""
+
+#: rules/base.xml.in.h:145
+#, fuzzy
+msgid "Generic 101-key PC"
+msgstr "Urufunguzo"
+
+#: rules/base.xml.in.h:146
+#, fuzzy
+msgid "Generic 102-key (Intl) PC"
+msgstr "Urufunguzo"
+
+#: rules/base.xml.in.h:147
+#, fuzzy
+msgid "Generic 104-key PC"
+msgstr "Urufunguzo"
+
+#: rules/base.xml.in.h:148
+#, fuzzy
+msgid "Generic 105-key (Intl) PC"
+msgstr "Urufunguzo"
+
+#: rules/base.xml.in.h:149
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr ""
+
+#: rules/base.xml.in.h:150
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr ""
+
+#: rules/base.xml.in.h:151
+msgid "Geo"
+msgstr ""
+
+#: rules/base.xml.in.h:152
+msgid "Georgia"
+msgstr "Geworigiya"
+
+#: rules/base.xml.in.h:153
+#, fuzzy
+msgid "German, Sun dead keys"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:154
+#, fuzzy
+msgid "German, eliminate dead keys"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:155
+msgid "Germany"
+msgstr "Ubudage"
+
+#: rules/base.xml.in.h:156
+msgid "Gre"
+msgstr ""
+
+#: rules/base.xml.in.h:157
+msgid "Greece"
+msgstr "Ikigereki"
+
+#: rules/base.xml.in.h:158
+#, fuzzy
+msgid "Group Shift/Lock behavior"
+msgstr "imyitwarire"
+
+#: rules/base.xml.in.h:159
+msgid "Guj"
+msgstr ""
+
+#: rules/base.xml.in.h:160
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: rules/base.xml.in.h:161
+msgid "Gurmukhi"
+msgstr "Gurumuki"
+
+#: rules/base.xml.in.h:162
+msgid "Guru"
+msgstr ""
+
+#: rules/base.xml.in.h:163
+msgid "Gyration"
+msgstr ""
+
+#: rules/base.xml.in.h:164
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:165
+#, fuzzy
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "500"
+
+#: rules/base.xml.in.h:166
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr ""
+
+#: rules/base.xml.in.h:167
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr ""
+
+#: rules/base.xml.in.h:168
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr ""
+
+#: rules/base.xml.in.h:169
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr ""
+
+#: rules/base.xml.in.h:170
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr ""
+
+#: rules/base.xml.in.h:171
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr ""
+
+#: rules/base.xml.in.h:172
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:173
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:174
+msgid "Honeywell Euroboard"
+msgstr ""
+
+#: rules/base.xml.in.h:175
+msgid "Hrv"
+msgstr ""
+
+#: rules/base.xml.in.h:176
+msgid "Hun"
+msgstr ""
+
+#: rules/base.xml.in.h:177
+msgid "Hungary"
+msgstr "Hongiriya"
+
+#: rules/base.xml.in.h:178
+#, fuzzy
+msgid "Hyper is mapped to the Win-keys."
+msgstr "ni Kuri i Utubuto"
+
+#: rules/base.xml.in.h:179
+msgid "IBM Rapid Access"
+msgstr ""
+
+#: rules/base.xml.in.h:180
+msgid "IBM Rapid Access II"
+msgstr ""
+
+#: rules/base.xml.in.h:181
+#, fuzzy
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "Ihitamo"
+
+#: rules/base.xml.in.h:182
+#, fuzzy
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "600"
+
+#: rules/base.xml.in.h:183
+#, fuzzy
+msgid "INSCRIPT layout"
+msgstr "Imigaragarire"
+
+#: rules/base.xml.in.h:184
+msgid "IS434"
+msgstr ""
+
+#: rules/base.xml.in.h:185
+msgid "IS434 laptop"
+msgstr ""
+
+#: rules/base.xml.in.h:186
+msgid "ISO Alternate"
+msgstr ""
+
+#: rules/base.xml.in.h:187
+msgid "Iceland"
+msgstr "Isilande"
+
+#: rules/base.xml.in.h:188
+msgid "Iku"
+msgstr ""
+
+#: rules/base.xml.in.h:189
+#, fuzzy
+msgid "International (with dead keys)"
+msgstr "Na: Utubuto"
+
+#: rules/base.xml.in.h:190
+msgid "Inuktitut"
+msgstr "Ikinukititutu"
+
+#: rules/base.xml.in.h:191
+msgid "Iran"
+msgstr ""
+
+#: rules/base.xml.in.h:192
+msgid "Ireland"
+msgstr "Irilande"
+
+#: rules/base.xml.in.h:193
+msgid "Irl"
+msgstr ""
+
+#: rules/base.xml.in.h:194
+msgid "Irn"
+msgstr ""
+
+#: rules/base.xml.in.h:195
+msgid "Isl"
+msgstr ""
+
+#: rules/base.xml.in.h:196
+msgid "Isr"
+msgstr ""
+
+#: rules/base.xml.in.h:197
+msgid "Israel"
+msgstr "Isirayeli"
+
+#: rules/base.xml.in.h:198
+msgid "Ita"
+msgstr ""
+
+#: rules/base.xml.in.h:199
+msgid "Italy"
+msgstr "Ubutariyani"
+
+#: rules/base.xml.in.h:200
+msgid "Japan"
+msgstr "Ubuyapani"
+
+#: rules/base.xml.in.h:201
+#, fuzzy
+msgid "Japanese 106-key"
+msgstr "Urufunguzo"
+
+#: rules/base.xml.in.h:202
+msgid "Jpn"
+msgstr ""
+
+#: rules/base.xml.in.h:203
+msgid "Kan"
+msgstr ""
+
+#: rules/base.xml.in.h:204
+msgid "Kannada"
+msgstr "Kannada"
+
+#: rules/base.xml.in.h:205
+msgid "Keytronic FlexPro"
+msgstr ""
+
+#: rules/base.xml.in.h:206
+msgid "Kyr"
+msgstr ""
+
+#: rules/base.xml.in.h:207
+msgid "Kyrgyzstan"
+msgstr "Kirigizasitani"
+
+#: rules/base.xml.in.h:208
+msgid "LAm"
+msgstr ""
+
+#: rules/base.xml.in.h:209
+msgid "Lao"
+msgstr "Lawo"
+
+#: rules/base.xml.in.h:210
+msgid "Laos"
+msgstr ""
+
+#: rules/base.xml.in.h:211
+msgid "Laptop"
+msgstr ""
+
+#: rules/base.xml.in.h:212
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:213
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:214
+msgid "Laptop/notebook Dell Inspiron 8xxx"
+msgstr ""
+
+#: rules/base.xml.in.h:215
+msgid "Latin"
+msgstr "Ikiratini"
+
+#: rules/base.xml.in.h:216
+msgid "Latin American"
+msgstr ""
+
+#: rules/base.xml.in.h:217
+msgid "Latin Unicode"
+msgstr ""
+
+#: rules/base.xml.in.h:218
+msgid "Latin Unicode qwerty"
+msgstr ""
+
+#: rules/base.xml.in.h:219
+msgid "Latin qwerty"
+msgstr ""
+
+#: rules/base.xml.in.h:220
+#, fuzzy
+msgid "Latin with guillemots"
+msgstr "Na:"
+
+#: rules/base.xml.in.h:221
+msgid "Latvia"
+msgstr "Lativiya"
+
+#: rules/base.xml.in.h:222
+#, fuzzy
+msgid "Left Alt key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:223
+#, fuzzy
+msgid "Left Alt key switches group while pressed."
+msgstr "Urufunguzo Itsinda"
+
+#: rules/base.xml.in.h:224
+#, fuzzy
+msgid "Left Ctrl key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:225
+#, fuzzy
+msgid "Left Shift key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:226
+#, fuzzy
+msgid "Left Win-key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:227
+#, fuzzy
+msgid "Left Win-key switches group while pressed."
+msgstr "Urufunguzo Itsinda"
+
+#: rules/base.xml.in.h:228
+msgid "Lithuania"
+msgstr "Lituwaniya"
+
+#: rules/base.xml.in.h:229
+msgid "Logitech Access Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:230
+msgid "Logitech Cordless Desktop"
+msgstr ""
+
+#: rules/base.xml.in.h:231
+msgid "Logitech Cordless Desktop Navigator"
+msgstr ""
+
+#: rules/base.xml.in.h:232
+msgid "Logitech Cordless Desktop Optical"
+msgstr ""
+
+#: rules/base.xml.in.h:233
+msgid "Logitech Cordless Desktop Pro"
+msgstr ""
+
+#: rules/base.xml.in.h:234
+#, fuzzy
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Ihitamo"
+
+#: rules/base.xml.in.h:235
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr ""
+
+#: rules/base.xml.in.h:236
+msgid "Logitech Cordless Desktop iTouch"
+msgstr ""
+
+#: rules/base.xml.in.h:237
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr ""
+
+#: rules/base.xml.in.h:238
+msgid "Logitech Deluxe Access Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:239
+msgid "Logitech Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:240
+msgid "Logitech Internet Navigator Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:241
+msgid "Logitech iTouch"
+msgstr ""
+
+#: rules/base.xml.in.h:242
+#, fuzzy
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Urugero"
+
+#: rules/base.xml.in.h:243
+#, fuzzy
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr "Mwandikisho"
+
+#: rules/base.xml.in.h:244
+msgid "Ltu"
+msgstr ""
+
+#: rules/base.xml.in.h:245
+msgid "Lva"
+msgstr ""
+
+#: rules/base.xml.in.h:246
+msgid "Macedonian"
+msgstr "Nyamasedoniya"
+
+#: rules/base.xml.in.h:247
+msgid "Macintosh"
+msgstr "masinitoshi"
+
+#: rules/base.xml.in.h:248
+msgid "Macintosh Old"
+msgstr ""
+
+#: rules/base.xml.in.h:249
+msgid "Make CapsLock an additional Control."
+msgstr ""
+
+#: rules/base.xml.in.h:250
+msgid "Mal"
+msgstr ""
+
+#: rules/base.xml.in.h:251
+msgid "Malayalam"
+msgstr "Malayalamu"
+
+#: rules/base.xml.in.h:252
+msgid "Malta"
+msgstr "Malita"
+
+#: rules/base.xml.in.h:253
+msgid "Mao"
+msgstr ""
+
+#: rules/base.xml.in.h:254
+msgid "Maori"
+msgstr "Ikimawori"
+
+#: rules/base.xml.in.h:255
+msgid "Memorex MX1998"
+msgstr ""
+
+#: rules/base.xml.in.h:256
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:257
+msgid "Memorex MX2750"
+msgstr ""
+
+#: rules/base.xml.in.h:258
+#, fuzzy
+msgid "Menu is Compose."
+msgstr "ni"
+
+#: rules/base.xml.in.h:259
+#, fuzzy
+msgid "Menu key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:260
+#, fuzzy
+msgid "Meta is mapped to the Win-keys."
+msgstr "ni Kuri i Utubuto"
+
+#: rules/base.xml.in.h:261
+#, fuzzy
+msgid "Meta is mapped to the left Win-key."
+msgstr "ni Kuri i Ibumoso: Urufunguzo"
+
+#: rules/base.xml.in.h:262
+msgid "Microsoft Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:263
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr ""
+
+#: rules/base.xml.in.h:264
+msgid "Microsoft Natural"
+msgstr ""
+
+#: rules/base.xml.in.h:265
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr ""
+
+#: rules/base.xml.in.h:266
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr ""
+
+#: rules/base.xml.in.h:267
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr ""
+
+#: rules/base.xml.in.h:268
+msgid "Microsoft Office Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:269
+#, fuzzy
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "1."
+
+#: rules/base.xml.in.h:270
+#, fuzzy
+msgid "Miscellaneous compatibility options"
+msgstr "Bihuye neza Amahitamo"
+
+#: rules/base.xml.in.h:271
+msgid "Mkd"
+msgstr ""
+
+#: rules/base.xml.in.h:272
+msgid "Mlt"
+msgstr ""
+
+#: rules/base.xml.in.h:273
+msgid "Mmr"
+msgstr ""
+
+#: rules/base.xml.in.h:274
+msgid "Mng"
+msgstr ""
+
+#: rules/base.xml.in.h:275
+msgid "Mongolia"
+msgstr "Mongoliya"
+
+#: rules/base.xml.in.h:276
+msgid "Multilingual"
+msgstr ""
+
+#: rules/base.xml.in.h:277
+#, fuzzy
+msgid "Multilingual, second part"
+msgstr "ISEGONDA"
+
+#: rules/base.xml.in.h:278
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: rules/base.xml.in.h:279
+msgid "Netherlands"
+msgstr "Nederilande"
+
+#: rules/base.xml.in.h:280
+msgid "Nld"
+msgstr ""
+
+#: rules/base.xml.in.h:281
+msgid "Nor"
+msgstr ""
+
+#: rules/base.xml.in.h:282
+msgid "Northern Saami"
+msgstr "Sami y'Amajyaruguru"
+
+#: rules/base.xml.in.h:283
+msgid "Northgate OmniKey 101"
+msgstr ""
+
+#: rules/base.xml.in.h:284
+msgid "Norway"
+msgstr "Noruveje"
+
+#: rules/base.xml.in.h:285
+#, fuzzy
+msgid "NumLock LED shows alternative group."
+msgstr "Itsinda"
+
+#: rules/base.xml.in.h:286
+msgid "Ogam"
+msgstr ""
+
+#: rules/base.xml.in.h:287
+msgid "Ogham"
+msgstr "Ogham"
+
+#: rules/base.xml.in.h:288
+#, fuzzy
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Mwandikisho"
+
+#: rules/base.xml.in.h:289
+msgid "Ori"
+msgstr ""
+
+#: rules/base.xml.in.h:290
+msgid "Oriya"
+msgstr "Oriya"
+
+#: rules/base.xml.in.h:291
+msgid "PC-98xx Series"
+msgstr ""
+
+#: rules/base.xml.in.h:292
+msgid "Pattachote"
+msgstr ""
+
+#: rules/base.xml.in.h:293
+#, fuzzy
+msgid "Phonetic"
+msgstr "Nyigamvugo:"
+
+#: rules/base.xml.in.h:294
+msgid "Pol"
+msgstr ""
+
+#: rules/base.xml.in.h:295
+msgid "Poland"
+msgstr "Polonye"
+
+#: rules/base.xml.in.h:296
+msgid "Polytonic"
+msgstr ""
+
+#: rules/base.xml.in.h:297
+msgid "Portugal"
+msgstr "Porutigali"
+
+#: rules/base.xml.in.h:298
+#, fuzzy
+msgid "PowerPC PS/2"
+msgstr "2."
+
+#: rules/base.xml.in.h:299
+#, fuzzy
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Urufunguzo Kuri Guhitamo urwego"
+
+#: rules/base.xml.in.h:300
+#, fuzzy
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Urufunguzo Kuri Guhitamo urwego"
+
+#: rules/base.xml.in.h:301
+#, fuzzy
+msgid "Press Menu key to choose 3rd level."
+msgstr "Urufunguzo Kuri Guhitamo urwego"
+
+#: rules/base.xml.in.h:302
+#, fuzzy
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Urufunguzo Kuri Guhitamo urwego"
+
+#: rules/base.xml.in.h:303
+#, fuzzy
+msgid "Press Right Control to choose 3rd level."
+msgstr "Kuri Guhitamo urwego"
+
+#: rules/base.xml.in.h:304
+#, fuzzy
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Urufunguzo Kuri Guhitamo urwego"
+
+#: rules/base.xml.in.h:305
+#, fuzzy
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Bya Utubuto Kuri Guhitamo urwego"
+
+#: rules/base.xml.in.h:306
+#, fuzzy
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Bya Utubuto Kuri Guhitamo urwego"
+
+#: rules/base.xml.in.h:307
+msgid "Probhat"
+msgstr ""
+
+#: rules/base.xml.in.h:308
+#, fuzzy
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "1000"
+
+#: rules/base.xml.in.h:309
+msgid "Prt"
+msgstr ""
+
+#: rules/base.xml.in.h:310
+msgid "QTronix Scorpius 98N+"
+msgstr ""
+
+#: rules/base.xml.in.h:311
+#, fuzzy
+msgid "R-Alt switches group while pressed."
+msgstr "Itsinda"
+
+#: rules/base.xml.in.h:312
+#, fuzzy
+msgid "Right Alt is Compose."
+msgstr "ni"
+
+#: rules/base.xml.in.h:313
+#, fuzzy
+msgid "Right Alt key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:314
+#, fuzzy
+msgid "Right Control key works as Right Alt."
+msgstr "Urufunguzo Nka"
+
+#: rules/base.xml.in.h:315
+#, fuzzy
+msgid "Right Ctrl is Compose."
+msgstr "ni"
+
+#: rules/base.xml.in.h:316
+#, fuzzy
+msgid "Right Ctrl key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:317
+#, fuzzy
+msgid "Right Ctrl key switches group while pressed."
+msgstr "Urufunguzo Itsinda"
+
+#: rules/base.xml.in.h:318
+#, fuzzy
+msgid "Right Shift key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:319
+#, fuzzy
+msgid "Right Win-key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:320
+#, fuzzy
+msgid "Right Win-key is Compose."
+msgstr "Urufunguzo ni"
+
+#: rules/base.xml.in.h:321
+#, fuzzy
+msgid "Right Win-key switches group while pressed."
+msgstr "Urufunguzo Itsinda"
+
+#: rules/base.xml.in.h:322
+msgid "Romania"
+msgstr "Romaniya"
+
+#: rules/base.xml.in.h:323
+#, fuzzy
+msgid "Romanian keyboard with German letters"
+msgstr "Mwandikisho Na:"
+
+#: rules/base.xml.in.h:324
+#, fuzzy
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Mwandikisho Na: Utubuto"
+
+#: rules/base.xml.in.h:325
+msgid "Rou"
+msgstr ""
+
+#: rules/base.xml.in.h:326
+msgid "Rus"
+msgstr ""
+
+#: rules/base.xml.in.h:327
+msgid "Russia"
+msgstr ""
+
+#: rules/base.xml.in.h:328
+msgid "Russian"
+msgstr "Ikirusiya"
+
+#: rules/base.xml.in.h:329
+msgid "SK-1300"
+msgstr ""
+
+#: rules/base.xml.in.h:330
+msgid "SK-2500"
+msgstr ""
+
+#: rules/base.xml.in.h:331
+msgid "SK-6200"
+msgstr ""
+
+#: rules/base.xml.in.h:332
+msgid "SK-7100"
+msgstr ""
+
+#: rules/base.xml.in.h:333
+msgid "SVEN Ergonomic 2500"
+msgstr ""
+
+#: rules/base.xml.in.h:334
+msgid "Samsung SDM 4500P"
+msgstr ""
+
+#: rules/base.xml.in.h:335
+msgid "Samsung SDM 4510P"
+msgstr ""
+
+#: rules/base.xml.in.h:336
+#, fuzzy
+msgid "ScrollLock LED shows alternative group."
+msgstr "Itsinda"
+
+#: rules/base.xml.in.h:337
+msgid "Serbian"
+msgstr "Ikinyaseribiya"
+
+#: rules/base.xml.in.h:338
+#, fuzzy
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Na: Utubuto Nka in"
+
+#: rules/base.xml.in.h:339
+#, fuzzy
+msgid "Shift+CapsLock changes group."
+msgstr "Amahinduka Itsinda"
+
+# sc/source\core\src\compiler.src:RID_SC_FUNCTION_NAMES.SC_OPCODE_SIN.text
+#: rules/base.xml.in.h:340
+#, fuzzy
+msgid "Sin"
+msgstr "SIN"
+
+#: rules/base.xml.in.h:341
+msgid "Sinhala"
+msgstr "Sinhala"
+
+#: rules/base.xml.in.h:342
+msgid "Slovakia"
+msgstr "Silovakiya"
+
+#: rules/base.xml.in.h:343
+msgid "Slovenia"
+msgstr "Siloveniya"
+
+#: rules/base.xml.in.h:344
+msgid "Smi"
+msgstr ""
+
+#: rules/base.xml.in.h:345
+msgid "Spain"
+msgstr "Esipanye"
+
+#: rules/base.xml.in.h:346
+#, fuzzy
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Utubuto in a Seriveri"
+
+#: rules/base.xml.in.h:347
+msgid "Srp"
+msgstr ""
+
+#: rules/base.xml.in.h:348
+msgid "Standard"
+msgstr "gisanzwe/kimenyerewe"
+
+#: rules/base.xml.in.h:349
+#, fuzzy
+msgid "Sun dead keys"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:350
+msgid "Super Power Multimedia Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:351
+#, fuzzy
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "ni Kuri i Utubuto Mburabuzi"
+
+#: rules/base.xml.in.h:352
+msgid "Svk"
+msgstr ""
+
+#: rules/base.xml.in.h:353
+msgid "Svn"
+msgstr ""
+
+#: rules/base.xml.in.h:354
+#, fuzzy
+msgid "Swap Control and CapsLock."
+msgstr "Na"
+
+#: rules/base.xml.in.h:355
+msgid "Swe"
+msgstr ""
+
+#: rules/base.xml.in.h:356
+msgid "Sweden"
+msgstr "Suwede"
+
+#: rules/base.xml.in.h:357
+msgid "Switzerland"
+msgstr "Ubusuwisi"
+
+#: rules/base.xml.in.h:358
+msgid "Symplon PaceBook (tablet PC)"
+msgstr ""
+
+#: rules/base.xml.in.h:359
+msgid "Syr"
+msgstr ""
+
+#: rules/base.xml.in.h:360
+msgid "Syriac"
+msgstr "Syriac"
+
+#: rules/base.xml.in.h:361
+msgid "TIS-820.2538"
+msgstr ""
+
+#: rules/base.xml.in.h:362
+msgid "Tajikistan"
+msgstr "Tajikisitani"
+
+#: rules/base.xml.in.h:363
+msgid "Tam"
+msgstr ""
+
+#: rules/base.xml.in.h:364
+msgid "Tamil"
+msgstr "Tamili"
+
+# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
+# sw/source\ui\wizard\wizbmp.src:STR_GoF_AbsTelefon.text
+# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
+# sw/source\ui\wizard\wizbmp.src:STR_GoF_EmpTelefon.text
+# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
+# sw/source\ui\wizard\wizbmp.src:STR_Usr_TelePrivat.text
+# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
+# sw/source\ui\wizard\wizbmp.src:STR_Usr_TeleDienst.text
+#: rules/base.xml.in.h:365
+#, fuzzy
+msgid "Tel"
+msgstr "Telefoni:"
+
+#: rules/base.xml.in.h:366
+msgid "Telugu"
+msgstr "Tegulu"
+
+#: rules/base.xml.in.h:367
+msgid "Tha"
+msgstr ""
+
+#: rules/base.xml.in.h:368
+msgid "Thailand"
+msgstr "Tayilande"
+
+#: rules/base.xml.in.h:369
+#, fuzzy
+msgid "Third level choosers"
+msgstr "urwego"
+
+#: rules/base.xml.in.h:370
+msgid "Tilde (~) variant"
+msgstr ""
+
+#: rules/base.xml.in.h:371
+msgid "Tjk"
+msgstr ""
+
+#: rules/base.xml.in.h:372
+msgid "Toshiba Satellite S3000"
+msgstr ""
+
+#: rules/base.xml.in.h:373
+msgid "Trust Direct Access Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:374
+msgid "Trust Wireless Keyboard Classic"
+msgstr ""
+
+#: rules/base.xml.in.h:375
+msgid "Tur"
+msgstr ""
+
+#: rules/base.xml.in.h:376
+msgid "Turkish"
+msgstr "Ikinyaturukiya"
+
+#: rules/base.xml.in.h:377
+#, fuzzy
+msgid "Typewrite-style keymap; TAB encoding"
+msgstr "IMISUSIRE Imisobekere:"
+
+#: rules/base.xml.in.h:378
+#, fuzzy
+msgid "Typewrite-style keymap; Unicode encoding"
+msgstr "IMISUSIRE Imisobekere:"
+
+#: rules/base.xml.in.h:379
+#, fuzzy
+msgid "U.S. English"
+msgstr "U."
+
+#: rules/base.xml.in.h:380
+#, fuzzy
+msgid "US keyboard with Croatian letters"
+msgstr "Mwandikisho Na:"
+
+#: rules/base.xml.in.h:381
+#, fuzzy
+msgid "US keyboard with Lithuanian letters"
+msgstr "Mwandikisho Na:"
+
+#: rules/base.xml.in.h:382
+#, fuzzy
+msgid "US keyboard with Maltian letters"
+msgstr "Mwandikisho Na:"
+
+#: rules/base.xml.in.h:383
+#, fuzzy
+msgid "US keyboard with Romanian letters"
+msgstr "Mwandikisho Na:"
+
+#: rules/base.xml.in.h:384
+msgid "USA"
+msgstr "Amerika"
+
+#: rules/base.xml.in.h:385
+msgid "Ukr"
+msgstr ""
+
+#: rules/base.xml.in.h:386
+msgid "Ukraine"
+msgstr "Ikerene"
+
+#. RSTU 2019-91
+#: rules/base.xml.in.h:388
+#, fuzzy
+msgid "Ukrainian standard RSTU"
+msgstr "Bisanzwe"
+
+#: rules/base.xml.in.h:389
+msgid "UnicodeExpert"
+msgstr ""
+
+#: rules/base.xml.in.h:390
+msgid "United Kingdom"
+msgstr "Ubwongereza (UK)"
+
+#: rules/base.xml.in.h:391
+msgid "Urd"
+msgstr ""
+
+#: rules/base.xml.in.h:392
+msgid "Urdu"
+msgstr "Urudu"
+
+#: rules/base.xml.in.h:393
+#, fuzzy
+msgid "Use keyboard LED to show alternative group."
+msgstr "Mwandikisho Kuri Garagaza Itsinda"
+
+#: rules/base.xml.in.h:394
+msgid "Uzb"
+msgstr ""
+
+#: rules/base.xml.in.h:395
+msgid "Uzbekistan"
+msgstr "Uzubekisitani"
+
+# setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.121.text
+#: rules/base.xml.in.h:396
+msgid "Vietnam"
+msgstr "Viyetinamu"
+
+#: rules/base.xml.in.h:397
+msgid "Vnm"
+msgstr ""
+
+#: rules/base.xml.in.h:398
+msgid "Winbook Model XP5"
+msgstr ""
+
+#: rules/base.xml.in.h:399
+msgid "Winkeys"
+msgstr ""
+
+#: rules/base.xml.in.h:400
+#, fuzzy
+msgid "With &lt;\\|&gt; key"
+msgstr "Urufunguzo"
+
+#: rules/base.xml.in.h:401
+msgid "With Malayalam digits"
+msgstr ""
+
+#: rules/base.xml.in.h:402
+msgid "With guillemots"
+msgstr ""
+
+#: rules/base.xml.in.h:403
+msgid "Yahoo! Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:404
+#, fuzzy
+msgid "Z and ZHE swapped"
+msgstr "Na"
+
+#: rules/base.xml.in.h:405
+msgid "azerty"
+msgstr ""
+
+#: rules/base.xml.in.h:406
+msgid "azerty/digits"
+msgstr ""
+
+#: rules/base.xml.in.h:407
+msgid "digits"
+msgstr ""
+
+#: rules/base.xml.in.h:408
+msgid "lyx"
+msgstr ""
+
+#: rules/base.xml.in.h:409
+msgid "qwerty"
+msgstr ""
+
+#: rules/base.xml.in.h:410
+#, fuzzy
+msgid "qwerty, extended Backslash"
+msgstr "Byongerewe..."
+
+#: rules/base.xml.in.h:411
+msgid "qwerty/digits"
+msgstr ""
+
+#: rules/base.xml.in.h:412
+msgid "qwertz"
+msgstr ""
+
+#: rules/base.xml.in.h:413
+msgid "si1452"
+msgstr ""
diff --git a/xorg-server/xkbdata.src/po/sk.po b/xorg-server/xkbdata.src/po/sk.po
new file mode 100644
index 000000000..fe53d5b61
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/sk.po
@@ -0,0 +1,2781 @@
+# Slovak translation of xkeyboard-config
+# Copyright (C) 2003 Free Software Foundation
+# Zdenko Podobný <zdpo@mailbox.sk>, 2003.
+# Ivan Masár <helix84@centrum.sk>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.0-pre1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-06-28 15:21+0100\n"
+"PO-Revision-Date: 2007-09-04 22:49+0100\n"
+"Last-Translator: Zdenko Podobný <zdpo@mailbox.sk>\n"
+"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.2beta3\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(Zastaralé) alternatívne"
+
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Zastaralé) alternatívne, s mŕtvymi klávesmi Sun"
+
+#: ../rules/base.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Zastaralé) alternatívne, eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:5
+msgid "(Legacy) Dvorak"
+msgstr "(Zastaralé) dvorak"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/104 key Compatible"
+msgstr "Kompatibilná s 101/104 klávesami"
+
+#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/�iarka/mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/�iarka/eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/bodka/mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/bodka/eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/�iarka/mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/�iarka/eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/bodka/mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/bodka/eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/�iarka/mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/�iarka/eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/bodka/mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/bodka/eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/�iarka/mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/�iarka/eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/bodka/mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/bodka/eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:23
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:24
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:25
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:26
+msgid "ACPI Standard"
+msgstr "Å tandard ACPI"
+
+# gruzínske rozloženie
+#: ../rules/base.xml.in.h:27
+msgid "AZERTY Tskapo"
+msgstr "AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:28
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:29
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:30
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:31
+msgid "Acer TravelMate 800"
+msgstr "Acer TravelMate 800"
+
+#: ../rules/base.xml.in.h:32
+msgid "Add the EuroSign to the 2 key."
+msgstr "Pridať znak euro na kláves 2."
+
+#: ../rules/base.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "Pridať znak euro na kláves 5."
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "Pridať znak euro na kláves E."
+
+#: ../rules/base.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "Pridať štandardné chovanie klávesu Ponuka."
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Pridať znak euro na isté klávesy."
+
+#: ../rules/base.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38
+msgid "Afg"
+msgstr "Afg"
+
+#: ../rules/base.xml.in.h:39
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+#: ../rules/base.xml.in.h:40
+msgid "Akan"
+msgstr "Akan"
+
+#: ../rules/base.xml.in.h:41
+msgid "Alb"
+msgstr "Alb"
+
+#: ../rules/base.xml.in.h:42
+msgid "Albania"
+msgstr "Albánsko"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt a Meta sú na klávesoch Alt."
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Meta je mapovaný na pravý kláves Win a Super na Ponuku."
+
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Alt+Caps Lock mení rozloženie."
+
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+Control mení rozloženie."
+
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Alt+Shift mení rozloženie."
+
+#: ../rules/base.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Chovanie klávesu Alt/Win"
+
+#: ../rules/base.xml.in.h:50
+msgid "Alternative"
+msgstr "alternatívne"
+
+#: ../rules/base.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "alternatívne východné"
+
+#: ../rules/base.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "alternatívne fonetické"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "alternatívne medzinárodné (býv. us_intl)"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "alternatívne, mŕtve klávesy Sun"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "alternatívne, eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "alternatívne, iba latin-9"
+
+#: ../rules/base.xml.in.h:57
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:58
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../rules/base.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "Variant (') apostrof"
+
+#: ../rules/base.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Apple laptop"
+
+#: ../rules/base.xml.in.h:62
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:63
+msgid "Arabic"
+msgstr "Arabsky"
+
+#: ../rules/base.xml.in.h:64
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:65
+msgid "Armenia"
+msgstr "Arménsko"
+
+#: ../rules/base.xml.in.h:66
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:67
+msgid "Azerbaijan"
+msgstr "Azerbajdžan"
+
+#: ../rules/base.xml.in.h:68
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 bezdrôtová internetová klávesnica"
+
+#: ../rules/base.xml.in.h:69
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:70
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:71
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:72
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:73
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:74
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:75
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:76
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:77
+msgid "Bangladesh"
+msgstr "Bangladéš"
+
+#: ../rules/base.xml.in.h:78 ../rules/sun.xml.in.h:22
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:79
+msgid "Belarus"
+msgstr "Bielorusko"
+
+#: ../rules/base.xml.in.h:80
+msgid "Belgium"
+msgstr "Belgicko"
+
+#: ../rules/base.xml.in.h:81
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:82
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:83
+msgid "Bengali"
+msgstr "Bengálska"
+
+#: ../rules/base.xml.in.h:84
+msgid "Bengali Probhat"
+msgstr "Bengálsky Probhat"
+
+#: ../rules/base.xml.in.h:85
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonomické, na spôsob Dvorak"
+
+#: ../rules/base.xml.in.h:86
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonomické, na spôsob Dvorak, iba latin-9"
+
+#: ../rules/base.xml.in.h:87 ../rules/sun.xml.in.h:24
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:88
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bhutan"
+msgstr "Bhután"
+
+#: ../rules/base.xml.in.h:90
+msgid "Biblical Hebrew (Tiro)"
+msgstr "biblická hebrej�ina (Tiro)"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:92
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:93
+msgid "Bosnia and Herzegovina"
+msgstr "Bosna a Hercegovina"
+
+#: ../rules/base.xml.in.h:94
+msgid "Both Alt keys together change layout."
+msgstr "Oba klávesy Alt spolu menia rozloženie."
+
+#: ../rules/base.xml.in.h:95
+msgid "Both Ctrl keys together change layout."
+msgstr "Oba klávesy Ctrl spolu menia rozloženie."
+
+#: ../rules/base.xml.in.h:96
+msgid "Both Shift keys together change layout."
+msgstr "Oba klávesy Shift spolu menia rozloženie."
+
+#: ../rules/base.xml.in.h:97
+msgid "Both Win-keys switch layout while pressed."
+msgstr "Oba klávesy Win spolu menia rozloženie."
+
+#: ../rules/base.xml.in.h:98
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:99
+msgid "Braille"
+msgstr "Brailleovo"
+
+#: ../rules/base.xml.in.h:100
+msgid "Brazil"
+msgstr "Brazília"
+
+#: ../rules/base.xml.in.h:101
+msgid "Brazilian ABNT2"
+msgstr "Brazílska ABNT2"
+
+#: ../rules/base.xml.in.h:102
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:103
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:104
+msgid "Buckwalter"
+msgstr "Buckwalter (transliterácia arab�iny)"
+
+#: ../rules/base.xml.in.h:105
+msgid "Bulgaria"
+msgstr "Bulharsko"
+
+#: ../rules/base.xml.in.h:106
+msgid "Cambodia"
+msgstr "Kambodža"
+
+#: ../rules/base.xml.in.h:107 ../rules/sun.xml.in.h:29
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:108
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rules/base.xml.in.h:109
+msgid "Caps Lock is Compose."
+msgstr "Caps Lock je Compose."
+
+#: ../rules/base.xml.in.h:110
+msgid "CapsLock LED shows alternative layout."
+msgstr "Caps Lock LED zobrazuje alternatívne rozloženie."
+
+#: ../rules/base.xml.in.h:111
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "Caps Lock funguje ako Shift s uzamknutím. Shift „pozastaví“ Caps Lock."
+
+#: ../rules/base.xml.in.h:112
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "Caps Lock funguje ako Shift s uzamknutím. Shift neovplyvňuje Caps Lock."
+
+#: ../rules/base.xml.in.h:113
+msgid "CapsLock just locks the Shift modifier."
+msgstr "CapsLock iba zamkne modifikátor Shift."
+
+#: ../rules/base.xml.in.h:114 ../rules/sun.xml.in.h:33
+msgid "CapsLock key behavior"
+msgstr "Správanie klávesu Caps Lock"
+
+#: ../rules/base.xml.in.h:115
+msgid "CapsLock key changes layout."
+msgstr "Kláves Caps Lock mení rozloženie."
+
+#: ../rules/base.xml.in.h:116
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "Caps Lock prepne Shift, �ím ovplyvní všetky klávesy."
+
+#: ../rules/base.xml.in.h:117
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "Caps Lock prepne nermálnu kapitalizáciu abecedných znakov."
+
+#: ../rules/base.xml.in.h:118
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "Caps Lock používa interný prevod na kapitálky. Shift „pozastaví“ Caps Lock."
+
+#: ../rules/base.xml.in.h:119
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "Caps Lock používa interný prevod na kapitálky. Shift neovplyvňuje Caps Lock."
+
+#: ../rules/base.xml.in.h:120
+msgid "Catalan variant with middle-dot L"
+msgstr "Katalánsky variant s L s bodkou v strede"
+
+#: ../rules/base.xml.in.h:121
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:122
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:123
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternatívna voľba)"
+
+#: ../rules/base.xml.in.h:124
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:125
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:126
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:127
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:128
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:129
+msgid "Chuvash"
+msgstr "Čuvašské"
+
+#: ../rules/base.xml.in.h:130
+msgid "Chuvash Latin"
+msgstr "Čuvašské latin"
+
+#: ../rules/base.xml.in.h:131
+msgid "Classic Dvorak"
+msgstr "Klasické dvorak"
+
+#: ../rules/base.xml.in.h:132
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:133
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:134
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 kláves)"
+
+#: ../rules/base.xml.in.h:135
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 kláves)"
+
+#: ../rules/base.xml.in.h:136
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 kláves)"
+
+#: ../rules/base.xml.in.h:137
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:138
+msgid "Compose key position"
+msgstr "Pozícia klávesu Compose"
+
+#: ../rules/base.xml.in.h:139
+msgid "Congo, Democratic Republic of the"
+msgstr "Konžská demokratická republika"
+
+#: ../rules/base.xml.in.h:140
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "Control je mapovaný na klávesy Win (a zvy�ajné klávesy Ctrl)."
+
+#: ../rules/base.xml.in.h:141
+msgid "Croatia"
+msgstr "Chorvátsko"
+
+#: ../rules/base.xml.in.h:142
+msgid "Ctrl key at bottom left"
+msgstr "Kláves Ctrl vľavo dole"
+
+#: ../rules/base.xml.in.h:143
+msgid "Ctrl key at left of 'A'"
+msgstr "Kláves Ctrl naľavo od „A“"
+
+#: ../rules/base.xml.in.h:144
+msgid "Ctrl key position"
+msgstr "Pozícia klávesu Ctrl"
+
+#: ../rules/base.xml.in.h:145
+msgid "Ctrl+Shift change layout."
+msgstr "Ctrl+Shift mení rozloženie."
+
+#: ../rules/base.xml.in.h:146
+msgid "Cyrillic"
+msgstr "azbuka"
+
+#: ../rules/base.xml.in.h:147 ../rules/sun.xml.in.h:39
+msgid "Cze"
+msgstr "ÄŒes"
+
+#: ../rules/base.xml.in.h:148
+msgid "Czechia"
+msgstr "ÄŒesko"
+
+#: ../rules/base.xml.in.h:149
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:150
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:151 ../rules/sun.xml.in.h:42
+msgid "Dead acute"
+msgstr "mŕtvy dĺžeň"
+
+#: ../rules/base.xml.in.h:152 ../rules/sun.xml.in.h:43
+msgid "Dead grave acute"
+msgstr "mŕtvy opa�ný dĺžeň"
+
+#: ../rules/base.xml.in.h:153
+msgid "Default numeric keypad keys."
+msgstr "Štandardné klávesy numerickej klávesnice."
+
+#: ../rules/base.xml.in.h:154
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:155
+msgid "Dell 101-key PC"
+msgstr "DELL PC 101 kláves"
+
+#: ../rules/base.xml.in.h:156
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:157
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Laptop/notebook Precision série M"
+
+#: ../rules/base.xml.in.h:158
+msgid "Dell Latitude series laptop"
+msgstr "Laptop série Dell Latitude"
+
+#: ../rules/base.xml.in.h:159
+msgid "Dell SK-8125 USB Multimedia Keybard"
+msgstr "Dell SK-8125 USB multimediálna klávesnica"
+
+#: ../rules/base.xml.in.h:160
+msgid "Dell SK-8135 USB Multimedia Keybard"
+msgstr "Dell SK-8135 USB multimediálna klávesnica"
+
+#: ../rules/base.xml.in.h:161
+msgid "Dell USB Multimedia Keybard"
+msgstr "Dell USB multimediálna klávesnica"
+
+#: ../rules/base.xml.in.h:162
+msgid "Denmark"
+msgstr "Dánsko"
+
+#: ../rules/base.xml.in.h:163 ../rules/sun.xml.in.h:44
+msgid "Deu"
+msgstr "Nem"
+
+#: ../rules/base.xml.in.h:164
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:165
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond séria 9801 / 9802"
+
+#: ../rules/base.xml.in.h:166 ../rules/sun.xml.in.h:46
+msgid "Dnk"
+msgstr "Dán"
+
+# rozloženie klávesnice
+#: ../rules/base.xml.in.h:167 ../rules/sun.xml.in.h:48
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:168
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak, poľské úvodzovky na klávese „1/!“"
+
+#: ../rules/base.xml.in.h:169
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, poľské úvodzovky na klávese úvodzoviek"
+
+#: ../rules/base.xml.in.h:170
+msgid "Eastern"
+msgstr "východné"
+
+#: ../rules/base.xml.in.h:171 ../rules/sun.xml.in.h:49
+msgid "Eliminate dead keys"
+msgstr "Eliminovať mrtvé kláves"
+
+#: ../rules/base.xml.in.h:172
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:173
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:174
+msgid "Ergonomic"
+msgstr "ergonomické"
+
+#: ../rules/base.xml.in.h:175 ../rules/sun.xml.in.h:50
+msgid "Esp"
+msgstr "Å pa"
+
+#: ../rules/base.xml.in.h:176
+msgid "Esperanto"
+msgstr "esperanto"
+
+#: ../rules/base.xml.in.h:177
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:178
+msgid "Estonia"
+msgstr "Estónsko"
+
+#: ../rules/base.xml.in.h:179
+msgid "Eth"
+msgstr "Eth"
+
+#: ../rules/base.xml.in.h:180
+msgid "Ethiopia"
+msgstr "Etiópia"
+
+#: ../rules/base.xml.in.h:181
+msgid "Evdev-managed keyboard"
+msgstr "Klávesnica spravovaná Evdev"
+
+#: ../rules/base.xml.in.h:182
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:183
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:184
+msgid "Extended"
+msgstr "rozšírené"
+
+#: ../rules/base.xml.in.h:185
+msgid "Extended Backslash"
+msgstr "Široký backslash"
+
+#: ../rules/base.xml.in.h:186
+msgid "F-letter (F) variant"
+msgstr "variant písmena F"
+
+#: ../rules/base.xml.in.h:187
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:188
+msgid "Faroe Islands"
+msgstr "Faerské ostrovy"
+
+#: ../rules/base.xml.in.h:189 ../rules/sun.xml.in.h:51
+msgid "Fin"
+msgstr "Fín"
+
+#: ../rules/base.xml.in.h:190
+msgid "Finland"
+msgstr "Fínsko"
+
+#: ../rules/base.xml.in.h:191
+msgid "Force standard legacy keypad"
+msgstr "Vynútiť štandardnú zastaralú numerickú klávesnicu"
+
+#: ../rules/base.xml.in.h:192 ../rules/sun.xml.in.h:53
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:193
+msgid "France"
+msgstr "Francúzsko"
+
+#: ../rules/base.xml.in.h:194 ../rules/sun.xml.in.h:55
+msgid "French"
+msgstr "Francúzske"
+
+#: ../rules/base.xml.in.h:195
+msgid "French (Macintosh)"
+msgstr "Francúzske (Macintosh)"
+
+#: ../rules/base.xml.in.h:196 ../rules/sun.xml.in.h:56
+msgid "French (legacy)"
+msgstr "Francúzske (zastaralé)"
+
+#: ../rules/base.xml.in.h:197
+msgid "French Dvorak"
+msgstr "Francúzske dvorak"
+
+#: ../rules/base.xml.in.h:198
+msgid "French, Sun dead keys"
+msgstr "Francúzske, mŕtve klávesy Sun"
+
+#: ../rules/base.xml.in.h:199
+msgid "French, eliminate dead keys"
+msgstr "Francúzske, eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:200
+msgid "Fula"
+msgstr "fulb�ina"
+
+#: ../rules/base.xml.in.h:201
+msgid "GBr"
+msgstr "VBr"
+
+#: ../rules/base.xml.in.h:202
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:203
+msgid "Generic 101-key PC"
+msgstr "všeobecná PC 101 kláves"
+
+#: ../rules/base.xml.in.h:204
+msgid "Generic 102-key (Intl) PC"
+msgstr "všeobecná PC 102 kláves (medz.)"
+
+#: ../rules/base.xml.in.h:205
+msgid "Generic 104-key PC"
+msgstr "všeobecná PC 104 kláves"
+
+#: ../rules/base.xml.in.h:206
+msgid "Generic 105-key (Intl) PC"
+msgstr "všeobecná 105-kláv. (medzinár.) PC"
+
+#: ../rules/base.xml.in.h:207
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:208
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:209
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:210
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:211
+msgid "Geo"
+msgstr "Gru"
+
+#: ../rules/base.xml.in.h:212
+msgid "Georgia"
+msgstr "Gruzínsko"
+
+#: ../rules/base.xml.in.h:213
+msgid "German (Macintosh)"
+msgstr "Nemecké (Macintosh)"
+
+#: ../rules/base.xml.in.h:214
+msgid "German, Sun dead keys"
+msgstr "Nemecké, mŕtve klávesy Sun"
+
+#: ../rules/base.xml.in.h:215
+msgid "German, eliminate dead keys"
+msgstr "Francúzske, eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:216
+msgid "Germany"
+msgstr "Nemecko"
+
+#: ../rules/base.xml.in.h:217
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:218
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../rules/base.xml.in.h:219
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:220
+msgid "Greece"
+msgstr "Grécko"
+
+#: ../rules/base.xml.in.h:221
+msgid "Gujarati"
+msgstr "Gudžarátska"
+
+#: ../rules/base.xml.in.h:222
+msgid "Gurmukhi"
+msgstr "Gurmuchské"
+
+# je firma
+#: ../rules/base.xml.in.h:223
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:224
+msgid "Hausa"
+msgstr "hauské"
+
+#: ../rules/base.xml.in.h:225
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:226
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:227
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:228
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:229
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:230
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:231
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:232
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:233
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:234
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+# bolnagri je vstupná metóda
+#: ../rules/base.xml.in.h:235
+msgid "Hindi Bolnagri"
+msgstr "hindské bolnagri"
+
+#: ../rules/base.xml.in.h:236
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:237
+msgid "Hrv"
+msgstr "Chor"
+
+#: ../rules/base.xml.in.h:238 ../rules/sun.xml.in.h:59
+msgid "Hun"
+msgstr "Ma�"
+
+#: ../rules/base.xml.in.h:239
+msgid "Hungary"
+msgstr "Ma�arsko"
+
+#: ../rules/base.xml.in.h:240
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper je mapovaný na Win-klávesy."
+
+#: ../rules/base.xml.in.h:241
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:242
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:243
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:244
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (alternatívna voľba)"
+
+#: ../rules/base.xml.in.h:245
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:246
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:247 ../rules/sun.xml.in.h:61
+msgid "ISO Alternate"
+msgstr "ISO alternatívne"
+
+#: ../rules/base.xml.in.h:248
+msgid "Iceland"
+msgstr "Island"
+
+#: ../rules/base.xml.in.h:249
+msgid "Igbo"
+msgstr "igbo"
+
+#: ../rules/base.xml.in.h:250
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:251
+msgid "India"
+msgstr "India"
+
+#: ../rules/base.xml.in.h:252 ../rules/sun.xml.in.h:62
+msgid "International (with dead keys)"
+msgstr "Medzinárodné (s mŕtvymi klávesmi)"
+
+#: ../rules/base.xml.in.h:253
+msgid "Inuktitut"
+msgstr "inuktitut"
+
+#: ../rules/base.xml.in.h:254
+msgid "Iran"
+msgstr "Irán"
+
+#: ../rules/base.xml.in.h:255
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../rules/base.xml.in.h:256
+msgid "Ireland"
+msgstr "�rsko"
+
+#: ../rules/base.xml.in.h:257
+msgid "Irl"
+msgstr "Irs"
+
+#: ../rules/base.xml.in.h:258
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:259
+msgid "Irq"
+msgstr "Irq"
+
+#: ../rules/base.xml.in.h:260
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:261
+msgid "Isr"
+msgstr "Izr"
+
+#: ../rules/base.xml.in.h:262
+msgid "Israel"
+msgstr "Izrael"
+
+#: ../rules/base.xml.in.h:263 ../rules/sun.xml.in.h:63
+msgid "Ita"
+msgstr "Tal"
+
+#: ../rules/base.xml.in.h:264
+msgid "Italy"
+msgstr "Taliansko"
+
+#: ../rules/base.xml.in.h:265
+msgid "Japan"
+msgstr "Japonsko"
+
+#: ../rules/base.xml.in.h:266
+msgid "Japan (PC-98xx Series)"
+msgstr "Japonské (séria PC-98xx)"
+
+#: ../rules/base.xml.in.h:267
+msgid "Japanese 106-key"
+msgstr "Japonské 106 kláves"
+
+#: ../rules/base.xml.in.h:268
+msgid "Japanese keyboard options"
+msgstr "Japonské možnosti klávesnice"
+
+#: ../rules/base.xml.in.h:269 ../rules/sun.xml.in.h:66
+msgid "Jpn"
+msgstr "Jpn"
+
+# Kana is a general term for the syllabic Japanese scripts hiragana (�ら��) and katakana (カタカナ) as well as the old system known as man'y�gana.
+#: ../rules/base.xml.in.h:270
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:271
+msgid "Kana Lock key is locking"
+msgstr "Kláves Kana Lock zamyká"
+
+#: ../rules/base.xml.in.h:272
+msgid "Kannada"
+msgstr "Kannadské"
+
+#: ../rules/base.xml.in.h:273
+msgid "Kashubian"
+msgstr "kašub�ina"
+
+#: ../rules/base.xml.in.h:274
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:275
+msgid "Kazakh with Russian"
+msgstr "Kazašské s ruštinou"
+
+#: ../rules/base.xml.in.h:276
+msgid "Kazakhstan"
+msgstr "Kazachstan"
+
+#: ../rules/base.xml.in.h:277
+msgid "Keypad"
+msgstr "Numerická klávesnica"
+
+#: ../rules/base.xml.in.h:278
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:279
+msgid "Khm"
+msgstr "Khm"
+
+#: ../rules/base.xml.in.h:280
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:281
+msgid "Korea, Republic of"
+msgstr "Kórejská republika"
+
+#: ../rules/base.xml.in.h:282
+msgid "Korean 106-key"
+msgstr "Kórejské, 106 kláves"
+
+# fínske rozloženie
+# http://kotoistus.tksoft.com/linux/index-en.html
+#: ../rules/base.xml.in.h:283
+msgid "Kotoistus"
+msgstr "Kotoistus"
+
+#: ../rules/base.xml.in.h:284
+msgid "Kurdish, (F)"
+msgstr "Kurdské, (F)"
+
+#: ../rules/base.xml.in.h:285
+msgid "Kurdish, Arabic-Latin"
+msgstr "kurd�ina, arabsko-latinské"
+
+#: ../rules/base.xml.in.h:286
+msgid "Kurdish, Latin Alt-Q"
+msgstr "kurd�ina, latinské Alt-Q"
+
+#: ../rules/base.xml.in.h:287
+msgid "Kurdish, Latin Q"
+msgstr "kurd�ina, latinské Q"
+
+#: ../rules/base.xml.in.h:288
+msgid "Kyr"
+msgstr "Kyr"
+
+#: ../rules/base.xml.in.h:289
+msgid "Kyrgyzstan"
+msgstr "Kirgizsko"
+
+#: ../rules/base.xml.in.h:290
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:291
+msgid "LCtrl+LShift change layout."
+msgstr "ľavý Ctrl+ľavý Shift mení rozloženie."
+
+#: ../rules/base.xml.in.h:292
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:293
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:294
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq (napr. Armada) Laptop Keyboard"
+
+#: ../rules/base.xml.in.h:295
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq (napr. Presario) Internet Keyboard"
+
+#: ../rules/base.xml.in.h:296
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Laptop/notebook eMachines m68xx"
+
+#: ../rules/base.xml.in.h:297
+msgid "Latin"
+msgstr "Latinské"
+
+#: ../rules/base.xml.in.h:298
+msgid "Latin American"
+msgstr "Latinskoamerické"
+
+#: ../rules/base.xml.in.h:299
+msgid "Latin Unicode"
+msgstr "Latinské Unicode"
+
+#: ../rules/base.xml.in.h:300
+msgid "Latin Unicode qwerty"
+msgstr "Latinské Unicode qwerty"
+
+#: ../rules/base.xml.in.h:301
+msgid "Latin qwerty"
+msgstr "Latinské qwerty"
+
+# « »
+#: ../rules/base.xml.in.h:302
+msgid "Latin with guillemets"
+msgstr "Latinské s uhlovými zátvorkami"
+
+#: ../rules/base.xml.in.h:303
+msgid "Latvia"
+msgstr "Lotyšsko"
+
+#: ../rules/base.xml.in.h:304
+msgid "Layout switching"
+msgstr "Prepínanie rozloženia"
+
+#: ../rules/base.xml.in.h:305
+msgid "Left Alt is swapped with left Win-key."
+msgstr "Ľavý Alt je vymenený s ľavým klávesom Win."
+
+#: ../rules/base.xml.in.h:306
+msgid "Left Alt key changes layout."
+msgstr "Ľavý kláves Alt mení rozloženie."
+
+#: ../rules/base.xml.in.h:307
+msgid "Left Alt key switches layout while pressed."
+msgstr "Ľavý kláves Alt prepína rozloženie pri stla�ení."
+
+#: ../rules/base.xml.in.h:308
+msgid "Left Ctrl key changes layout."
+msgstr "Ľavý kláves Ctrl mení rozloženie."
+
+#: ../rules/base.xml.in.h:309
+msgid "Left Shift key changes layout."
+msgstr "Ľavý kláves Shift mení rozloženie."
+
+#: ../rules/base.xml.in.h:310
+msgid "Left Win-key changes layout."
+msgstr "Ľavý kláves Win mení rozloženie."
+
+#: ../rules/base.xml.in.h:311
+msgid "Left Win-key is Compose."
+msgstr "Ľavý kláves Win je Compose."
+
+#: ../rules/base.xml.in.h:312
+msgid "Left Win-key switches layout while pressed."
+msgstr "Ľavý kláves Win prepína rozloženie pri stla�ení."
+
+#: ../rules/base.xml.in.h:313
+msgid "Left hand"
+msgstr "ľavá ruka"
+
+#: ../rules/base.xml.in.h:314
+msgid "Left handed Dvorak"
+msgstr "ľavá ruka dvorak"
+
+#: ../rules/base.xml.in.h:315
+msgid "Lithuania"
+msgstr "Litva"
+
+#: ../rules/base.xml.in.h:316
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:317
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:318
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:319
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:320
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:321
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: ../rules/base.xml.in.h:322
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (alternatívna voľba)"
+
+#: ../rules/base.xml.in.h:323
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (alternatívna voľba2)"
+
+#: ../rules/base.xml.in.h:324
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:325
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:326
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 extra klávesy pomocou G15daemon"
+
+#: ../rules/base.xml.in.h:327
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:328
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:329
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:330
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:331
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:332
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:333
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:334
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+#: ../rules/base.xml.in.h:335
+msgid "Ltu"
+msgstr "Lit"
+
+#: ../rules/base.xml.in.h:336
+msgid "Lva"
+msgstr "Lot"
+
+#: ../rules/base.xml.in.h:337
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:338
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:339
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (medzin)"
+
+#: ../rules/base.xml.in.h:340
+msgid "Macedonia"
+msgstr "Macedónsko"
+
+#: ../rules/base.xml.in.h:341
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:342
+msgid "Macintosh Old"
+msgstr "Macintosh staré"
+
+#: ../rules/base.xml.in.h:343
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, mŕtve klávesy Sun"
+
+#: ../rules/base.xml.in.h:344
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:345
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Urobiť z CapsLock �alší Ctrl."
+
+#: ../rules/base.xml.in.h:346
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:347
+msgid "Malayalam"
+msgstr "Malajalámske"
+
+#: ../rules/base.xml.in.h:348
+msgid "Maldives"
+msgstr "Maldivy"
+
+#: ../rules/base.xml.in.h:349
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:350
+msgid "Maltese keyboard with US layout"
+msgstr "Maltézska klávesnica s rozložením USA"
+
+#: ../rules/base.xml.in.h:351
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:352
+msgid "Maori"
+msgstr "maor�ina"
+
+#: ../rules/base.xml.in.h:353
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:354
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:355
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:356
+msgid "Menu is Compose."
+msgstr "Ponuka je Compose."
+
+#: ../rules/base.xml.in.h:357
+msgid "Menu key changes layout."
+msgstr "Kláves Ponuka mení rozloženie."
+
+#: ../rules/base.xml.in.h:358
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta je mapovaný na Win-klávesy."
+
+#: ../rules/base.xml.in.h:359
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta je mapovaný na ľavý Win-kláves."
+
+#: ../rules/base.xml.in.h:360
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:361
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Švédska"
+
+#: ../rules/base.xml.in.h:362
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:363
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:364
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:365
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:366
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:367
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:368 ../rules/sun.xml.in.h:72
+msgid "Miscellaneous compatibility options"
+msgstr "Dodato�né voľby pre kompatibilitu"
+
+#: ../rules/base.xml.in.h:369
+msgid "Mkd"
+msgstr "Mak"
+
+#: ../rules/base.xml.in.h:370
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:371
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:372
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:373
+msgid "Mongolia"
+msgstr "Mongolsko"
+
+#: ../rules/base.xml.in.h:374
+msgid "Morocco"
+msgstr "Maroko"
+
+#: ../rules/base.xml.in.h:375 ../rules/sun.xml.in.h:73
+msgid "Multilingual"
+msgstr "Viacjazy�né"
+
+#: ../rules/base.xml.in.h:376
+msgid "Multilingual, first part"
+msgstr "Viacjazy�né, prvá �asť"
+
+#: ../rules/base.xml.in.h:377 ../rules/sun.xml.in.h:74
+msgid "Multilingual, second part"
+msgstr "Viacjazy�né, druhá �asť"
+
+#: ../rules/base.xml.in.h:378
+msgid "Myanmar"
+msgstr "Mjanmarsko"
+
+#: ../rules/base.xml.in.h:379
+msgid "NICOLA-F style Backspace"
+msgstr "Backspace v štýle NICOLA-F"
+
+#: ../rules/base.xml.in.h:380
+msgid "Neostyle"
+msgstr "Neoštýl"
+
+#: ../rules/base.xml.in.h:381
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:382
+msgid "Nepal"
+msgstr "Nepál"
+
+#: ../rules/base.xml.in.h:383
+msgid "Netherlands"
+msgstr "Holandsko"
+
+#: ../rules/base.xml.in.h:384
+msgid "Nig"
+msgstr "Nig"
+
+#: ../rules/base.xml.in.h:385
+msgid "Nigeria"
+msgstr "Nigéria"
+
+#: ../rules/base.xml.in.h:386
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:387 ../rules/sun.xml.in.h:75
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:388
+msgid "Northern Saami"
+msgstr "severná saam�ina"
+
+#: ../rules/base.xml.in.h:389
+msgid "Northern Saami, eliminate dead keys"
+msgstr "severná saam�ina, eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:390
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:391
+msgid "Norway"
+msgstr "Nórsko"
+
+#: ../rules/base.xml.in.h:392
+msgid "NumLock LED shows alternative layout."
+msgstr "Num Lock LED zobrazuje alternatívne rozloženie."
+
+#: ../rules/base.xml.in.h:393
+msgid "Numeric keypad keys work as with Mac."
+msgstr "Numerická klávesnica funguje ako na Mac."
+
+#: ../rules/base.xml.in.h:394
+msgid "Numeric keypad layout selection"
+msgstr "Výber rozloženia numerickej klávesnice"
+
+#: ../rules/base.xml.in.h:395
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:396
+msgid "Ogham"
+msgstr "Oghamské"
+
+#: ../rules/base.xml.in.h:397
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:398
+msgid "Oriya"
+msgstr "uríj�ina"
+
+#: ../rules/base.xml.in.h:399
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/internetová klávesnica"
+
+#: ../rules/base.xml.in.h:400
+msgid "Ossetian"
+msgstr "Osetské"
+
+#: ../rules/base.xml.in.h:401
+msgid "Ossetian, Winkeys"
+msgstr "Osetské, klávesy Win"
+
+#: ../rules/base.xml.in.h:402
+msgid "PC-98xx Series"
+msgstr "Séria PC-98xx"
+
+#: ../rules/base.xml.in.h:403
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:404
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:405
+msgid "Pashto"
+msgstr "pašt�ina"
+
+# thajské rozloženie
+#: ../rules/base.xml.in.h:406
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:407 ../rules/sun.xml.in.h:78
+msgid "Phonetic"
+msgstr "Fonetické"
+
+#: ../rules/base.xml.in.h:408 ../rules/sun.xml.in.h:79
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:409
+msgid "Poland"
+msgstr "Poľsko"
+
+#: ../rules/base.xml.in.h:410
+msgid "Polytonic"
+msgstr "Polytónické"
+
+#: ../rules/base.xml.in.h:411
+msgid "Portugal"
+msgstr "Portugalsko"
+
+#: ../rules/base.xml.in.h:412
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Stla�enie ľavého klávesu Alt vyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:413
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Stla�enie ľavého klávesu Win vyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:414
+msgid "Press Menu key to choose 3rd level."
+msgstr "Stla�enie klávesu Ponuka vyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:415
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "Stla�enie pravého klávesu Alt vyberá 3. úroveň, Shift+pravý kláves Alt key je Multi_Key."
+
+#: ../rules/base.xml.in.h:416
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Stla�enie pravého klávesu Alt vyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:417
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Stla�enie pravého Ctrl vyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:418
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Stla�enie pravého klávesu Win vyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:419
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Stla�enie ľubovoľného klávesu Alt vyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:420
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Stla�enie ľubovoľného klávesu Win vyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:421
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:422
+msgid "Pro Keypad"
+msgstr "Pro Keypad"
+
+#: ../rules/base.xml.in.h:423
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:424
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:425 ../rules/sun.xml.in.h:88
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:426
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:427
+msgid "R-Alt switches layout while pressed."
+msgstr "Pravý kláves Alt prepína rozloženie pri stla�ení."
+
+#: ../rules/base.xml.in.h:428
+msgid "Right Alt is Compose."
+msgstr "Pravý Alt je Compose."
+
+#: ../rules/base.xml.in.h:429
+msgid "Right Alt key changes layout."
+msgstr "Pravý kláves Alt mení rozloženie."
+
+#: ../rules/base.xml.in.h:430 ../rules/sun.xml.in.h:90
+msgid "Right Alt key never chooses 3rd level."
+msgstr "Pravý kláves Alt nikdy nevyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:431
+msgid "Right Ctrl is Compose."
+msgstr "Pravý Alt je Compose."
+
+#: ../rules/base.xml.in.h:432
+msgid "Right Ctrl key changes layout."
+msgstr "Pravý kláves Ctrl mení rozloženie."
+
+#: ../rules/base.xml.in.h:433
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "Pravý kláves Win prepína rozloženie pri stla�ení."
+
+#: ../rules/base.xml.in.h:434
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Pravý kláves Control funguje ako pravý Alt."
+
+#: ../rules/base.xml.in.h:435
+msgid "Right Shift key changes layout."
+msgstr "Pravý kláves Shift mení rozloženie."
+
+#: ../rules/base.xml.in.h:436
+msgid "Right Win-key changes layout."
+msgstr "Pravý kláves Win mení rozloženie."
+
+#: ../rules/base.xml.in.h:437
+msgid "Right Win-key is Compose."
+msgstr "Pravý kláves Win je Compose"
+
+#: ../rules/base.xml.in.h:438
+msgid "Right Win-key switches layout while pressed."
+msgstr "Pravý kláves Win prepína rozloženie pri stla�ení."
+
+#: ../rules/base.xml.in.h:439
+msgid "Right hand"
+msgstr "pravá ruka"
+
+#: ../rules/base.xml.in.h:440
+msgid "Right handed Dvorak"
+msgstr "pravá ruka dvorak"
+
+#: ../rules/base.xml.in.h:441
+msgid "Romania"
+msgstr "Rumunsko"
+
+#: ../rules/base.xml.in.h:442
+msgid "Romanian keyboard with German letters"
+msgstr "Rumunská klávesnica s nemeckými písmenmi"
+
+#: ../rules/base.xml.in.h:443
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Rumunská klávesnica s nemeckými písmenami, eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:444
+msgid "Rou"
+msgstr "Rum"
+
+#: ../rules/base.xml.in.h:445 ../rules/sun.xml.in.h:95
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:446
+msgid "Russia"
+msgstr "Rusko"
+
+#: ../rules/base.xml.in.h:447 ../rules/sun.xml.in.h:96
+msgid "Russian"
+msgstr "Ruské"
+
+#: ../rules/base.xml.in.h:448
+msgid "Russian phonetic"
+msgstr "Ruské fonetické"
+
+#: ../rules/base.xml.in.h:449
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Ruské fonetické, eliminovať mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:450
+msgid "Russian with Kazakh"
+msgstr "Ruská s kazaštinou"
+
+#: ../rules/base.xml.in.h:451
+msgid "SCG"
+msgstr "SCG"
+
+#: ../rules/base.xml.in.h:452
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:453
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:454
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:455
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:456
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:457
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:458
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:459
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:460
+msgid "ScrollLock LED shows alternative layout."
+msgstr "Scroll Lock LED zobrazuje alternatívne rozloženie."
+
+#: ../rules/base.xml.in.h:461
+msgid "Serbia and Montenegro"
+msgstr "Srbsko a ÄŒierna Hora"
+
+#: ../rules/base.xml.in.h:462
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "Shift s numerickými klávesmi pracuje ako v MS Windows."
+
+#: ../rules/base.xml.in.h:463
+msgid "Shift+CapsLock changes layout."
+msgstr "Shift+Caps Lock mení rozloženie."
+
+#: ../rules/base.xml.in.h:464
+msgid "Slovakia"
+msgstr "Slovensko"
+
+#: ../rules/base.xml.in.h:465
+msgid "Slovenia"
+msgstr "Slovinsko"
+
+#: ../rules/base.xml.in.h:466
+msgid "South Africa"
+msgstr "Južná Afrika"
+
+#: ../rules/base.xml.in.h:467
+msgid "Southern Uzbek"
+msgstr "južná uzbe�tina"
+
+#: ../rules/base.xml.in.h:468
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Medzerník dáva znak nezalomiteľná medzera na štvrtej úrovni, tenká nezalomiteľná medzera na šiestej úrovni."
+
+#: ../rules/base.xml.in.h:469
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr "Medzerník dáva znak nezalomiteľná medzera na štvrtej úrovni."
+
+#: ../rules/base.xml.in.h:470
+msgid "Space key outputs non-breakable space character at second level."
+msgstr "Medzerník dáva znak nezalomiteľná medzera na druhej úrovni."
+
+#: ../rules/base.xml.in.h:471
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr "Medzerník dáva znak nezalomiteľná medzera na tretej úrovni, ni� na štvrtej úrovni."
+
+#: ../rules/base.xml.in.h:472
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Medzerník dáva znak nezalomiteľná medzera na tretej úrovni, tenká nezalomiteľná medzera na štvrtej úrovni."
+
+#: ../rules/base.xml.in.h:473
+msgid "Space key outputs non-breakable space character at third level."
+msgstr "Medzerník dáva znak nezalomiteľná medzera na tretej úrovni."
+
+#: ../rules/base.xml.in.h:474
+msgid "Space key outputs usual space at any level."
+msgstr "Medzerník dáva oby�ajnú medzeru na každej úrovni."
+
+#: ../rules/base.xml.in.h:475
+msgid "Spain"
+msgstr "Å panielsko"
+
+#: ../rules/base.xml.in.h:476 ../rules/sun.xml.in.h:103
+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."
+
+#: ../rules/base.xml.in.h:477
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:478
+msgid "Sri Lanka"
+msgstr "Srí Lanka"
+
+#: ../rules/base.xml.in.h:479 ../rules/sun.xml.in.h:104
+msgid "Standard"
+msgstr "štandardné"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:481
+msgid "Standard RSTU"
+msgstr "štandardné RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:483
+msgid "Standard RSTU on Russian layout"
+msgstr "štandardné RSTU na ruskom rozložení"
+
+#: ../rules/base.xml.in.h:484 ../rules/sun.xml.in.h:112
+msgid "Sun dead keys"
+msgstr "mŕtve klávesy Sun"
+
+#: ../rules/base.xml.in.h:485
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:486
+msgid "Super is mapped to the Win-keys."
+msgstr "Super je mapovaný na klávesy Win."
+
+#: ../rules/base.xml.in.h:487
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:488 ../rules/sun.xml.in.h:113
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:489
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:490
+msgid "Swap Ctrl and CapsLock."
+msgstr "Vymeniť Control a Caps Lock"
+
+#: ../rules/base.xml.in.h:491
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr "Vymeniť kódy dvoch kláves ke� jadro chybne detekuje klávesnice Mac."
+
+#: ../rules/base.xml.in.h:492 ../rules/sun.xml.in.h:115
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:493
+msgid "Sweden"
+msgstr "Švédsko"
+
+#: ../rules/base.xml.in.h:494
+msgid "Switzerland"
+msgstr "Švaj�iarsko"
+
+#: ../rules/base.xml.in.h:495
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:496
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:497
+msgid "Syria"
+msgstr "Sýrske"
+
+#: ../rules/base.xml.in.h:498
+msgid "Syriac"
+msgstr "Syrské"
+
+#: ../rules/base.xml.in.h:499
+msgid "Syriac phonetic"
+msgstr "Sýske fonetické"
+
+#: ../rules/base.xml.in.h:500
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:501
+msgid "Tajikistan"
+msgstr "Tadžické"
+
+#: ../rules/base.xml.in.h:502
+msgid "Tamil"
+msgstr "Tamilské"
+
+#: ../rules/base.xml.in.h:503
+msgid "Tamil TAB Typewriter"
+msgstr "Tamiský TAB písací stroj"
+
+#: ../rules/base.xml.in.h:504
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamilské TSCII písací stroj"
+
+#: ../rules/base.xml.in.h:505
+msgid "Tamil Unicode"
+msgstr "Tamilské Unicode"
+
+#: ../rules/base.xml.in.h:506
+msgid "Tatar"
+msgstr "tatár�ina"
+
+#: ../rules/base.xml.in.h:507
+msgid "Telugu"
+msgstr "Telugské"
+
+#: ../rules/base.xml.in.h:508
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:509
+msgid "Thailand"
+msgstr "Thajsko"
+
+#: ../rules/base.xml.in.h:510 ../rules/sun.xml.in.h:119
+msgid "Third level choosers"
+msgstr "Výber tretej úrovne"
+
+# berberská latinská abeceda
+#: ../rules/base.xml.in.h:511
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+# berberská latinská abeceda
+#: ../rules/base.xml.in.h:512
+msgid "Tifinagh Alternative"
+msgstr "Tifinagh alternatívne"
+
+# berberská latinská abeceda
+#: ../rules/base.xml.in.h:513
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Tifinagh alternatívne fonetické"
+
+# berberská latinská abeceda
+#: ../rules/base.xml.in.h:514
+msgid "Tifinagh Extended"
+msgstr "Tifinagh rozšírené"
+
+# berberská latinská abeceda
+#: ../rules/base.xml.in.h:515
+msgid "Tifinagh Extended Phonetic"
+msgstr "Tifinagh rozšírené fonetické"
+
+# berberská latinská abeceda
+#: ../rules/base.xml.in.h:516
+msgid "Tifinagh Phonetic"
+msgstr "Tifinagh fonetické"
+
+#: ../rules/base.xml.in.h:517
+msgid "Tilde (~) variant"
+msgstr "Variant vlnovky (~)"
+
+#: ../rules/base.xml.in.h:518
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:519
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:520
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:521
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:522 ../rules/sun.xml.in.h:120
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:523
+msgid "Turkey"
+msgstr "Turecko"
+
+#: ../rules/base.xml.in.h:524
+msgid "Typewriter"
+msgstr "Písací stroj"
+
+#: ../rules/base.xml.in.h:525 ../rules/sun.xml.in.h:124
+msgid "U.S. English"
+msgstr "USA anglické"
+
+#: ../rules/base.xml.in.h:526
+#, fuzzy
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Klávesnica USA s bosniackymi digraphs"
+
+#: ../rules/base.xml.in.h:527
+#, fuzzy
+msgid "US keyboard with Bosnian letters"
+msgstr "Klávesnica USA s bosniackymi písmenami"
+
+#: ../rules/base.xml.in.h:528
+#, fuzzy
+msgid "US keyboard with Croatian digraphs"
+msgstr "Klávesnica USA s chorvátskymi digraphs"
+
+#: ../rules/base.xml.in.h:529
+#, fuzzy
+msgid "US keyboard with Croatian letters"
+msgstr "Klávesnica USA s chorvátskymi písmenami"
+
+#: ../rules/base.xml.in.h:530
+msgid "US keyboard with Lithuanian letters"
+msgstr "Americká klávesnica s litovskými písmenami"
+
+#: ../rules/base.xml.in.h:531
+#, fuzzy
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Klávesnica USA so slovinskými digraphs"
+
+#: ../rules/base.xml.in.h:532
+#, fuzzy
+msgid "US keyboard with Slovenian letters"
+msgstr "Klávesnica USA so slovinskými písmenami"
+
+#: ../rules/base.xml.in.h:533 ../rules/sun.xml.in.h:126
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.xml.in.h:534
+msgid "Udmurt"
+msgstr "udmurt�ina"
+
+#: ../rules/base.xml.in.h:535
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:536
+msgid "Ukraine"
+msgstr "Ukrajinské"
+
+#: ../rules/base.xml.in.h:537
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:538 ../rules/sun.xml.in.h:127
+msgid "United Kingdom"
+msgstr "Spojené kráľovstvo"
+
+#: ../rules/base.xml.in.h:539
+msgid "Urdu"
+msgstr "urd�ina"
+
+#: ../rules/base.xml.in.h:540
+#, fuzzy
+msgid "Use Bosnian digraphs"
+msgstr "Použiť bosniacke digraphs"
+
+#: ../rules/base.xml.in.h:541
+#, fuzzy
+msgid "Use Croatian digraphs"
+msgstr "Použiť chorvátske digraphs"
+
+#: ../rules/base.xml.in.h:542
+#, fuzzy
+msgid "Use Slovenian digraphs"
+msgstr "Použiť slovinské digraphs"
+
+#: ../rules/base.xml.in.h:543
+msgid "Use guillemets for quotes"
+msgstr "Použiť uhlové zátvorky pre úvodzovky"
+
+#: ../rules/base.xml.in.h:544
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Použiť LED klávesnice pre zobrazenie alternatívneho rozloženia."
+
+#: ../rules/base.xml.in.h:545
+msgid "Use keypad with unicode additions (arrows and math operators)"
+msgstr "Použiť numerickú klávesnicu s doplnkami Unicode (šípky a matematické operátory)"
+
+#: ../rules/base.xml.in.h:546
+msgid "Using space key to input non-breakable space character"
+msgstr "Použiť klávesu medzera na zadanie znaku nezalomiteľná medzera"
+
+#: ../rules/base.xml.in.h:547
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:548
+msgid "Uzbekistan"
+msgstr "Uzbecké"
+
+#: ../rules/base.xml.in.h:549
+msgid "Vietnam"
+msgstr "Vietnamské"
+
+#: ../rules/base.xml.in.h:550
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:551
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:552
+msgid "Western"
+msgstr "západné"
+
+#: ../rules/base.xml.in.h:553
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:554
+msgid "Winkeys"
+msgstr "Win klávesy"
+
+#: ../rules/base.xml.in.h:555
+msgid "With &lt;\\|&gt; key"
+msgstr "s klávesmi &lt;\\|&gt;"
+
+#: ../rules/base.xml.in.h:556
+msgid "With EuroSign on 5"
+msgstr "so znakom euro na 5"
+
+#: ../rules/base.xml.in.h:557
+msgid "With guillemets"
+msgstr "s uhlovými zátvorkami"
+
+#: ../rules/base.xml.in.h:558
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:559
+msgid "Yoruba"
+msgstr "jorub�ina"
+
+#: ../rules/base.xml.in.h:560
+msgid "Z and ZHE swapped"
+msgstr "Z a ZHE vymenené"
+
+#: ../rules/base.xml.in.h:561
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:562
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:563
+msgid "azerty/digits"
+msgstr "azerty/�íslice"
+
+#: ../rules/base.xml.in.h:564
+msgid "digits"
+msgstr "�íslice"
+
+#: ../rules/base.xml.in.h:565
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "posunutá bodko�iarka a dvojbodka (zastaralé)"
+
+#: ../rules/base.xml.in.h:566
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:567 ../rules/sun.xml.in.h:132
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:568
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, rozšírená spätná lomka"
+
+#: ../rules/base.xml.in.h:569
+msgid "qwerty/digits"
+msgstr "qwerty/�íslice"
+
+#: ../rules/base.xml.in.h:570
+msgid "qwertz"
+msgstr "qwertz"
+
+#: ../rules/sun.xml.in.h:1
+msgid "\"Typewriter\""
+msgstr "Písací stroj"
+
+#: ../rules/sun.xml.in.h:17
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr "Pracuje ako Shift s uzamknutím. Shift ruší Caps."
+
+#: ../rules/sun.xml.in.h:18
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "Pracuje ako Shift s uzamknutím. Shift neruší Caps."
+
+#: ../rules/sun.xml.in.h:19
+msgid "Alt+Control changes group"
+msgstr "Alt+Control mení rozloženie"
+
+#: ../rules/sun.xml.in.h:20
+msgid "Alt+Shift changes group"
+msgstr "Alt+Shift mení rozloženie"
+
+#: ../rules/sun.xml.in.h:21
+msgid "Basic"
+msgstr "základné"
+
+#: ../rules/sun.xml.in.h:23
+msgid "Belgian"
+msgstr "Belgická"
+
+#: ../rules/sun.xml.in.h:25
+msgid "Both Alt keys together change group"
+msgstr "Oba klávesy Alt spolu menia rozloženie"
+
+#: ../rules/sun.xml.in.h:26
+msgid "Both Ctrl keys together change group"
+msgstr "Oba klávesy Ctrl spolu menia rozloženie"
+
+#: ../rules/sun.xml.in.h:27
+msgid "Both Shift keys together change group"
+msgstr "Spolo�né stla�enie oboch Shift mení rozloženie"
+
+#: ../rules/sun.xml.in.h:28
+msgid "Bulgarian"
+msgstr "Bulharské"
+
+#: ../rules/sun.xml.in.h:30
+msgid "Canadian"
+msgstr "Kanadské"
+
+#: ../rules/sun.xml.in.h:31
+msgid "Caps Lock is Compose"
+msgstr "Caps Lock je Compose"
+
+#: ../rules/sun.xml.in.h:32
+msgid "Caps Lock key changes group"
+msgstr "Kláves Caps Lock mení rozloženie"
+
+#: ../rules/sun.xml.in.h:34
+msgid "Caps_Lock LED shows alternative group"
+msgstr "Caps Lock LED zobrazuje alternatívne rozloženie"
+
+#: ../rules/sun.xml.in.h:35
+msgid "Control Key Position"
+msgstr "Pozícia klávesu Control"
+
+#: ../rules/sun.xml.in.h:36
+msgid "Control key at bottom left"
+msgstr "Kláves Control vľavo dole"
+
+#: ../rules/sun.xml.in.h:37
+msgid "Control key at left of 'A'"
+msgstr "Kláves Control naľavo od „A“"
+
+#: ../rules/sun.xml.in.h:38
+msgid "Control+Shift changes group"
+msgstr "Control+Shift mení rozloženie"
+
+#: ../rules/sun.xml.in.h:40
+msgid "Czech"
+msgstr "České"
+
+#: ../rules/sun.xml.in.h:41
+msgid "Danish"
+msgstr "Dánske"
+
+#: ../rules/sun.xml.in.h:45
+msgid "DeuCH"
+msgstr "NemÅ v"
+
+#: ../rules/sun.xml.in.h:47
+msgid "Dvo"
+msgstr "Dvo"
+
+#: ../rules/sun.xml.in.h:52
+msgid "Finnish"
+msgstr "Fínske"
+
+#: ../rules/sun.xml.in.h:54
+msgid "FraCH"
+msgstr "FraÅ v"
+
+#: ../rules/sun.xml.in.h:57
+msgid "German"
+msgstr "Nemecké"
+
+#: ../rules/sun.xml.in.h:58
+msgid "Group Shift/Lock behavior"
+msgstr "Zoskupiť chovanie Shift/Lock"
+
+#: ../rules/sun.xml.in.h:60
+msgid "Hungarian"
+msgstr "Ma�arské"
+
+#: ../rules/sun.xml.in.h:64
+msgid "Italian"
+msgstr "Talianske"
+
+#: ../rules/sun.xml.in.h:65
+msgid "Japanese"
+msgstr "Japonské"
+
+#: ../rules/sun.xml.in.h:67
+msgid "Left Alt key changes group"
+msgstr "Ľavý kláves Alt mení rozloženie"
+
+#: ../rules/sun.xml.in.h:68
+msgid "Left Alt key switches group while pressed"
+msgstr "Ľavý kláves Alt prepína rozloženie pri stla�ení"
+
+#: ../rules/sun.xml.in.h:69
+msgid "Left Ctrl key changes group"
+msgstr "Ľavý kláves Ctrl mení rozloženie"
+
+#: ../rules/sun.xml.in.h:70
+msgid "Left Shift key changes group"
+msgstr "Ľavý kláves Shift mení rozloženie"
+
+#: ../rules/sun.xml.in.h:71
+msgid "Make CapsLock an additional Control"
+msgstr "Urobiť z CapsLock dodato�ný Control"
+
+#: ../rules/sun.xml.in.h:76
+msgid "Norwegian"
+msgstr "Nórske"
+
+#: ../rules/sun.xml.in.h:77
+msgid "Num_Lock LED shows alternative group"
+msgstr "Num Lock LED zobrazuje alternatívne rozloženie"
+
+#: ../rules/sun.xml.in.h:80
+msgid "Polish"
+msgstr "Poľské"
+
+#: ../rules/sun.xml.in.h:81
+msgid "Polish with Polish quotes on key \"1/!\""
+msgstr "Poľské s poľskými úvodzovkami na klávese „1/!“"
+
+#: ../rules/sun.xml.in.h:82
+msgid "Portuguese"
+msgstr "Portugalské"
+
+#: ../rules/sun.xml.in.h:83
+msgid "Press Left Alt key to choose 3rd level"
+msgstr "Stla�ením ľavého klávesu Win vyberiete 3. úroveň"
+
+#: ../rules/sun.xml.in.h:84
+msgid "Press Right Alt key to choose 3rd level"
+msgstr "Stla�ením pravého klávesu Win vyberiete 3. úroveň"
+
+#: ../rules/sun.xml.in.h:85
+msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr "Stla�ením pravého klávesu Win vyberiete 3. úroveň, shift+pravý Alt je Multi_Key"
+
+#: ../rules/sun.xml.in.h:86
+msgid "Press Right Control to choose 3rd level"
+msgstr "Stla�enie pravého Control vyberá 3. úroveň"
+
+#: ../rules/sun.xml.in.h:87
+msgid "Press any of Alt keys to choose 3rd level"
+msgstr "Stla�ením ľuboboľného klávesu Alt vyberiete 3. úroveň"
+
+#: ../rules/sun.xml.in.h:89
+msgid "Right Alt key changes group"
+msgstr "Pravý Alt mení rozloženie"
+
+#: ../rules/sun.xml.in.h:91
+msgid "Right Alt switches group while pressed"
+msgstr "Pravý kláves Alt prepína rozloženie pri stla�ení"
+
+#: ../rules/sun.xml.in.h:92
+msgid "Right Control key works as Right Alt"
+msgstr "Kláves pravý Control funguje ako pravý Alt"
+
+#: ../rules/sun.xml.in.h:93
+msgid "Right Ctrl key changes group"
+msgstr "Kláves pravý Ctrl mení rozloženie"
+
+#: ../rules/sun.xml.in.h:94
+msgid "Right Shift key changes group"
+msgstr "Kláves pravý Shift mení rozloženie"
+
+#: ../rules/sun.xml.in.h:97
+msgid "Scroll Lock changes group"
+msgstr "Kláves Scroll Lock mení rozloženie"
+
+#: ../rules/sun.xml.in.h:98
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "Scroll Lock LED zobrazuje alternatívne rozloženie"
+
+#: ../rules/sun.xml.in.h:99
+msgid "Shift with numpad keys works as in MS Windows"
+msgstr "Shift s numerickými klávesmi pracuje ako v MS Windows"
+
+#: ../rules/sun.xml.in.h:100
+msgid "Shift+CapsLock changes group"
+msgstr "Shift+Caps Lock mení rozloženie"
+
+#: ../rules/sun.xml.in.h:101
+msgid "Slovak"
+msgstr "Slovenské"
+
+#: ../rules/sun.xml.in.h:102
+msgid "Spanish"
+msgstr "Å panielske"
+
+#: ../rules/sun.xml.in.h:105
+msgid "Sun Type 4"
+msgstr "Sun Type 4"
+
+#: ../rules/sun.xml.in.h:106
+msgid "Sun Type 5"
+msgstr "Sun Type 5"
+
+#: ../rules/sun.xml.in.h:107
+msgid "Sun Type 5 European"
+msgstr "Sun Type 5 európske"
+
+#: ../rules/sun.xml.in.h:108
+msgid "Sun Type 5 Unix"
+msgstr "Sun Type 5 Unix"
+
+#: ../rules/sun.xml.in.h:109
+msgid "Sun Type 6"
+msgstr "Sun Type 6"
+
+#: ../rules/sun.xml.in.h:110
+msgid "Sun Type 6 Unix"
+msgstr "Sun Type 6 Unix"
+
+#: ../rules/sun.xml.in.h:111
+msgid "Sun Type 6 with Euro key"
+msgstr "Sun Type 6 s klávesom euro"
+
+#: ../rules/sun.xml.in.h:114
+msgid "Swap Control and Caps Lock"
+msgstr "Prehodiť Control a Caps Lock"
+
+#: ../rules/sun.xml.in.h:116
+msgid "Swedish"
+msgstr "Švédske"
+
+#: ../rules/sun.xml.in.h:117
+msgid "Swiss French"
+msgstr "Švaj�iarske francúzske"
+
+#: ../rules/sun.xml.in.h:118
+msgid "Swiss German"
+msgstr "Nemecké (Švaj�iarsko)"
+
+#: ../rules/sun.xml.in.h:121
+msgid "Turkish"
+msgstr "Turecké"
+
+#: ../rules/sun.xml.in.h:122
+msgid "Turkish (F)"
+msgstr "Turecké (F)"
+
+#: ../rules/sun.xml.in.h:123
+msgid "Turkish Alt-Q Layout"
+msgstr "Turecké rozloženie Alt-Q"
+
+#: ../rules/sun.xml.in.h:125
+msgid "U.S. English w/ ISO9995-3"
+msgstr "U.S.A. anglické s ISO9995-3"
+
+#: ../rules/sun.xml.in.h:128
+msgid "Use keyboard LED to show alternative group"
+msgstr "Použiť LED klávesnice pre zobrazenie alternatívnej skupiny"
+
+#: ../rules/sun.xml.in.h:129
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr "Používa interný prevod na kapitálky. Shift ruší Caps."
+
+#: ../rules/sun.xml.in.h:130
+msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+msgstr "Používa interný prevod na kapitálky. Shift neruší Caps."
+
+#: ../rules/sun.xml.in.h:131
+msgid "bksl"
+msgstr "bksl"
+
+#: ../rules/sun.xml.in.h:133
+msgid "type4"
+msgstr "type4"
+
+#~ msgid "A Tamil typewrite-style keymap; TAB encoding"
+#~ msgstr "Tamilská klávesová mapa v štýle písacieho stroja, kódovanie TAB"
+
+#~ msgid "A Tamil typewrite-style keymap; TSCII encoding"
+#~ msgstr "Tamilská klávesová mapa v štýle písacieho stroja, kódovanie TSCII"
+
+#~ msgid "A Tamil typewrite-style keymap; Unicode encoding"
+#~ msgstr "Tamilská klávesová mapa v štýle písacieho stroja, kódovanie Unicode"
+
+#~ msgid "Arb"
+#~ msgstr "Arb"
+
+#~ msgid "Bosnian"
+#~ msgstr "Bosnianske"
+
+#~ msgid "Burmese"
+#~ msgstr "Burmézsky"
+
+#~ msgid "CloGaelach Laptop"
+#~ msgstr "CloGaelach Laptop"
+
+#~ msgid "Czech (qwerty)"
+#~ msgstr "České (qwerty)"
+
+#~ msgid "Dutch"
+#~ msgstr "Holandské"
+
+#~ msgid "French Canadian"
+#~ msgstr "Francúzske kanadské"
+
+#~ msgid "Georgian (latin)"
+#~ msgstr "Gruzínske (latinka)"
+
+#~ msgid "Georgian (russian)"
+#~ msgstr "Gruzínske (azbuka)"
+
+#~ msgid "Grc"
+#~ msgstr "Grc"
+
+#~ msgid "Guj"
+#~ msgstr "Guj"
+
+#~ msgid "Hin"
+#~ msgstr "Hin"
+
+#~ msgid "Hindi"
+#~ msgstr "Hindské"
+
+#~ msgid "INSCRIPT layout"
+#~ msgstr "INSCRIPT rozloženie"
+
+#~ msgid "IS434 laptop"
+#~ msgstr "IS434 laptop"
+
+#~ msgid "Iku"
+#~ msgstr "Inu"
+
+#~ msgid "Irish"
+#~ msgstr "�rske"
+
+#~ msgid "Lithuanian azerty standard"
+#~ msgstr "Litovské azerty štandardné"
+
+#~ msgid "Lithuanian qwerty \"numeric\""
+#~ msgstr "Litovské qwerty \"�íselné\""
+
+#~ msgid "Logitech iTouch keyboard Internet Navigator"
+#~ msgstr "Logitech iTouch keyboard Internet Navigator"
+
+#~ msgid "Northern Saami (Finland)"
+#~ msgstr "Severný Saami (Fínsko)"
+
+#~ msgid "Northern Saami (Sweden)"
+#~ msgstr "Severný Saami (Švédsko)"
+
+#~ msgid "Ogh"
+#~ msgstr "Ogh"
+
+#~ msgid "Ori"
+#~ msgstr "Ori"
+
+#~ msgid "PC104"
+#~ msgstr "PC104"
+
+#~ msgid "Polish (qwertz)"
+#~ msgstr "Poľské (qwertz)"
+
+#~ msgid "PowerPC PS/2"
+#~ msgstr "PowerPC PS/2"
+
+#~ msgid "Sapmi"
+#~ msgstr "Sapmi"
+
+#~ msgid "Scg"
+#~ msgstr "Scg"
+
+#~ msgid "Slovak (qwerty)"
+#~ msgstr "Slovenské (qwerty)"
+
+#~ msgid "Sme"
+#~ msgstr "Sme"
+
+#~ msgid "Sv"
+#~ msgstr "Sv"
+
+#~ msgid "Tel"
+#~ msgstr "Tel"
+
+#~ msgid "Thai (Kedmanee)"
+#~ msgstr "Thajské (Kedmanee)"
+
+#~ msgid "Tml"
+#~ msgstr "Tml"
+
+#~ msgid "U.S. English w/ dead keys"
+#~ msgstr "Anglické (US) s mŕtvymi klávesmi"
+
+#~ msgid "US"
+#~ msgstr "US"
+
+#~ msgid "Yug"
+#~ msgstr "Juh"
+
+#~ msgid "Yugoslavian"
+#~ msgstr "Juhoslovanské"
+
+#~ msgid "abnt2"
+#~ msgstr "abnt2"
+
+#~ msgid "laptop"
+#~ msgstr "laptop"
+
+#~ msgid "sefi"
+#~ msgstr "sefi"
+
+#~ msgid "si1452"
+#~ msgstr "si1452"
+
+#~ msgid "uni/101/qwerty/comma"
+#~ msgstr "uni/101/qwerty/�iarka"
+
+#~ msgid "uni/101/qwerty/dot"
+#~ msgstr "uni/101/qwerty/bodka"
+
+#~ msgid "uni/101/qwertz/comma"
+#~ msgstr "uni/101/qwertz/�iarka"
+
+#~ msgid "uni/101/qwertz/dot"
+#~ msgstr "uni/101/qwertz/bodka"
+
+#~ msgid "uni/102/qwerty/comma"
+#~ msgstr "uni/102/qwerty/�iarka"
+
+#~ msgid "uni/102/qwerty/dot"
+#~ msgstr "uni/102/qwerty/bodka"
+
+#~ msgid "uni/102/qwertz/comma"
+#~ msgstr "uni/102/qwertz/�iarka"
+
+#~ msgid "uni/102/qwertz/dot"
+#~ msgstr "uni/102/qwertz/bodka"
diff --git a/xorg-server/xkbdata.src/po/sl.po b/xorg-server/xkbdata.src/po/sl.po
new file mode 100644
index 000000000..1a5c4e018
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/sl.po
@@ -0,0 +1,2731 @@
+# Slovenian message catalogue for xkeyboard-config.
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# Matej Urban�i� <matej.urban@gmail.com>, 2006 - 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.1-pre1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-11 22:14+0100\n"
+"PO-Revision-Date: 2007-10-02 09:12+0100\n"
+"Last-Translator: Matej Urban�i� <matej.urban@gmail.com>\n"
+"Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"X-Poedit-Country: SLOVENIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(Podedovano) Alternativna"
+
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Podedovano) Alternativna, Sun mrtve tipke"
+
+#: ../rules/base.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Podedovano) Alternativno, izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:5
+msgid "(Legacy) Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/104 key Compatible"
+msgstr "Kompatibilna 101/104 tipke"
+
+#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/vejica/Mrtve tipke"
+
+#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/vejica/Izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/pika/Mrtve tipke"
+
+#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/pika/Izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/vejica/Mrtve tipke"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/vejica/Izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/pika/Mrtve tipke"
+
+#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/pika/Izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/vejica/Mrtve tipke"
+
+#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/vejica/Izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/pika/Mrtve tipke"
+
+#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/pika/Izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/vejica/Mrtve tipke"
+
+#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/vejica/Izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/pika/Mrtve tipke"
+
+#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/pika/Izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:23
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:24
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:25
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:26
+msgid "ACPI Standard"
+msgstr "ACPI Standard"
+
+#: ../rules/base.xml.in.h:27
+msgid "AZERTY Tskapo"
+msgstr "AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:28
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:29
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:30
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:31
+msgid "Acer Laptop"
+msgstr "Acer Laptop"
+
+#: ../rules/base.xml.in.h:32
+msgid "Add the EuroSign to the 2 key."
+msgstr "Znak za Evro dodaj na tipko 2."
+
+#: ../rules/base.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "Znak za Evro dodaj na tipko 5."
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "Znak za Evro dodaj na tipko E."
+
+#: ../rules/base.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "Dodaj standardni odziv Menu tipke"
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Dodaj simbol za Evro dolo�eni tipki"
+
+#: ../rules/base.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38
+msgid "Afg"
+msgstr "Afg"
+
+#: ../rules/base.xml.in.h:39
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+#: ../rules/base.xml.in.h:40
+msgid "Akan"
+msgstr "Akan"
+
+#: ../rules/base.xml.in.h:41
+msgid "Alb"
+msgstr "ALB"
+
+#: ../rules/base.xml.in.h:42
+msgid "Albania"
+msgstr "Albanija"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt in Meta tipki sta na Alt tipkah."
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt dolo�i na desno Win tipko in Super na Menu tipko."
+
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Alt+CapsLock zamenjata skupino."
+
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+Ctrl zamenjata skupino."
+
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Alt+Shift zamenja skupino."
+
+#: ../rules/base.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Obnašanje Alt/Win tipk"
+
+#: ../rules/base.xml.in.h:50
+msgid "Alternative"
+msgstr "Alternativna"
+
+#: ../rules/base.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "Alternativno vzhodno"
+
+#: ../rules/base.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "Alternativna fonetika"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "Alternativna Mednarodna"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "Alternativna, Sun mrtve tipke."
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "Alternativno, izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "Alternativno, latinsko-9"
+
+#: ../rules/base.xml.in.h:57
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:58
+msgid "Andorra"
+msgstr "Andora"
+
+#: ../rules/base.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "Opuš�aj (') možnost"
+
+#: ../rules/base.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Apple Laptop"
+
+#: ../rules/base.xml.in.h:62
+msgid "Ara"
+msgstr "ARA"
+
+#: ../rules/base.xml.in.h:63
+msgid "Arabic"
+msgstr "Arabska"
+
+#: ../rules/base.xml.in.h:64
+msgid "Arm"
+msgstr "ARM"
+
+#: ../rules/base.xml.in.h:65
+msgid "Armenia"
+msgstr "Armenija"
+
+#: ../rules/base.xml.in.h:66
+msgid "Asus Laptop"
+msgstr "Asus Laptop"
+
+#: ../rules/base.xml.in.h:67
+msgid "Aze"
+msgstr "AZE"
+
+#: ../rules/base.xml.in.h:68
+msgid "Azerbaijan"
+msgstr "Azerbajdžan"
+
+#: ../rules/base.xml.in.h:69
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 brezži�na Internet Tipkovnica"
+
+#: ../rules/base.xml.in.h:70
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:71
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:72
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:73
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:74
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:75
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:76
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:77
+msgid "Ban"
+msgstr "BAN"
+
+#: ../rules/base.xml.in.h:78
+msgid "Bangladesh"
+msgstr "Bangladeš"
+
+#: ../rules/base.xml.in.h:79 ../rules/sun.xml.in.h:22
+msgid "Bel"
+msgstr "BEL"
+
+#: ../rules/base.xml.in.h:80
+msgid "Belarus"
+msgstr "Belorusija"
+
+#: ../rules/base.xml.in.h:81
+msgid "Belgium"
+msgstr "Belcija"
+
+#: ../rules/base.xml.in.h:82
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:83
+msgid "Bengali"
+msgstr "Bengalsko"
+
+#: ../rules/base.xml.in.h:84
+msgid "Bengali Probhat"
+msgstr "Bengalski Prohbat"
+
+#: ../rules/base.xml.in.h:85
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonomska, Dvorak"
+
+#: ../rules/base.xml.in.h:86
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonomska, Dvorak, latin-9"
+
+#: ../rules/base.xml.in.h:87 ../rules/sun.xml.in.h:24
+msgid "Bgr"
+msgstr "BGR"
+
+#: ../rules/base.xml.in.h:88
+msgid "Bhu"
+msgstr "BHU"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bhutan"
+msgstr "Butan"
+
+#: ../rules/base.xml.in.h:90
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Bibli�na hebrejska (Tiro)"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bih"
+msgstr "BIH"
+
+#: ../rules/base.xml.in.h:92
+msgid "Blr"
+msgstr "BLR"
+
+#: ../rules/base.xml.in.h:93
+msgid "Bosnia and Herzegovina"
+msgstr "Bosna in Hercegovina"
+
+#: ../rules/base.xml.in.h:94
+msgid "Both Alt keys together change layout."
+msgstr "Obe Alt tipki skupaj zamenjata razporeditev."
+
+#: ../rules/base.xml.in.h:95
+msgid "Both Ctrl keys together change layout."
+msgstr "Obe Ctrl tipki skupaj zamenjata razporeditev."
+
+#: ../rules/base.xml.in.h:96
+msgid "Both Shift keys together change layout."
+msgstr "Obe Shift tipki skupaj zamenjata razporeditev."
+
+#: ../rules/base.xml.in.h:97
+msgid "Both Win-keys switch layout while pressed."
+msgstr "Obe Win tipki ob pritisku zamenjata razporeditev."
+
+#: ../rules/base.xml.in.h:98
+msgid "Bra"
+msgstr "BRA"
+
+#: ../rules/base.xml.in.h:99
+msgid "Braille"
+msgstr "Braille"
+
+#: ../rules/base.xml.in.h:100
+msgid "Brazil"
+msgstr "Brazilija"
+
+#: ../rules/base.xml.in.h:101
+msgid "Brazilian ABNT2"
+msgstr "Brazilska ABNT2"
+
+#: ../rules/base.xml.in.h:102
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:103
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Tipkovnica"
+
+#: ../rules/base.xml.in.h:104
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:105
+msgid "Bulgaria"
+msgstr "Bolgarija"
+
+#: ../rules/base.xml.in.h:106
+msgid "Cambodia"
+msgstr "Kambodža"
+
+#: ../rules/base.xml.in.h:107 ../rules/sun.xml.in.h:29
+msgid "Can"
+msgstr "CAN"
+
+#: ../rules/base.xml.in.h:108
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rules/base.xml.in.h:109
+msgid "Caps Lock is Compose."
+msgstr "CapsLock je pred-tipka (Compose)"
+
+#: ../rules/base.xml.in.h:110
+msgid "CapsLock LED shows alternative layout."
+msgstr "CapsLock LED kaže alternativno razporeditev."
+
+#: ../rules/base.xml.in.h:111
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "CapsLock se obnaša kot zaklenjena Shift tipka. Shift prekine CapsLock."
+
+#: ../rules/base.xml.in.h:112
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "CapsLock se obnaša kot Shift z zaklepanjem. Shift ne prekli�e CapsLock tipke."
+
+#: ../rules/base.xml.in.h:113
+msgid "CapsLock just locks the Shift modifier."
+msgstr "CapsLock samo zaklene Shift modifikator."
+
+#: ../rules/base.xml.in.h:114 ../rules/sun.xml.in.h:33
+msgid "CapsLock key behavior"
+msgstr "Obnašanje CapsLock Tipke"
+
+#: ../rules/base.xml.in.h:115
+msgid "CapsLock key changes layout."
+msgstr "Tipka CapsLock zamenja razporeditev."
+
+#: ../rules/base.xml.in.h:116
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "CapsLock izmenjuje modifikator za vse Shift tipke."
+
+#: ../rules/base.xml.in.h:117
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "CapsLock izmenjuje velikost �rk (velike in male �rke)."
+
+#: ../rules/base.xml.in.h:118
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "CapsLock uporablja notranjo kapitalizacijo. Shift prekli�e CapsLock."
+
+#: ../rules/base.xml.in.h:119
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "CapsLock uporablja notranjo kapitalizacijo. Shift ne prekli�e CapsLock."
+
+#: ../rules/base.xml.in.h:120
+msgid "Catalan variant with middle-dot L"
+msgstr "Katalanska varianta z L s srednjo piko"
+
+#: ../rules/base.xml.in.h:121
+msgid "Che"
+msgstr "CHE"
+
+#: ../rules/base.xml.in.h:122
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:123
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (druga izbira)"
+
+#: ../rules/base.xml.in.h:124
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:125
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:126
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:127
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Tipkovnica"
+
+#: ../rules/base.xml.in.h:128
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:129
+msgid "China"
+msgstr "Kitajska"
+
+#: ../rules/base.xml.in.h:130
+msgid "Chuvash"
+msgstr "Chuvash"
+
+#: ../rules/base.xml.in.h:131
+msgid "Chuvash Latin"
+msgstr "Chuvash Latinsko"
+
+#: ../rules/base.xml.in.h:132
+msgid "Classic Dvorak"
+msgstr "Dvorak nabor"
+
+#: ../rules/base.xml.in.h:133
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:134
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:135
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:136
+msgid "Commabelow"
+msgstr "Commabelow"
+
+#: ../rules/base.xml.in.h:137
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Tipkovnica"
+
+#: ../rules/base.xml.in.h:138
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Tipkovnica (13 tipk)"
+
+#: ../rules/base.xml.in.h:139
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Tipkovnica (18 tipk)"
+
+#: ../rules/base.xml.in.h:140
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Tipkovnica (7 tipk)"
+
+#: ../rules/base.xml.in.h:141
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Tipkovnica"
+
+#: ../rules/base.xml.in.h:142
+msgid "Compose key position"
+msgstr "Položaj pred-tipke (Compose)"
+
+#: ../rules/base.xml.in.h:143
+msgid "Congo, Democratic Republic of the"
+msgstr "Kongo, Demokrati�na Republika"
+
+#: ../rules/base.xml.in.h:144
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "Ctrl tipko dolo�ata Win tipki (privzeto)."
+
+#: ../rules/base.xml.in.h:145
+msgid "Croatia"
+msgstr "Hrvaška"
+
+#: ../rules/base.xml.in.h:146
+msgid "Ctrl key at bottom left"
+msgstr "Ctrl tipka leži levo spodaj"
+
+#: ../rules/base.xml.in.h:147
+msgid "Ctrl key at left of 'A'"
+msgstr "Tipka Ctrl je levo of tipke 'A'"
+
+#: ../rules/base.xml.in.h:148
+msgid "Ctrl key position"
+msgstr "Položaj Ctrl Tipke"
+
+#: ../rules/base.xml.in.h:149
+msgid "Ctrl+Shift change layout."
+msgstr "Ctrl+Shift zamenjata nabor."
+
+#: ../rules/base.xml.in.h:150
+msgid "Cyrillic"
+msgstr "Cirilica"
+
+#: ../rules/base.xml.in.h:151 ../rules/sun.xml.in.h:39
+msgid "Cze"
+msgstr "CZE"
+
+#: ../rules/base.xml.in.h:152
+msgid "Czechia"
+msgstr "Češka"
+
+#: ../rules/base.xml.in.h:153
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:154
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:155 ../rules/sun.xml.in.h:42
+msgid "Dead acute"
+msgstr "Mrtvi ostrivec"
+
+#: ../rules/base.xml.in.h:156 ../rules/sun.xml.in.h:43
+msgid "Dead grave acute"
+msgstr "Mrtvi krativec"
+
+#: ../rules/base.xml.in.h:157
+msgid "Default numeric keypad keys."
+msgstr "Privzete tipke števil�nice."
+
+#: ../rules/base.xml.in.h:158
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:159
+msgid "Dell 101-key PC"
+msgstr "Dell tipkovnica s 101 tipko PC"
+
+#: ../rules/base.xml.in.h:160
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:161
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Laptop/notebook Precision M series"
+
+#: ../rules/base.xml.in.h:162
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude serijski laptop"
+
+#: ../rules/base.xml.in.h:163
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:164
+msgid "Dell USB Multimedia Keybard"
+msgstr "Dell USB Multimedia tipkovnica"
+
+#: ../rules/base.xml.in.h:165
+msgid "Denmark"
+msgstr "Danska"
+
+#: ../rules/base.xml.in.h:166 ../rules/sun.xml.in.h:44
+msgid "Deu"
+msgstr "DEU"
+
+#: ../rules/base.xml.in.h:167
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Tipkovnica"
+
+#: ../rules/base.xml.in.h:168
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 serija"
+
+#: ../rules/base.xml.in.h:169 ../rules/sun.xml.in.h:46
+msgid "Dnk"
+msgstr "DNK"
+
+#: ../rules/base.xml.in.h:170 ../rules/sun.xml.in.h:48
+msgid "Dvorak"
+msgstr "Dvorak nabor"
+
+#: ../rules/base.xml.in.h:171
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak, Poljska - narekovaj na tipki \"1/!\""
+
+#: ../rules/base.xml.in.h:172
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, Poljska - narekovaj na quotemark tipki"
+
+#: ../rules/base.xml.in.h:173
+msgid "Eastern"
+msgstr "Vzhodni"
+
+#: ../rules/base.xml.in.h:174 ../rules/sun.xml.in.h:49
+msgid "Eliminate dead keys"
+msgstr "Izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:175
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:176
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:177
+msgid "Ergonomic"
+msgstr "Ergonomsko"
+
+#: ../rules/base.xml.in.h:178 ../rules/sun.xml.in.h:50
+msgid "Esp"
+msgstr "ESP"
+
+#: ../rules/base.xml.in.h:179
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:180
+msgid "Est"
+msgstr "EST"
+
+#: ../rules/base.xml.in.h:181
+msgid "Estonia"
+msgstr "Estonija"
+
+#: ../rules/base.xml.in.h:182
+msgid "Eth"
+msgstr "Eth"
+
+#: ../rules/base.xml.in.h:183
+msgid "Ethiopia"
+msgstr "Etiopija"
+
+#: ../rules/base.xml.in.h:184
+msgid "Evdev-managed keyboard"
+msgstr "Evdev tipkovnica"
+
+#: ../rules/base.xml.in.h:185
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:186
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:187
+msgid "Extended"
+msgstr "Razširjena"
+
+#: ../rules/base.xml.in.h:188
+msgid "Extended Backslash"
+msgstr "Razširjena Backslash tipka"
+
+#: ../rules/base.xml.in.h:189
+msgid "F-letter (F) variant"
+msgstr "F-�rka (F) varianta"
+
+#: ../rules/base.xml.in.h:190
+msgid "Fao"
+msgstr "FAO"
+
+#: ../rules/base.xml.in.h:191
+msgid "Faroe Islands"
+msgstr "Farski otoki"
+
+#: ../rules/base.xml.in.h:192 ../rules/sun.xml.in.h:51
+msgid "Fin"
+msgstr "FIN"
+
+#: ../rules/base.xml.in.h:193
+msgid "Finland"
+msgstr "Finska"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:196
+msgid "Four-level key with abstract separators"
+msgstr "Tipka �etrte ravni z abstraktnimi lo�ilniki"
+
+#: ../rules/base.xml.in.h:197
+msgid "Four-level key with comma"
+msgstr "Tipka �etrte ravni z vejico"
+
+#: ../rules/base.xml.in.h:198
+msgid "Four-level key with dot"
+msgstr "Tipka �etrte ravni s piko"
+
+#: ../rules/base.xml.in.h:199
+msgid "Four-level key with momayyez"
+msgstr "Tipka �etrte ravni z arabskim decimalnim lo�ilnikom"
+
+#: ../rules/base.xml.in.h:200 ../rules/sun.xml.in.h:53
+msgid "Fra"
+msgstr "FRA"
+
+#: ../rules/base.xml.in.h:201
+msgid "France"
+msgstr "Francija"
+
+#: ../rules/base.xml.in.h:202 ../rules/sun.xml.in.h:55
+msgid "French"
+msgstr "Francoska"
+
+#: ../rules/base.xml.in.h:203
+msgid "French (Macintosh)"
+msgstr "Francosko (Macintosh)"
+
+#: ../rules/base.xml.in.h:204 ../rules/sun.xml.in.h:56
+msgid "French (legacy)"
+msgstr "Francoska (zapuš�ina)"
+
+#: ../rules/base.xml.in.h:205
+msgid "French Dvorak"
+msgstr "Francoski Dvorak"
+
+#: ../rules/base.xml.in.h:206
+msgid "French, Sun dead keys"
+msgstr "Francoska, Sun mrtve tipke"
+
+#: ../rules/base.xml.in.h:207
+msgid "French, eliminate dead keys"
+msgstr "Francoska, izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:208
+msgid "Fula"
+msgstr "Fula"
+
+#: ../rules/base.xml.in.h:209
+msgid "GBr"
+msgstr "GBR"
+
+#: ../rules/base.xml.in.h:210
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:211
+msgid "Generic 101-key PC"
+msgstr "Splošna tipkovnica s 101 tipko PC"
+
+#: ../rules/base.xml.in.h:212
+msgid "Generic 102-key (Intl) PC"
+msgstr "Splošna tipkovnica s 102 tipkama (Intl) PC"
+
+#: ../rules/base.xml.in.h:213
+msgid "Generic 104-key PC"
+msgstr "Splošna tipkovnica s 104 tipkami PC"
+
+#: ../rules/base.xml.in.h:214
+msgid "Generic 105-key (Intl) PC"
+msgstr "Splošna tipkovnica s 105 tipkami (Intl) PC"
+
+#: ../rules/base.xml.in.h:215
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:216
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Tipkovnica KWD-910"
+
+#: ../rules/base.xml.in.h:217
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:218
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:219
+msgid "Geo"
+msgstr "GEO"
+
+#: ../rules/base.xml.in.h:220
+msgid "Georgia"
+msgstr "Gruzija"
+
+#: ../rules/base.xml.in.h:221
+msgid "Georgian"
+msgstr "Gruzijsko"
+
+#: ../rules/base.xml.in.h:222
+msgid "German (Macintosh)"
+msgstr "Nemško (Macintosh)"
+
+#: ../rules/base.xml.in.h:223
+msgid "German, Sun dead keys"
+msgstr "Nemška, Sun mrtve tipke"
+
+#: ../rules/base.xml.in.h:224
+msgid "German, eliminate dead keys"
+msgstr "Nemška, izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:225
+msgid "Germany"
+msgstr "Nem�ija"
+
+#: ../rules/base.xml.in.h:226
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:227
+msgid "Ghana"
+msgstr "Gana"
+
+#: ../rules/base.xml.in.h:228
+msgid "Gre"
+msgstr "GRE"
+
+#: ../rules/base.xml.in.h:229
+msgid "Greece"
+msgstr "Gr�ija"
+
+#: ../rules/base.xml.in.h:230
+msgid "Gui"
+msgstr "Gui"
+
+#: ../rules/base.xml.in.h:231
+msgid "Guinea"
+msgstr "Gvineja"
+
+#: ../rules/base.xml.in.h:232
+msgid "Gujarati"
+msgstr "Gujarati (Indija)"
+
+#: ../rules/base.xml.in.h:233
+msgid "Gurmukhi"
+msgstr "Gurmukhi (Indija)"
+
+#: ../rules/base.xml.in.h:234
+msgid "Gyration"
+msgstr "Gyration tipkovnica"
+
+#: ../rules/base.xml.in.h:235
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking tipkovnica"
+
+#: ../rules/base.xml.in.h:236
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking tipkovnica za Mac"
+
+#: ../rules/base.xml.in.h:237
+msgid "Hausa"
+msgstr "Hausa"
+
+#: ../rules/base.xml.in.h:238
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Tipkovnica"
+
+#: ../rules/base.xml.in.h:239
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:240
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:241
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:242
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:243
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:244
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:245
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:246
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedijska Tipkovnica"
+
+#: ../rules/base.xml.in.h:247
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Tipkovnica"
+
+#: ../rules/base.xml.in.h:248
+msgid "Hindi Bolnagri"
+msgstr "Hindi Bolnagri"
+
+#: ../rules/base.xml.in.h:249
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:250
+msgid "Hrv"
+msgstr "HRV"
+
+#: ../rules/base.xml.in.h:251 ../rules/sun.xml.in.h:59
+msgid "Hun"
+msgstr "HUN"
+
+#: ../rules/base.xml.in.h:252
+msgid "Hungary"
+msgstr "Madžarska"
+
+#: ../rules/base.xml.in.h:253
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hiper tipko prevzameta Win tipki."
+
+#: ../rules/base.xml.in.h:254
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:255
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:256
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:257
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (druga izbira)"
+
+#: ../rules/base.xml.in.h:258
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:259
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:260 ../rules/sun.xml.in.h:61
+msgid "ISO Alternate"
+msgstr "ISO Alternirajo�e"
+
+#: ../rules/base.xml.in.h:261
+msgid "Iceland"
+msgstr "Islandija"
+
+#: ../rules/base.xml.in.h:262
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:263
+msgid "Ind"
+msgstr "IND"
+
+#: ../rules/base.xml.in.h:264
+msgid "India"
+msgstr "Indija"
+
+#: ../rules/base.xml.in.h:265
+msgid "International (AltGr dead keys)"
+msgstr "Mednarodna (z mrtvimi AltGr tipkami)"
+
+#: ../rules/base.xml.in.h:266 ../rules/sun.xml.in.h:62
+msgid "International (with dead keys)"
+msgstr "Mednarodna (z mrtvimi tipkami)"
+
+#: ../rules/base.xml.in.h:267
+msgid "Inuktitut"
+msgstr "Inuktitut (Inuiti)"
+
+#: ../rules/base.xml.in.h:268
+msgid "Iran"
+msgstr "Iran"
+
+#: ../rules/base.xml.in.h:269
+msgid "Iraq"
+msgstr "Iraq"
+
+#: ../rules/base.xml.in.h:270
+msgid "Ireland"
+msgstr "Irska"
+
+#: ../rules/base.xml.in.h:271
+msgid "Irl"
+msgstr "IRL"
+
+#: ../rules/base.xml.in.h:272
+msgid "Irn"
+msgstr "IRN"
+
+#: ../rules/base.xml.in.h:273
+msgid "Irq"
+msgstr "Irq"
+
+#: ../rules/base.xml.in.h:274
+msgid "Isl"
+msgstr "ISL"
+
+#: ../rules/base.xml.in.h:275
+msgid "Isr"
+msgstr "ISR"
+
+#: ../rules/base.xml.in.h:276
+msgid "Israel"
+msgstr "Izrael"
+
+#: ../rules/base.xml.in.h:277 ../rules/sun.xml.in.h:63
+msgid "Ita"
+msgstr "ITA"
+
+#: ../rules/base.xml.in.h:278
+msgid "Italy"
+msgstr "Italija"
+
+#: ../rules/base.xml.in.h:279
+msgid "Japan"
+msgstr "Japonska"
+
+#: ../rules/base.xml.in.h:280
+msgid "Japan (PC-98xx Series)"
+msgstr "Japonska (PC-98xx Serija)"
+
+#: ../rules/base.xml.in.h:281
+msgid "Japanese 106-key"
+msgstr "Japonska tipkovnica s 106 tipkami"
+
+#: ../rules/base.xml.in.h:282
+msgid "Japanese keyboard options"
+msgstr "Japonske možnosti tipkovnice"
+
+#: ../rules/base.xml.in.h:283 ../rules/sun.xml.in.h:66
+msgid "Jpn"
+msgstr "JPN"
+
+#: ../rules/base.xml.in.h:284
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:285
+msgid "Kana Lock key is locking"
+msgstr "Kana Lock tipka zaklepa"
+
+#: ../rules/base.xml.in.h:286
+msgid "Kannada"
+msgstr "Kannada (Indija)"
+
+#: ../rules/base.xml.in.h:287
+msgid "Kashubian"
+msgstr "Kasubija"
+
+#: ../rules/base.xml.in.h:288
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:289
+msgid "Kazakh with Russian"
+msgstr "Kazahstanš�ina z Rusš�ino"
+
+#: ../rules/base.xml.in.h:290
+msgid "Kazakhstan"
+msgstr "Kazakhstan"
+
+#: ../rules/base.xml.in.h:291
+msgid "Keypad"
+msgstr "Tipkovna ploš�a"
+
+#: ../rules/base.xml.in.h:292
+msgid "Keypad with unicode additions (arrows and math operators)"
+msgstr "Tipkovnica z unicode dodatki (puš�ice in matemati�ni opratorji)"
+
+#: ../rules/base.xml.in.h:293
+msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Tipkovnica zt unicode dodatki (puš�ice in matemati�ni opratorji). Matemati�ni operatorji so na prvi ravni."
+
+#: ../rules/base.xml.in.h:294
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:295
+msgid "Khm"
+msgstr "Khm"
+
+#: ../rules/base.xml.in.h:296
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:297
+msgid "Korea, Republic of"
+msgstr "Koreja, Republika"
+
+#: ../rules/base.xml.in.h:298
+msgid "Korean 106-key"
+msgstr "Korejska tipkovnica s 106 tipkami"
+
+#: ../rules/base.xml.in.h:299
+msgid "Kotoistus"
+msgstr "Kotoistus"
+
+#: ../rules/base.xml.in.h:300
+msgid "Kurdish, (F)"
+msgstr "Kurdš�ina, (F)"
+
+#: ../rules/base.xml.in.h:301
+msgid "Kurdish, Arabic-Latin"
+msgstr "Kurdš�ina, Arabska-Latinska"
+
+#: ../rules/base.xml.in.h:302
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Kurdska, Latinska Alt-Q"
+
+#: ../rules/base.xml.in.h:303
+msgid "Kurdish, Latin Q"
+msgstr "Kurdš�ina, Latinsko Q"
+
+#: ../rules/base.xml.in.h:304
+msgid "Kyr"
+msgstr "KYR"
+
+#: ../rules/base.xml.in.h:305
+msgid "Kyrgyzstan"
+msgstr "Kirgizistan"
+
+#: ../rules/base.xml.in.h:306
+msgid "LAm"
+msgstr "LAM"
+
+#: ../rules/base.xml.in.h:307
+msgid "LCtrl+LShift change layout."
+msgstr "Ctrl+Shift zamenjata razporeditev."
+
+#: ../rules/base.xml.in.h:308
+msgid "Lao"
+msgstr "LAO"
+
+#: ../rules/base.xml.in.h:309
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:310
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Tipkovnica"
+
+#: ../rules/base.xml.in.h:311
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Presario) Internet Tipkovnica"
+
+#: ../rules/base.xml.in.h:312
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Laptop/notebook eMachines m68xx"
+
+#: ../rules/base.xml.in.h:313
+msgid "Latin"
+msgstr "Latinsko"
+
+#: ../rules/base.xml.in.h:314
+msgid "Latin American"
+msgstr "Latinsko Ameriško"
+
+#: ../rules/base.xml.in.h:315
+msgid "Latin Unicode"
+msgstr "Latinsko Unicode"
+
+#: ../rules/base.xml.in.h:316
+msgid "Latin Unicode qwerty"
+msgstr "Latinski Unicode Dvorak"
+
+#: ../rules/base.xml.in.h:317
+msgid "Latin qwerty"
+msgstr "Latinski qwerty"
+
+#: ../rules/base.xml.in.h:318
+msgid "Latin with guillemets"
+msgstr "Latinsko s francoskimi narekovaji (guillemets)"
+
+#: ../rules/base.xml.in.h:319
+msgid "Latvia"
+msgstr "Latvija"
+
+#: ../rules/base.xml.in.h:320
+msgid "Layout switching"
+msgstr "Zamenjava razporeditve"
+
+#: ../rules/base.xml.in.h:321
+msgid "Left Alt is swapped with left Win-key."
+msgstr "Levi Alt zamenja leva Win tipka."
+
+#: ../rules/base.xml.in.h:322
+msgid "Left Alt key changes layout."
+msgstr "Leva Alt tipka zamenja razporeditev."
+
+#: ../rules/base.xml.in.h:323
+msgid "Left Alt key switches layout while pressed."
+msgstr "Leva Alt tipka zamenja razporeditev ob stisku."
+
+#: ../rules/base.xml.in.h:324
+msgid "Left Ctrl key changes layout."
+msgstr "Leva Ctrl tipka zamenja razporeditev."
+
+#: ../rules/base.xml.in.h:325
+msgid "Left Shift key changes layout."
+msgstr "Leva Shift tipka zamenja razporeditev."
+
+#: ../rules/base.xml.in.h:326
+msgid "Left Win-key changes layout."
+msgstr "Leva Win tipka zamenja razporeditev."
+
+#: ../rules/base.xml.in.h:327
+msgid "Left Win-key is Compose."
+msgstr "Leva Win tipka je pred-tipka (Compose)"
+
+#: ../rules/base.xml.in.h:328
+msgid "Left Win-key switches layout while pressed."
+msgstr "Leva Win tipka zamenja razporeditev ob stisku."
+
+#: ../rules/base.xml.in.h:329
+msgid "Left hand"
+msgstr "Levoro�na"
+
+#: ../rules/base.xml.in.h:330
+msgid "Left handed Dvorak"
+msgstr "Levoro�ni Dvorak"
+
+#: ../rules/base.xml.in.h:331
+msgid "Legacy Wang 724 keypad"
+msgstr "Zapuš�ena tipka Wang 724 tipkovnica"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:333
+msgid "Legacy key with comma"
+msgstr "Zapuš�ena tipka z vejico"
+
+#: ../rules/base.xml.in.h:334
+msgid "Legacy key with dot"
+msgstr "Zapuš�ena tipka s piko "
+
+#: ../rules/base.xml.in.h:335
+msgid "Legacy keypad"
+msgstr "Zapuš�ena tipkovnica "
+
+#: ../rules/base.xml.in.h:336
+msgid "Lithuania"
+msgstr "Litva"
+
+#: ../rules/base.xml.in.h:337
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Tipkovnica"
+
+#: ../rules/base.xml.in.h:338
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:339
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:340
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:341
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:342
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:343
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (alternate option2)"
+
+#: ../rules/base.xml.in.h:344
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:345
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 z dodatnimi tipkami preko G15daemon"
+
+#: ../rules/base.xml.in.h:346
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Tipkovnica"
+
+#: ../rules/base.xml.in.h:347
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet NavigatorTipkovnica"
+
+#: ../rules/base.xml.in.h:348
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Tipkovnica"
+
+#: ../rules/base.xml.in.h:349
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Tipkovnica"
+
+#: ../rules/base.xml.in.h:350
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:351
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Brezži�na Tipkovnica (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:352
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech Internet NavigatorTipkovnica SE"
+
+#: ../rules/base.xml.in.h:353
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech Internet NavigatorTipkovnica SE (USB)"
+
+#: ../rules/base.xml.in.h:354
+msgid "Ltu"
+msgstr "LTU"
+
+#: ../rules/base.xml.in.h:355
+msgid "Lva"
+msgstr "LVA"
+
+#: ../rules/base.xml.in.h:356
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:357
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:358
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
+
+#: ../rules/base.xml.in.h:359
+msgid "Macedonia"
+msgstr "Makedonija"
+
+#: ../rules/base.xml.in.h:360
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:361
+msgid "Macintosh Old"
+msgstr "Macintosh Old"
+
+#: ../rules/base.xml.in.h:362
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, Sun mrtve tipke"
+
+#: ../rules/base.xml.in.h:363
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:364
+msgid "Make CapsLock an additional Ctrl."
+msgstr "CapsLock je dodatna Ctrl tipka."
+
+#: ../rules/base.xml.in.h:365
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:366
+msgid "Malayalam"
+msgstr "Malajalam"
+
+#: ../rules/base.xml.in.h:367
+msgid "Maldives"
+msgstr "Maldivi"
+
+#: ../rules/base.xml.in.h:368
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:369
+msgid "Maltese keyboard with US layout"
+msgstr "Malteška tipkovnica z US naborom"
+
+#: ../rules/base.xml.in.h:370
+msgid "Mao"
+msgstr "MAO"
+
+#: ../rules/base.xml.in.h:371
+msgid "Maori"
+msgstr "Maori"
+
+#: ../rules/base.xml.in.h:372
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:373
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Tipkovnica"
+
+#: ../rules/base.xml.in.h:374
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:375
+msgid "Menu is Compose."
+msgstr "Menu deluje kot "
+
+#: ../rules/base.xml.in.h:376
+msgid "Menu key changes layout."
+msgstr "Menu tipka zamenja razporeditev."
+
+#: ../rules/base.xml.in.h:377
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta funkcionalnost prevzameta Win tipki."
+
+#: ../rules/base.xml.in.h:378
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta funkcionalnost prevzame leva Win tipka."
+
+#: ../rules/base.xml.in.h:379
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoftova Internetna Tipkovnica"
+
+#: ../rules/base.xml.in.h:380
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Tipkovnica Pro, Å vedska"
+
+#: ../rules/base.xml.in.h:381
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:382
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Tipkovnica Pro / Microsoft Internet Tipkovnica Pro"
+
+#: ../rules/base.xml.in.h:383
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Tipkovnica Pro OEM"
+
+#: ../rules/base.xml.in.h:384
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Tipkovnica Pro USB / Microsoft Internet Tipkovnica Pro"
+
+#: ../rules/base.xml.in.h:385
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Tipkovnica"
+
+#: ../rules/base.xml.in.h:386
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Brezži�na Multimedijska Tipkovnica 1.0A"
+
+#: ../rules/base.xml.in.h:387 ../rules/sun.xml.in.h:72
+msgid "Miscellaneous compatibility options"
+msgstr "Možnosti ostalih združljivosti"
+
+#: ../rules/base.xml.in.h:388
+msgid "Mkd"
+msgstr "MKD"
+
+#: ../rules/base.xml.in.h:389
+msgid "Mlt"
+msgstr "MLT"
+
+#: ../rules/base.xml.in.h:390
+msgid "Mmr"
+msgstr "MMR"
+
+#: ../rules/base.xml.in.h:391
+msgid "Mng"
+msgstr "MNG"
+
+#: ../rules/base.xml.in.h:392
+msgid "Mongolia"
+msgstr "Mongolija"
+
+#: ../rules/base.xml.in.h:393
+msgid "Morocco"
+msgstr "Maroko"
+
+#: ../rules/base.xml.in.h:394 ../rules/sun.xml.in.h:73
+msgid "Multilingual"
+msgstr "Ve�jezi�no"
+
+#: ../rules/base.xml.in.h:395
+msgid "Multilingual, first part"
+msgstr "Ve�jezi�no, prvi del"
+
+#: ../rules/base.xml.in.h:396 ../rules/sun.xml.in.h:74
+msgid "Multilingual, second part"
+msgstr "Ve�jezi�no, drugi del"
+
+#: ../rules/base.xml.in.h:397
+msgid "Myanmar"
+msgstr "Myanmar (Burma)"
+
+#: ../rules/base.xml.in.h:398
+msgid "NICOLA-F style Backspace"
+msgstr "NICOLA-F style Backspace"
+
+#: ../rules/base.xml.in.h:399
+msgid "Neostyle"
+msgstr "Neostil"
+
+#: ../rules/base.xml.in.h:400
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:401
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../rules/base.xml.in.h:402
+msgid "Netherlands"
+msgstr "Nizozemska"
+
+#: ../rules/base.xml.in.h:403
+msgid "Nig"
+msgstr "Nig"
+
+#: ../rules/base.xml.in.h:404
+msgid "Nigeria"
+msgstr "Nigerija"
+
+#: ../rules/base.xml.in.h:405
+msgid "Nld"
+msgstr "NLD"
+
+#: ../rules/base.xml.in.h:406 ../rules/sun.xml.in.h:75
+msgid "Nor"
+msgstr "NOR"
+
+#: ../rules/base.xml.in.h:407
+msgid "Northern Saami"
+msgstr "Severni Saami (Laponci)"
+
+#: ../rules/base.xml.in.h:408
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Severni Saami, Izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:409
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:410
+msgid "Norway"
+msgstr "Norveška"
+
+#: ../rules/base.xml.in.h:411
+msgid "NumLock LED shows alternative layout."
+msgstr "NumLock LED kaže alternativno razporeditev."
+
+#: ../rules/base.xml.in.h:412
+msgid "Numeric keypad delete key behaviour"
+msgstr "Obnašanje tipke delete na numeri�ni tipkovnici"
+
+#: ../rules/base.xml.in.h:413
+msgid "Numeric keypad keys work as with Mac."
+msgstr "Števil�nica deluje kot pod MacOS."
+
+#: ../rules/base.xml.in.h:414
+msgid "Numeric keypad layout selection"
+msgstr "Numeri�na tipkovnica izbira razporeditev"
+
+#: ../rules/base.xml.in.h:415
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:416
+msgid "Ogham"
+msgstr "Ogham (Kelti)"
+
+#: ../rules/base.xml.in.h:417
+msgid "Ogham IS434"
+msgstr "Ogham IS434 (Kelti)"
+
+#: ../rules/base.xml.in.h:418
+msgid "Oriya"
+msgstr "Oriya (Indija)"
+
+#: ../rules/base.xml.in.h:419
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM"
+
+#: ../rules/base.xml.in.h:420
+msgid "Ossetian"
+msgstr "Osetija"
+
+#: ../rules/base.xml.in.h:421
+msgid "Ossetian, Winkeys"
+msgstr "Osetijš�ina, Wintipke"
+
+#: ../rules/base.xml.in.h:422
+msgid "PC-98xx Series"
+msgstr "PC-98xx Serije"
+
+#: ../rules/base.xml.in.h:423
+msgid "Pak"
+msgstr "PAK"
+
+#: ../rules/base.xml.in.h:424
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:425
+msgid "Pashto"
+msgstr "Pašto"
+
+#: ../rules/base.xml.in.h:426
+msgid "Pattachote"
+msgstr "Pattachote (Tajska)"
+
+#: ../rules/base.xml.in.h:427 ../rules/sun.xml.in.h:78
+msgid "Phonetic"
+msgstr "Foneti�na"
+
+#: ../rules/base.xml.in.h:428 ../rules/sun.xml.in.h:79
+msgid "Pol"
+msgstr "POL"
+
+#: ../rules/base.xml.in.h:429
+msgid "Poland"
+msgstr "Poljska"
+
+#: ../rules/base.xml.in.h:430
+msgid "Polytonic"
+msgstr "Politoni�na"
+
+#: ../rules/base.xml.in.h:431
+msgid "Portugal"
+msgstr "Portugalska"
+
+#: ../rules/base.xml.in.h:432
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Pritisni levo Alt tipko za izbiro tretjega nivoja."
+
+#: ../rules/base.xml.in.h:433
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Pritisni levo Win tipko za izbiro tretjega nivoja."
+
+#: ../rules/base.xml.in.h:434
+msgid "Press Menu key to choose 3rd level."
+msgstr "Pritisni menu tipko za izbiro tretjega nivoja."
+
+#: ../rules/base.xml.in.h:435
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "Pritisni desno Alt tipko za izbiro tretjega nivoja, Shift+Desni Alt predstavlja kombinacijo."
+
+#: ../rules/base.xml.in.h:436
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Pritisni desno Alt tipko za izbiro tretjega nivoja."
+
+#: ../rules/base.xml.in.h:437
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Pritisni desno Ctrl tipko za izbiro tretjega nivoja."
+
+#: ../rules/base.xml.in.h:438
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Pritisni desno Win tipko za izbiro tretjega nivoja."
+
+#: ../rules/base.xml.in.h:439
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Pritisni katerokoli Alt tipko za izbiro tretjega nivoja."
+
+#: ../rules/base.xml.in.h:440
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Pritisni katerokoli Win tipko za izbiro tretjega nivoja."
+
+#: ../rules/base.xml.in.h:441
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:442
+msgid "Pro Keypad"
+msgstr "Pro Tipkovnica"
+
+#: ../rules/base.xml.in.h:443
+msgid "Probhat"
+msgstr "Probhat (Bengal)"
+
+#: ../rules/base.xml.in.h:444
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:445 ../rules/sun.xml.in.h:88
+msgid "Prt"
+msgstr "PRT"
+
+#: ../rules/base.xml.in.h:446
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:447
+msgid "R-Alt switches layout while pressed."
+msgstr "Desna Alt tipka zamenja razporeditev med stiskom."
+
+#: ../rules/base.xml.in.h:448
+msgid "Right Alt is Compose."
+msgstr "Desni Alt je pred-tipka (Compose)"
+
+#: ../rules/base.xml.in.h:449
+msgid "Right Alt key changes layout."
+msgstr "Desna Alt tipka zamenja razporeditev."
+
+#: ../rules/base.xml.in.h:450 ../rules/sun.xml.in.h:90
+msgid "Right Alt key never chooses 3rd level."
+msgstr "Desna tipka Alt nikoli ne izbere tretje ravni."
+
+#: ../rules/base.xml.in.h:451
+msgid "Right Ctrl is Compose."
+msgstr "Desni Ctrl je pred-tipka (Compose)"
+
+#: ../rules/base.xml.in.h:452
+msgid "Right Ctrl key changes layout."
+msgstr "Desna Ctrl tipka zamenja razporeditev."
+
+#: ../rules/base.xml.in.h:453
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "Desni Ctrl zamenja razporeditev ob stisku."
+
+#: ../rules/base.xml.in.h:454
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Desna Ctrl tipka deluje kot desni Alt."
+
+#: ../rules/base.xml.in.h:455
+msgid "Right Shift key changes layout."
+msgstr "Desna Shift tipka zamenja razporeditev."
+
+#: ../rules/base.xml.in.h:456
+msgid "Right Win-key changes layout."
+msgstr "Desna Win tipka zamenja razporeditev."
+
+#: ../rules/base.xml.in.h:457
+msgid "Right Win-key is Compose."
+msgstr "Desna Win tipka je pred-tipka (Compose)"
+
+#: ../rules/base.xml.in.h:458
+msgid "Right Win-key switches layout while pressed."
+msgstr "Desna Win tipka zamenja razporeditev ob pritisku."
+
+#: ../rules/base.xml.in.h:459
+msgid "Right hand"
+msgstr "Desnoro�no"
+
+#: ../rules/base.xml.in.h:460
+msgid "Right handed Dvorak"
+msgstr "Desnoro�ni Dvorak"
+
+#: ../rules/base.xml.in.h:461
+msgid "Romania"
+msgstr "Romunija"
+
+#: ../rules/base.xml.in.h:462
+msgid "Romanian keyboard with German letters"
+msgstr "Romunska Tipkovnica z Nemškimi �rkami"
+
+#: ../rules/base.xml.in.h:463
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Romunska tipkovnica z Nemškimi �rkami, Izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:464
+msgid "Rou"
+msgstr "ROU"
+
+#: ../rules/base.xml.in.h:465 ../rules/sun.xml.in.h:95
+msgid "Rus"
+msgstr "RUS"
+
+#: ../rules/base.xml.in.h:466
+msgid "Russia"
+msgstr "Rusija"
+
+#: ../rules/base.xml.in.h:467 ../rules/sun.xml.in.h:96
+msgid "Russian"
+msgstr "Rusija"
+
+#: ../rules/base.xml.in.h:468
+msgid "Russian phonetic"
+msgstr "Ruska foneti�na"
+
+#: ../rules/base.xml.in.h:469
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Ruska foneti�na, Izlo�i mrtve tipke"
+
+#: ../rules/base.xml.in.h:470
+msgid "Russian with Kazakh"
+msgstr "Ruš�ina s Kazahstanš�ino"
+
+#: ../rules/base.xml.in.h:471
+msgid "SCG"
+msgstr "SCG"
+
+#: ../rules/base.xml.in.h:472
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless tipkovnica"
+
+#: ../rules/base.xml.in.h:473
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:474
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:475
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:476
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:477
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:478
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:479
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:480
+msgid "ScrollLock LED shows alternative layout."
+msgstr "ScrollLock LED kaže alternativno razporeditev."
+
+#: ../rules/base.xml.in.h:481
+msgid "Serbia and Montenegro"
+msgstr "Srbija in ÄŒrna gora"
+
+#: ../rules/base.xml.in.h:482
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "Shift in števil�nica delujeta kot pod MS Okni."
+
+#: ../rules/base.xml.in.h:483
+msgid "Shift+CapsLock changes layout."
+msgstr "Shift+CapsLock zamenjata razporeditev."
+
+#: ../rules/base.xml.in.h:484
+msgid "Slovakia"
+msgstr "Slovaška"
+
+#: ../rules/base.xml.in.h:485
+msgid "Slovenia"
+msgstr "Slovenija"
+
+#: ../rules/base.xml.in.h:486
+msgid "South Africa"
+msgstr "Južna Afrika"
+
+#: ../rules/base.xml.in.h:487
+msgid "Southern Uzbek"
+msgstr "Južno uzbeško"
+
+#: ../rules/base.xml.in.h:488
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Preslednica izpiše neprelomni presledek na �etrti ravnil, tanek neprelomni presledek na šesti ravni"
+
+#: ../rules/base.xml.in.h:489
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr "Preslednica izpiše neprelomni presledek na �etrti ravni."
+
+#: ../rules/base.xml.in.h:490
+msgid "Space key outputs non-breakable space character at second level."
+msgstr "Preslednica izpiše neprelomni presledek na drugi ravni."
+
+#: ../rules/base.xml.in.h:491
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr "Preslednica izpiše neprelomni presledek na tretji ravni in ni� na �etrti ravni."
+
+#: ../rules/base.xml.in.h:492
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Preslednica izpiše neprelomni presledek na tretji ravnil, tanek neprelomni presledek na �etrti ravni"
+
+#: ../rules/base.xml.in.h:493
+msgid "Space key outputs non-breakable space character at third level."
+msgstr "Preslednica izpiše neprelomni presledek na tretji ravni."
+
+#: ../rules/base.xml.in.h:494
+msgid "Space key outputs usual space at any level."
+msgstr "Preslednica izpiše obi�ajni presledek na vseh ravneh."
+
+#: ../rules/base.xml.in.h:495
+msgid "Spain"
+msgstr "Å panija"
+
+#: ../rules/base.xml.in.h:496 ../rules/sun.xml.in.h:103
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Posebne tipke (Ctrl+Alt+&lt;key&gt;) dolo�a strežnik."
+
+#: ../rules/base.xml.in.h:497
+msgid "SrL"
+msgstr "SRL"
+
+#: ../rules/base.xml.in.h:498
+msgid "Sri Lanka"
+msgstr "Å rilanka"
+
+#: ../rules/base.xml.in.h:499 ../rules/sun.xml.in.h:104
+msgid "Standard"
+msgstr "Standardna"
+
+#: ../rules/base.xml.in.h:500
+msgid "Standard (Commabelow)"
+msgstr "Standard (Commabelow)"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:502
+msgid "Standard RSTU"
+msgstr "Standard RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:504
+msgid "Standard RSTU on Russian layout"
+msgstr "Standard RSTU na Ruski ureditvi"
+
+#: ../rules/base.xml.in.h:505 ../rules/sun.xml.in.h:112
+msgid "Sun dead keys"
+msgstr "Sun mrtve tipke"
+
+#: ../rules/base.xml.in.h:506
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedijska tipkovnica"
+
+#: ../rules/base.xml.in.h:507
+msgid "Super is mapped to the Win-keys."
+msgstr "Super tipko prevzameta Win tipki."
+
+#: ../rules/base.xml.in.h:508
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:509 ../rules/sun.xml.in.h:113
+msgid "Svk"
+msgstr "SVK"
+
+#: ../rules/base.xml.in.h:510
+msgid "Svn"
+msgstr "SVN"
+
+#: ../rules/base.xml.in.h:511
+msgid "Swap Ctrl and CapsLock."
+msgstr "Zamenjaj Ctrl in CapsLock tipki."
+
+#: ../rules/base.xml.in.h:512
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr "Zamenjaj tipkovne kode dveh tipk ob napa�ni zaznavi Mac tipkovnic."
+
+#: ../rules/base.xml.in.h:513 ../rules/sun.xml.in.h:115
+msgid "Swe"
+msgstr "SWE"
+
+#: ../rules/base.xml.in.h:514
+msgid "Sweden"
+msgstr "Å vedska"
+
+#: ../rules/base.xml.in.h:515
+msgid "Switzerland"
+msgstr "Å vica"
+
+#: ../rules/base.xml.in.h:516
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:517
+msgid "Syr"
+msgstr "SYR"
+
+#: ../rules/base.xml.in.h:518
+msgid "Syria"
+msgstr "Sirija"
+
+#: ../rules/base.xml.in.h:519
+msgid "Syriac"
+msgstr "Starosirski"
+
+#: ../rules/base.xml.in.h:520
+msgid "Syriac phonetic"
+msgstr "Starosirski foneti�no"
+
+#: ../rules/base.xml.in.h:521
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:522
+msgid "Tajikistan"
+msgstr "Tadžikistan"
+
+#: ../rules/base.xml.in.h:523
+msgid "Tamil"
+msgstr "Tamilska"
+
+#: ../rules/base.xml.in.h:524
+msgid "Tamil TAB Typewriter"
+msgstr "Tamilski TAB Typewriter"
+
+#: ../rules/base.xml.in.h:525
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamilski TSCII Typewriter"
+
+#: ../rules/base.xml.in.h:526
+msgid "Tamil Unicode"
+msgstr "Tamilski Unicode"
+
+#: ../rules/base.xml.in.h:527
+msgid "Tatar"
+msgstr "Tatar"
+
+#: ../rules/base.xml.in.h:528
+msgid "Telugu"
+msgstr "Telugu (Indija)"
+
+#: ../rules/base.xml.in.h:529
+msgid "Tha"
+msgstr "THA"
+
+#: ../rules/base.xml.in.h:530
+msgid "Thailand"
+msgstr "Tajska"
+
+#: ../rules/base.xml.in.h:531 ../rules/sun.xml.in.h:119
+msgid "Third level choosers"
+msgstr "Tretje stopenjski izbor"
+
+#: ../rules/base.xml.in.h:532
+msgid "Tibetan"
+msgstr "Tibetansko"
+
+#: ../rules/base.xml.in.h:533
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetansko (z ASCII Å¡tevilkami)"
+
+#: ../rules/base.xml.in.h:534
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#: ../rules/base.xml.in.h:535
+msgid "Tifinagh Alternative"
+msgstr "Tifinagh alternativna"
+
+#: ../rules/base.xml.in.h:536
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Tifinagh alternativno foneti�na"
+
+#: ../rules/base.xml.in.h:537
+msgid "Tifinagh Extended"
+msgstr "Tifinagh razširjena"
+
+#: ../rules/base.xml.in.h:538
+msgid "Tifinagh Extended Phonetic"
+msgstr "Tifinagh razširjeno foneti�na"
+
+#: ../rules/base.xml.in.h:539
+msgid "Tifinagh Phonetic"
+msgstr "Tifinagh foneti�na"
+
+#: ../rules/base.xml.in.h:540
+msgid "Tilde (~) variant"
+msgstr "Tilda (~) varianta"
+
+#: ../rules/base.xml.in.h:541
+msgid "Tjk"
+msgstr "TJK"
+
+#: ../rules/base.xml.in.h:542
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:543
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Tipkovnica"
+
+#: ../rules/base.xml.in.h:544
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust klasi�na brezži�na tipkovnica"
+
+#: ../rules/base.xml.in.h:545 ../rules/sun.xml.in.h:120
+msgid "Tur"
+msgstr "TUR"
+
+#: ../rules/base.xml.in.h:546
+msgid "Turkey"
+msgstr "Tur�ija"
+
+#: ../rules/base.xml.in.h:547
+msgid "Typewriter"
+msgstr "Pisalni Stroj"
+
+#: ../rules/base.xml.in.h:548 ../rules/sun.xml.in.h:124
+msgid "U.S. English"
+msgstr "U.S. Angleška"
+
+#: ../rules/base.xml.in.h:549
+msgid "US keyboard with Bosnian digraphs"
+msgstr "US tipkovnica s Bosanskimi digrafi"
+
+#: ../rules/base.xml.in.h:550
+msgid "US keyboard with Bosnian letters"
+msgstr "US tipkovnica s Bosanskimi �rkami"
+
+#: ../rules/base.xml.in.h:551
+msgid "US keyboard with Croatian digraphs"
+msgstr "US tipkovnica s Hrvaškimi digrafi"
+
+#: ../rules/base.xml.in.h:552
+msgid "US keyboard with Croatian letters"
+msgstr "US tipkovnica s Hrvaškimi �rkami "
+
+#: ../rules/base.xml.in.h:553
+msgid "US keyboard with Lithuanian letters"
+msgstr "US tipkovnica s Latvijskimi �rkami"
+
+#: ../rules/base.xml.in.h:554
+msgid "US keyboard with Slovenian digraphs"
+msgstr "US tipkovnica s Slovenskimi digrafi"
+
+#: ../rules/base.xml.in.h:555
+msgid "US keyboard with Slovenian letters"
+msgstr "US tipkovnica s Slovenskimi �rkami"
+
+#: ../rules/base.xml.in.h:556 ../rules/sun.xml.in.h:126
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.xml.in.h:557
+msgid "Udmurt"
+msgstr "Udmurt"
+
+#: ../rules/base.xml.in.h:558
+msgid "Ukr"
+msgstr "UKR"
+
+#: ../rules/base.xml.in.h:559
+msgid "Ukraine"
+msgstr "Ukraina"
+
+#: ../rules/base.xml.in.h:560
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:561 ../rules/sun.xml.in.h:127
+msgid "United Kingdom"
+msgstr "Združeno Kraljestvo"
+
+#: ../rules/base.xml.in.h:562
+msgid "Urdu"
+msgstr "Urdu (Indija)"
+
+#: ../rules/base.xml.in.h:563
+msgid "Use Bosnian digraphs"
+msgstr "Uporabi bosanske digrafe"
+
+#: ../rules/base.xml.in.h:564
+msgid "Use Croatian digraphs"
+msgstr "Uporabi hrvaške digrafe"
+
+#: ../rules/base.xml.in.h:565
+msgid "Use Slovenian digraphs"
+msgstr "Uporabi slovenske digrafe"
+
+#: ../rules/base.xml.in.h:566
+msgid "Use guillemets for quotes"
+msgstr "Francoski narekovaji (guillemets) namesto navednic"
+
+#: ../rules/base.xml.in.h:567
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Uporabi tipkovni�no LED za prikaz alternativne razporeditve."
+
+#: ../rules/base.xml.in.h:568
+msgid "Using space key to input non-breakable space character"
+msgstr "Preslednica izpiše neprelomni presledek"
+
+#: ../rules/base.xml.in.h:569
+msgid "Uzb"
+msgstr "UZB"
+
+#: ../rules/base.xml.in.h:570
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+#: ../rules/base.xml.in.h:571
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../rules/base.xml.in.h:572
+msgid "Vnm"
+msgstr "VNM"
+
+#: ../rules/base.xml.in.h:573
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Wang 724 u unicode dodatki (puš�ice in matemati�ni operatorji)"
+
+#: ../rules/base.xml.in.h:574
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Wang 724 u unicode dodatki (puš�ice in matemati�ni operatorji). Matemati�ni opratorji na privzeti ravni."
+
+#: ../rules/base.xml.in.h:575
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:576
+msgid "Western"
+msgstr "Zahodni"
+
+#: ../rules/base.xml.in.h:577
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:578
+msgid "Winkeys"
+msgstr "Win tipki"
+
+#: ../rules/base.xml.in.h:579
+msgid "With &lt;\\|&gt; key"
+msgstr "Z &lt;\\|&gt; tipkami"
+
+#: ../rules/base.xml.in.h:580
+msgid "With EuroSign on 5"
+msgstr "Z evro znakom na tipki 5"
+
+#: ../rules/base.xml.in.h:581
+msgid "With guillemets"
+msgstr "S francoskimi narekovaji (guillemets)"
+
+#: ../rules/base.xml.in.h:582
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Tipkovnica"
+
+#: ../rules/base.xml.in.h:583
+msgid "Yoruba"
+msgstr "Joruba"
+
+#: ../rules/base.xml.in.h:584
+msgid "Z and ZHE swapped"
+msgstr "Z in ZHE zamenjani"
+
+#: ../rules/base.xml.in.h:585
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:586
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:587
+msgid "azerty/digits"
+msgstr "azerty/cifre"
+
+#: ../rules/base.xml.in.h:588
+msgid "digits"
+msgstr "cifre"
+
+#: ../rules/base.xml.in.h:589
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "premeš�ena podpi�je in narekovaj (zastarelo)"
+
+#: ../rules/base.xml.in.h:590
+msgid "lyx"
+msgstr "LYX"
+
+#: ../rules/base.xml.in.h:591 ../rules/sun.xml.in.h:132
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:592
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, razširjena Backslash tipka"
+
+#: ../rules/base.xml.in.h:593
+msgid "qwerty/digits"
+msgstr "qwerty/cifre"
+
+#: ../rules/base.xml.in.h:594
+msgid "qwertz"
+msgstr "qwertz"
+
+#: ../rules/sun.xml.in.h:1
+msgid "\"Typewriter\""
+msgstr "\"Pisalni Stroj\""
+
+#: ../rules/sun.xml.in.h:17
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr "CapsLock se obnaša kot tipka Shift z zaklepanjem. Shift prekine CapsLock."
+
+#: ../rules/sun.xml.in.h:18
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "CapsLock se obnaša kot Shift z zaklepanjem. Shift ne prekli�e CapsLock tipke."
+
+#: ../rules/sun.xml.in.h:19
+msgid "Alt+Control changes group"
+msgstr "Alt+Ctrl zamenjata skupino"
+
+#: ../rules/sun.xml.in.h:20
+msgid "Alt+Shift changes group"
+msgstr "Alt+Shift zamenjata skupino"
+
+#: ../rules/sun.xml.in.h:21
+msgid "Basic"
+msgstr "Osnovno"
+
+#: ../rules/sun.xml.in.h:23
+msgid "Belgian"
+msgstr "Belgija"
+
+#: ../rules/sun.xml.in.h:25
+msgid "Both Alt keys together change group"
+msgstr "Skupni pritisk obeh tipk ALT zamenja skupino"
+
+#: ../rules/sun.xml.in.h:26
+msgid "Both Ctrl keys together change group"
+msgstr "Skupni pritisk obeh tipk CTRL tipk zamenja skupino"
+
+#: ../rules/sun.xml.in.h:27
+msgid "Both Shift keys together change group"
+msgstr "Skupni pritisk obeh tipk SHIFT zamenja skupino"
+
+#: ../rules/sun.xml.in.h:28
+msgid "Bulgarian"
+msgstr "Bolgarsko"
+
+#: ../rules/sun.xml.in.h:30
+msgid "Canadian"
+msgstr "Kanadsko"
+
+#: ../rules/sun.xml.in.h:31
+msgid "Caps Lock is Compose"
+msgstr "CapsLock je pred-tipka (Compose)"
+
+#: ../rules/sun.xml.in.h:32
+msgid "Caps Lock key changes group"
+msgstr "Tipka CapsLock zamenja skupino"
+
+#: ../rules/sun.xml.in.h:34
+msgid "Caps_Lock LED shows alternative group"
+msgstr "CapsLock LED kaže alternativno skupino"
+
+#: ../rules/sun.xml.in.h:35
+msgid "Control Key Position"
+msgstr "Položaj Ctrl Tipke"
+
+#: ../rules/sun.xml.in.h:36
+msgid "Control key at bottom left"
+msgstr "Ctrl tipka leži levo spodaj"
+
+#: ../rules/sun.xml.in.h:37
+msgid "Control key at left of 'A'"
+msgstr "Tipka Ctrl je levo of tipke 'A'"
+
+#: ../rules/sun.xml.in.h:38
+msgid "Control+Shift changes group"
+msgstr "Ctrl+Shift zamenjata skupino"
+
+#: ../rules/sun.xml.in.h:40
+msgid "Czech"
+msgstr "Češka"
+
+#: ../rules/sun.xml.in.h:41
+msgid "Danish"
+msgstr "Dansko"
+
+#: ../rules/sun.xml.in.h:45
+msgid "DeuCH"
+msgstr "DeuCH"
+
+#: ../rules/sun.xml.in.h:47
+msgid "Dvo"
+msgstr "Dvo"
+
+#: ../rules/sun.xml.in.h:52
+msgid "Finnish"
+msgstr "Finska"
+
+#: ../rules/sun.xml.in.h:54
+msgid "FraCH"
+msgstr "FraCH"
+
+#: ../rules/sun.xml.in.h:57
+msgid "German"
+msgstr "Nem�ija"
+
+#: ../rules/sun.xml.in.h:58
+msgid "Group Shift/Lock behavior"
+msgstr "Obnašanje Shift/lock skupine"
+
+#: ../rules/sun.xml.in.h:60
+msgid "Hungarian"
+msgstr "Madžarska"
+
+#: ../rules/sun.xml.in.h:64
+msgid "Italian"
+msgstr "Italijanska"
+
+#: ../rules/sun.xml.in.h:65
+msgid "Japanese"
+msgstr "Japonsko"
+
+#: ../rules/sun.xml.in.h:67
+msgid "Left Alt key changes group"
+msgstr "Leva Alt tipka zamenja skupino"
+
+#: ../rules/sun.xml.in.h:68
+msgid "Left Alt key switches group while pressed"
+msgstr "Leva Alt tipka zamenja skupino ob stisku"
+
+#: ../rules/sun.xml.in.h:69
+msgid "Left Ctrl key changes group"
+msgstr "Leva Ctrl tipka zamenja skupino"
+
+#: ../rules/sun.xml.in.h:70
+msgid "Left Shift key changes group"
+msgstr "Leva Shift tipka zamenja skupino"
+
+#: ../rules/sun.xml.in.h:71
+msgid "Make CapsLock an additional Control"
+msgstr "CapsLock je dodatna Ctrl tipka"
+
+#: ../rules/sun.xml.in.h:76
+msgid "Norwegian"
+msgstr "Norveška"
+
+#: ../rules/sun.xml.in.h:77
+msgid "Num_Lock LED shows alternative group"
+msgstr "NumLock LED kaže alternativno skupino"
+
+#: ../rules/sun.xml.in.h:80
+msgid "Polish"
+msgstr "Poljska"
+
+#: ../rules/sun.xml.in.h:81
+msgid "Polish with Polish quotes on key \"1/!\""
+msgstr "Poljsko - narekovaj na tipki \"1/!\""
+
+#: ../rules/sun.xml.in.h:82
+msgid "Portuguese"
+msgstr "Portugalska"
+
+#: ../rules/sun.xml.in.h:83
+msgid "Press Left Alt key to choose 3rd level"
+msgstr "Pritisni levo Alt tipko za izbiro tretje ravni"
+
+#: ../rules/sun.xml.in.h:84
+msgid "Press Right Alt key to choose 3rd level"
+msgstr "Pritisni desno Alt tipko za izbiro tretje ravni"
+
+#: ../rules/sun.xml.in.h:85
+msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr "Pritisni desno Alt tipko za izbiro tretje ravni, Shift+desni Alt predstavlja kombinacijo"
+
+#: ../rules/sun.xml.in.h:86
+msgid "Press Right Control to choose 3rd level"
+msgstr "Pritisni desno Ctrl tipko za izbiro tretje ravni"
+
+#: ../rules/sun.xml.in.h:87
+msgid "Press any of Alt keys to choose 3rd level"
+msgstr "Pritisni katerokoli Alt tipko za izbiro tretje ravni"
+
+#: ../rules/sun.xml.in.h:89
+msgid "Right Alt key changes group"
+msgstr "Desna Alt tipka zamenja skupino"
+
+#: ../rules/sun.xml.in.h:91
+msgid "Right Alt switches group while pressed"
+msgstr "Desna Alt tipka zamenja skupino med stiskom"
+
+#: ../rules/sun.xml.in.h:92
+msgid "Right Control key works as Right Alt"
+msgstr "Desna Ctrl tipka deluje kot desni Alt"
+
+#: ../rules/sun.xml.in.h:93
+msgid "Right Ctrl key changes group"
+msgstr "Desna Ctrl tipka zamenja skupino"
+
+#: ../rules/sun.xml.in.h:94
+msgid "Right Shift key changes group"
+msgstr "Desna Shift tipka zamenja skupino"
+
+#: ../rules/sun.xml.in.h:97
+msgid "Scroll Lock changes group"
+msgstr "Scroll Lock zamenja skupino"
+
+#: ../rules/sun.xml.in.h:98
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "ScrollLock LED kaže alternativno skupino"
+
+#: ../rules/sun.xml.in.h:99
+msgid "Shift with numpad keys works as in MS Windows"
+msgstr "Shift in števil�nica delujeta kot pod MS Okni"
+
+#: ../rules/sun.xml.in.h:100
+msgid "Shift+CapsLock changes group"
+msgstr "Shift+CapsLock zamenjata skupino"
+
+#: ../rules/sun.xml.in.h:101
+msgid "Slovak"
+msgstr "Slovaška"
+
+#: ../rules/sun.xml.in.h:102
+msgid "Spanish"
+msgstr "Å panija"
+
+#: ../rules/sun.xml.in.h:105
+msgid "Sun Type 4"
+msgstr "Sun Type 4"
+
+#: ../rules/sun.xml.in.h:106
+msgid "Sun Type 5"
+msgstr "Sun Type 5"
+
+#: ../rules/sun.xml.in.h:107
+msgid "Sun Type 5 European"
+msgstr "Sun Type 5 Evropski"
+
+#: ../rules/sun.xml.in.h:108
+msgid "Sun Type 5 Unix"
+msgstr "Sun Type 5 Unix"
+
+#: ../rules/sun.xml.in.h:109
+msgid "Sun Type 6"
+msgstr "Sun Type 6"
+
+#: ../rules/sun.xml.in.h:110
+msgid "Sun Type 6 Unix"
+msgstr "Sun Type 6 Unix"
+
+#: ../rules/sun.xml.in.h:111
+msgid "Sun Type 6 with Euro key"
+msgstr "Sun Type 6 z evro tipko"
+
+#: ../rules/sun.xml.in.h:114
+msgid "Swap Control and Caps Lock"
+msgstr "Zamenjaj tipki Ctrl in CapsLock"
+
+#: ../rules/sun.xml.in.h:116
+msgid "Swedish"
+msgstr "Å vedska"
+
+#: ../rules/sun.xml.in.h:117
+msgid "Swiss French"
+msgstr "Švicarska francoš�ina"
+
+#: ../rules/sun.xml.in.h:118
+msgid "Swiss German"
+msgstr "Švicarska nemš�ina"
+
+#: ../rules/sun.xml.in.h:121
+msgid "Turkish"
+msgstr "Turško"
+
+#: ../rules/sun.xml.in.h:122
+msgid "Turkish (F)"
+msgstr "Turško (F)"
+
+#: ../rules/sun.xml.in.h:123
+msgid "Turkish Alt-Q Layout"
+msgstr "Turški Alt-Q nabor"
+
+#: ../rules/sun.xml.in.h:125
+msgid "U.S. English w/ ISO9995-3"
+msgstr "U.S. Angleška w/ ISO9995-3"
+
+#: ../rules/sun.xml.in.h:128
+msgid "Use keyboard LED to show alternative group"
+msgstr "Uporabi LED tipkovnice za prikaz alternativne skupine"
+
+#: ../rules/sun.xml.in.h:129
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr "Uporaba notranje kapitalizacije. Shift prekli�e CapsLock."
+
+#: ../rules/sun.xml.in.h:130
+msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+msgstr "Uporaba notranje kapitalizacije. Shift ne prekli�e CapsLock."
+
+#: ../rules/sun.xml.in.h:131
+msgid "bksl"
+msgstr "bksl"
+
+#: ../rules/sun.xml.in.h:133
+msgid "type4"
+msgstr "type4"
+
+#~ msgid "Acer TravelMate 800"
+#~ msgstr "Acer TravelMate 800"
+
+#~ msgid "Adding the nobreakspace keysym to space key"
+#~ msgstr "Dodajanje brezpresledni znak preslednici"
+
+#~ msgid "Logitech Cordless Desktop Optical"
+#~ msgstr "Logitech Cordless Desktop Optical"
+
+#~ msgid "Logitech Cordless Desktop Pro"
+#~ msgstr "Logitech Cordless Desktop Pro"
+
+#~ msgid "Logitech Cordless Desktop iTouch"
+#~ msgstr "Logitech Cordless Desktop iTouch"
+
+#~ msgid "PowerPC PS/2"
+#~ msgstr "PowerPC PS/2"
+
+#~ msgid "\"Standard\""
+#~ msgstr "\"Standard\""
+
+#~ msgid "Dhivehi"
+#~ msgstr "Dhivehi (Maldivi)"
+
+#~ msgid "Div"
+#~ msgstr "DIV"
+
+#~ msgid "Logitech Deluxe Access Keyboard"
+#~ msgstr "Logitech Deluxe Access Tipkovnica"
+
+#~ msgid "Logitech iTouch keyboard Internet Navigator"
+#~ msgstr "Logitech iTouch tipkovnica Internet Navigator"
+
+#~ msgid "Serbian"
+#~ msgstr "Srbsko"
+
+#~ msgid "Srp"
+#~ msgstr "SRP"
+
+#~ msgid "Tamil INSCRIPT"
+#~ msgstr "Tamilski Inskript"
+
+#~ msgid "US keyboard with Maltian letters"
+#~ msgstr "US tipkovnica s Malteškimi �rkami"
+
+#~ msgid "si1452"
+#~ msgstr "si1452"
diff --git a/xorg-server/xkbdata.src/po/sq.po b/xorg-server/xkbdata.src/po/sq.po
new file mode 100644
index 000000000..4efec73dc
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/sq.po
@@ -0,0 +1,1465 @@
+# translation of xfree86_xkb_xml-4.4pre1 to Albanian
+# This file is distributed under the same license as the xfree86_xkb_xml-4.4pre1 package.
+# Laurent Dhima <laurenti@alblinux.net>, 2004.
+#
+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"
+"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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3\n"
+
+#: xfree86.xml.in.h:1
+msgid "\"Typewriter\""
+msgstr "\"Makinë shkrimi\""
+
+#: xfree86.xml.in.h:2
+msgid "A Tamil typewrite-style keymap; TAB encoding"
+msgstr "Një tastierë Tamil-ane stil makinë shkrimi; kodifikim TAB"
+
+#: xfree86.xml.in.h:3
+msgid "A Tamil typewrite-style keymap; TSCII encoding"
+msgstr "Një tastierë Tamil-ane stil makinë shkrimi; kodifikim TSCII"
+
+#: xfree86.xml.in.h:4
+msgid "A Tamil typewrite-style keymap; Unicode encoding"
+msgstr "Një tastierë Tamil-ane stil makinë shkrimi; kodifikim Unicode"
+
+#: xfree86.xml.in.h:5
+msgid "ACPI Standard"
+msgstr "ACPI Standart"
+
+#: xfree86.xml.in.h:6
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: xfree86.xml.in.h:7
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr "Vepron si Shift me bllokues. Shift fshin Caps."
+
+#: xfree86.xml.in.h:8
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "Vepron si Shift me bllokues. Shift nuk fshin Caps."
+
+#: xfree86.xml.in.h:9
+msgid "Add the standard behavior to Menu key."
+msgstr "Shto sjelljen standarte tek Menu key."
+
+#: xfree86.xml.in.h:10
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: xfree86.xml.in.h:11
+msgid "Alb"
+msgstr "Alb"
+
+#: xfree86.xml.in.h:12
+msgid "Albanian"
+msgstr "Shqip"
+
+#: xfree86.xml.in.h:13
+msgid "Alt and Meta on the Alt keys (default)."
+msgstr "Alt dhe Meta tek pulsanti Alt (e prezgjedhur)."
+
+#: xfree86.xml.in.h:14
+msgid "Alt+Control changes group"
+msgstr "Alt+Control ndryshon grupin"
+
+#: xfree86.xml.in.h:15
+msgid "Alt+Shift changes group"
+msgstr "Alt+Shift ndryshon grupin"
+
+#: xfree86.xml.in.h:16
+msgid "Alt/Win key behavior"
+msgstr "Sjellja e pulsantit Alt/Win"
+
+#: xfree86.xml.in.h:17
+msgid "Alternate"
+msgstr "Alterno"
+
+#: xfree86.xml.in.h:18
+msgid "Arabic"
+msgstr "Arabe"
+
+#: xfree86.xml.in.h:19
+msgid "Arb"
+msgstr "Arb"
+
+#: xfree86.xml.in.h:20
+msgid "Arm"
+msgstr "Arm"
+
+#: xfree86.xml.in.h:21
+msgid "Armenian"
+msgstr "Armenisht"
+
+#: xfree86.xml.in.h:22
+msgid "Aze"
+msgstr "Aze"
+
+#: xfree86.xml.in.h:23
+msgid "Azerbaijani"
+msgstr "Azerbaijani"
+
+#: xfree86.xml.in.h:24
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: xfree86.xml.in.h:25
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: xfree86.xml.in.h:26
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: xfree86.xml.in.h:27
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: xfree86.xml.in.h:28
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: xfree86.xml.in.h:29
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: xfree86.xml.in.h:30
+msgid "Basic"
+msgstr "Bazë"
+
+#: xfree86.xml.in.h:31
+msgid "Bel"
+msgstr "Bel"
+
+#: xfree86.xml.in.h:32
+msgid "Belarusian"
+msgstr "Bjelloruse"
+
+#: xfree86.xml.in.h:33
+msgid "Belgian"
+msgstr "Belg"
+
+#: xfree86.xml.in.h:34
+msgid "Ben"
+msgstr "Ben"
+
+#: xfree86.xml.in.h:35
+msgid "Bengali"
+msgstr "Bengali"
+
+#: xfree86.xml.in.h:36
+msgid "Bgr"
+msgstr "Bgr"
+
+#: xfree86.xml.in.h:37
+msgid "Bih"
+msgstr "Bih"
+
+#: xfree86.xml.in.h:38
+msgid "Blr"
+msgstr "Blr"
+
+#: xfree86.xml.in.h:39
+msgid "Bosnian"
+msgstr "Bosnjake"
+
+#: xfree86.xml.in.h:40
+msgid "Both Alt keys together change group"
+msgstr "Dy pulsantët Alt së bashku ndryshjnë grupin"
+
+#: xfree86.xml.in.h:41
+msgid "Both Ctrl keys together change group"
+msgstr "Dy pulsantët Ctrl së bashku ndryshojnë grupin"
+
+#: xfree86.xml.in.h:42
+msgid "Both Shift keys together change group"
+msgstr "Dy pulsantët Shift së bashku ndryshojnë grupin"
+
+#: xfree86.xml.in.h:43
+msgid "Both Win-keys switch group while pressed"
+msgstr "Të dy pulsantët Win ndryshojnë gropin kur shtypen"
+
+#: xfree86.xml.in.h:44
+msgid "Bra"
+msgstr "Bra"
+
+#: xfree86.xml.in.h:45
+msgid "Brazilian"
+msgstr "Braziliane"
+
+#: xfree86.xml.in.h:46
+msgid "Brazilian ABNT2"
+msgstr "Braziliane ABNT2"
+
+#: xfree86.xml.in.h:47
+msgid "Brother Internet Keyboard"
+msgstr "Tastiera Internet Brother"
+
+#: xfree86.xml.in.h:48
+msgid "Bulgarian"
+msgstr "Bullgarisht"
+
+#: xfree86.xml.in.h:49
+msgid "Burmese"
+msgstr "Burmese"
+
+#: xfree86.xml.in.h:50
+msgid "Can"
+msgstr "Can"
+
+#: xfree86.xml.in.h:51
+msgid "Canadian"
+msgstr "Kanadeze"
+
+#: xfree86.xml.in.h:52
+msgid "Caps Lock key changes group"
+msgstr "Pulsanti Caps Lock ndryshon grupin"
+
+#: xfree86.xml.in.h:53
+msgid "CapsLock key behavior"
+msgstr "Sjellja e pulsantit CapsLock"
+
+#: xfree86.xml.in.h:54
+msgid "Caps_Lock LED shows alternative group"
+msgstr "Llampa e Caps_Lock tregon grupin alternativ"
+
+#: xfree86.xml.in.h:55
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: xfree86.xml.in.h:56
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (opcioni alterno)"
+
+#: xfree86.xml.in.h:57
+msgid "Chicony Internet Keyboard"
+msgstr "Tastiera Internet Chicony"
+
+#: xfree86.xml.in.h:58
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: xfree86.xml.in.h:59
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: xfree86.xml.in.h:60
+msgid "CloGaelach Laptop"
+msgstr "Laptop CloGaelach"
+
+#: xfree86.xml.in.h:61
+msgid "Compaq Easy Access Keyboard"
+msgstr "Tastiera Compaq Easy Access"
+
+#: xfree86.xml.in.h:62
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Tatiera Internet Compaq (13 pulsante)"
+
+#: xfree86.xml.in.h:63
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Tastiera Internet Compaq (18 pulsante)"
+
+#: xfree86.xml.in.h:64
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Tastiera Internet Compaq (7 pulsante)"
+
+#: xfree86.xml.in.h:65
+msgid "Compaq iPaq Keyboard"
+msgstr "Tastiera Compaq iPaq"
+
+#: xfree86.xml.in.h:66
+msgid "Control Key Position"
+msgstr "Pozicioni i pulsantit Control"
+
+#: xfree86.xml.in.h:67
+msgid "Control key at bottom left"
+msgstr "Pulsanti Control sipër majtas"
+
+#: xfree86.xml.in.h:68
+msgid "Control key at left of 'A'"
+msgstr "Pulsanti Control në të majtë të 'A'"
+
+#: xfree86.xml.in.h:69
+msgid "Control+Shift changes group"
+msgstr "Control+Shift ndryshon grupin"
+
+#: xfree86.xml.in.h:70
+msgid "Croatian"
+msgstr "Kroate"
+
+#: xfree86.xml.in.h:71
+msgid "Cyrillic"
+msgstr "Cyrillic"
+
+#: xfree86.xml.in.h:72
+msgid "Cze"
+msgstr "Cze"
+
+#: xfree86.xml.in.h:73
+msgid "Czech"
+msgstr "Çekisht"
+
+#: xfree86.xml.in.h:74
+msgid "Czech (qwerty)"
+msgstr "Czech (qwerty)"
+
+#: xfree86.xml.in.h:75
+msgid "Danish"
+msgstr "Danisht"
+
+#: xfree86.xml.in.h:76
+msgid "Dead acute"
+msgstr "Fund kritik"
+
+#: xfree86.xml.in.h:77
+msgid "Dead grave acute"
+msgstr "Fund kritik serioz"
+
+#: xfree86.xml.in.h:78
+msgid "Dell"
+msgstr "Dell"
+
+#: xfree86.xml.in.h:79
+msgid "Dell 101-key PC"
+msgstr "Dell 101-key PC"
+
+#: xfree86.xml.in.h:80
+msgid "Deu"
+msgstr "Deu"
+
+#: xfree86.xml.in.h:81
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Tastierë Dexxa Wireless Desktop"
+
+#: xfree86.xml.in.h:82
+msgid "Diamond 9801 / 9802 series"
+msgstr "Seritë Diamond 9801 / 9802"
+
+#: xfree86.xml.in.h:83
+msgid "Dnk"
+msgstr "Dnk"
+
+#: xfree86.xml.in.h:84
+msgid "Dutch"
+msgstr "Hollandeze"
+
+#: xfree86.xml.in.h:85
+msgid "Dvo"
+msgstr "Dvo"
+
+#: xfree86.xml.in.h:86
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: xfree86.xml.in.h:87
+msgid "Eliminate dead keys"
+msgstr "Elemino pulsantët e vdekur"
+
+#: xfree86.xml.in.h:88
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: xfree86.xml.in.h:89
+msgid "Esp"
+msgstr "Esp"
+
+#: xfree86.xml.in.h:90
+msgid "Est"
+msgstr "Est"
+
+#: xfree86.xml.in.h:91
+msgid "Estonian"
+msgstr "Estonisht"
+
+#: xfree86.xml.in.h:92
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: xfree86.xml.in.h:93
+msgid "Extended"
+msgstr "E zgjeruar"
+
+#: xfree86.xml.in.h:94
+msgid "Fao"
+msgstr "Fao"
+
+#: xfree86.xml.in.h:95
+msgid "Faroese"
+msgstr "Faroese"
+
+#: xfree86.xml.in.h:96
+msgid "Farsi"
+msgstr "Farsi"
+
+#: xfree86.xml.in.h:97
+msgid "Fin"
+msgstr "Fin"
+
+#: xfree86.xml.in.h:98
+msgid "Finnish"
+msgstr "Finlandeze"
+
+#: xfree86.xml.in.h:99
+msgid "Fra"
+msgstr "Fra"
+
+#: xfree86.xml.in.h:100
+msgid "French"
+msgstr "Frengjisht"
+
+#: xfree86.xml.in.h:101
+msgid "French (alternative)"
+msgstr "Franceze (alternativa)"
+
+#: xfree86.xml.in.h:102
+msgid "French Canadian"
+msgstr "Frengjisht e Kanadasë"
+
+#: xfree86.xml.in.h:103
+msgid "GBr"
+msgstr "GBr"
+
+#: xfree86.xml.in.h:104
+msgid "Generic 101-key PC"
+msgstr "Generic 101-key PC"
+
+#: xfree86.xml.in.h:105
+msgid "Generic 102-key (Intl) PC"
+msgstr "Generic 102-key (Intl) PC"
+
+#: xfree86.xml.in.h:106
+msgid "Generic 104-key PC"
+msgstr "Generic 104-key PC"
+
+#: xfree86.xml.in.h:107
+msgid "Generic 105-key (Intl) PC"
+msgstr "Generic 105-key (Intl) PC"
+
+#: xfree86.xml.in.h:108
+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
+msgid "Geo"
+msgstr "Geo"
+
+#: xfree86.xml.in.h:110
+msgid "Georgian (latin)"
+msgstr "Georgian (latine)"
+
+#: xfree86.xml.in.h:111
+msgid "Georgian (russian)"
+msgstr "Georgian (rusisht)"
+
+#: xfree86.xml.in.h:112
+msgid "German"
+msgstr "Gjermanisht"
+
+#: xfree86.xml.in.h:113
+msgid "Grc"
+msgstr "Grc"
+
+#: xfree86.xml.in.h:114
+msgid "Greek"
+msgstr "Greqisht"
+
+#: xfree86.xml.in.h:115
+msgid "Group Shift/Lock behavior"
+msgstr "Sjellja e grupit Shift/Lock"
+
+#: xfree86.xml.in.h:116
+msgid "Guj"
+msgstr "Guj"
+
+#: xfree86.xml.in.h:117
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: xfree86.xml.in.h:118
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: xfree86.xml.in.h:119
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Tastierë për Internet Hewlett-Packard"
+
+#: xfree86.xml.in.h:120
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: xfree86.xml.in.h:121
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: xfree86.xml.in.h:122
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: xfree86.xml.in.h:123
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: xfree86.xml.in.h:124
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: xfree86.xml.in.h:125
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: xfree86.xml.in.h:126
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: xfree86.xml.in.h:127
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Tastierë multimediale Hewlett-Packard SK-2501"
+
+#: xfree86.xml.in.h:128
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Tastierë për Internet Hewlett-Packard SK-2505"
+
+#: xfree86.xml.in.h:129
+msgid "Hin"
+msgstr "Hin"
+
+#: xfree86.xml.in.h:130
+msgid "Hindi"
+msgstr "Hindi"
+
+#: xfree86.xml.in.h:131
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: xfree86.xml.in.h:132
+msgid "Hrv"
+msgstr "Hrv"
+
+#: xfree86.xml.in.h:133
+msgid "Hun"
+msgstr "Hun"
+
+#: xfree86.xml.in.h:134
+msgid "Hungarian"
+msgstr "Hungarisht"
+
+#: xfree86.xml.in.h:135
+msgid "Hungarian (qwerty)"
+msgstr "Hungareze (qwerty)"
+
+#: xfree86.xml.in.h:136
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper është vendosur tek pulsantët Win."
+
+#: xfree86.xml.in.h:137
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: xfree86.xml.in.h:138
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: xfree86.xml.in.h:139
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (opcioni alternativ)"
+
+#: xfree86.xml.in.h:140
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: xfree86.xml.in.h:141
+msgid "INSCRIPT layout"
+msgstr "Planimetri INSCRIPT"
+
+#: xfree86.xml.in.h:142
+msgid "IS434"
+msgstr "IS434"
+
+#: xfree86.xml.in.h:143
+msgid "IS434 laptop"
+msgstr "Laptop IS434"
+
+#: xfree86.xml.in.h:144
+msgid "ISO Alternate"
+msgstr "ISO Alternative"
+
+#: xfree86.xml.in.h:145
+msgid "Icelandic"
+msgstr "Islandeze"
+
+#: xfree86.xml.in.h:146
+msgid "Iku"
+msgstr "Iku"
+
+#: xfree86.xml.in.h:147
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: xfree86.xml.in.h:148
+msgid "Irish"
+msgstr "Irlandeze"
+
+#: xfree86.xml.in.h:149
+msgid "Irl"
+msgstr "Irl"
+
+#: xfree86.xml.in.h:150
+msgid "Irn"
+msgstr "Irn"
+
+#: xfree86.xml.in.h:151
+msgid "Isl"
+msgstr "Isl"
+
+#: xfree86.xml.in.h:152
+msgid "Isr"
+msgstr "Isr"
+
+#: xfree86.xml.in.h:153
+msgid "Israeli"
+msgstr "Izraeliane"
+
+#: xfree86.xml.in.h:154
+msgid "Ita"
+msgstr "Ita"
+
+#: xfree86.xml.in.h:155
+msgid "Italian"
+msgstr "Italisht"
+
+#: xfree86.xml.in.h:156
+msgid "Japanese"
+msgstr "Japonisht"
+
+#: xfree86.xml.in.h:157
+msgid "Japanese 106-key"
+msgstr "Japoneze 106-pulsantë"
+
+#: xfree86.xml.in.h:158
+msgid "Jpn"
+msgstr "Jpn"
+
+#: xfree86.xml.in.h:159
+msgid "Kan"
+msgstr "Kan"
+
+#: xfree86.xml.in.h:160
+msgid "Kannada"
+msgstr "Kanadeze"
+
+#: xfree86.xml.in.h:161
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: xfree86.xml.in.h:162
+msgid "LAm"
+msgstr "LAm"
+
+#: xfree86.xml.in.h:163
+msgid "Laptop"
+msgstr "Laptop"
+
+#: xfree86.xml.in.h:164
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Tastierë laptop për Laptop/notebook Compaq (p.sh. Armada)"
+
+#: xfree86.xml.in.h:165
+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
+msgid "Laptop/notebook Dell Inspiron 8xxx"
+msgstr "Laptop/notebook Dell Inspiron 8xxx"
+
+#: xfree86.xml.in.h:167
+msgid "Latin"
+msgstr "Latinishte"
+
+#: xfree86.xml.in.h:168
+msgid "Latin America"
+msgstr "Latino amerikane"
+
+#: xfree86.xml.in.h:169
+msgid "Latvian"
+msgstr "Letonisht"
+
+#: xfree86.xml.in.h:170
+msgid "Left Alt key changes group"
+msgstr "Pulsanti i majtë Alt ndryshon grupin"
+
+#: xfree86.xml.in.h:171
+msgid "Left Ctrl key changes group"
+msgstr "Pulsanti i majtë Ctrl ndryshon grupin"
+
+#: xfree86.xml.in.h:172
+msgid "Left Shift key changes group"
+msgstr "Pulsanti i majtë Shift ndryshon grupin"
+
+#: xfree86.xml.in.h:173
+msgid "Left Win-key changes group"
+msgstr "Pulsanti i majtë Win ndryshon grupin"
+
+#: xfree86.xml.in.h:174
+msgid "Left Win-key switches group while pressed"
+msgstr "Pulsanti i majtë Win ndryshon grupin kur është i shtypur"
+
+#: xfree86.xml.in.h:175
+msgid "Lithuanian azerty standard"
+msgstr "Lithuanian azerty standart"
+
+#: xfree86.xml.in.h:176
+msgid "Lithuanian qwerty \"numeric\""
+msgstr "Lithuanian qwerty \"numerike\""
+
+#: xfree86.xml.in.h:177
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: xfree86.xml.in.h:178
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: xfree86.xml.in.h:179
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: xfree86.xml.in.h:180
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: xfree86.xml.in.h:181
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (opcioni alternativ)"
+
+#: xfree86.xml.in.h:182
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (opcioni i dytë alternativ)"
+
+#: xfree86.xml.in.h:183
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: xfree86.xml.in.h:184
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: xfree86.xml.in.h:185
+msgid "Logitech Deluxe Access Keyboard"
+msgstr "Tastierë Logitech Deluxe Access"
+
+#: xfree86.xml.in.h:186
+msgid "Logitech Internet Keyboard"
+msgstr "Tastierë për Internet Logitech"
+
+#: xfree86.xml.in.h:187
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Tastierë Logitech Internet Navigator"
+
+#: xfree86.xml.in.h:188
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: xfree86.xml.in.h:189
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+
+#: xfree86.xml.in.h:190
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr "Logitech iTouch keyboard Internet Navigator"
+
+#: xfree86.xml.in.h:191
+msgid "Ltu"
+msgstr "Ltu"
+
+#: xfree86.xml.in.h:192
+msgid "Lva"
+msgstr "Lva"
+
+#: xfree86.xml.in.h:193
+msgid "Macedonian"
+msgstr "Maqedonisht"
+
+#: xfree86.xml.in.h:194
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: xfree86.xml.in.h:195
+msgid "Macintosh Old"
+msgstr "Macintosh i vjetër"
+
+#: xfree86.xml.in.h:196
+msgid "Make CapsLock an additional Control"
+msgstr "Kthe CapsLock në një Control shtesë"
+
+#: xfree86.xml.in.h:197
+msgid "Mal"
+msgstr "Mal"
+
+#: xfree86.xml.in.h:198
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: xfree86.xml.in.h:199
+msgid "Maltese"
+msgstr "Malteze"
+
+#: xfree86.xml.in.h:200
+msgid "Maltese (US layout)"
+msgstr "Maltese (harta US)"
+
+#: xfree86.xml.in.h:201
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: xfree86.xml.in.h:202
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Tastierë Memorex MX2500 EZ-Access"
+
+#: xfree86.xml.in.h:203
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: xfree86.xml.in.h:204
+msgid "Menu is Compose"
+msgstr "Menu është krijuar"
+
+#: xfree86.xml.in.h:205
+msgid "Menu key changes group"
+msgstr "Pulsanti i menu ndryshon grupin"
+
+#: xfree86.xml.in.h:206
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta është vendosur tek pulsantët Win. "
+
+#: xfree86.xml.in.h:207
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta është vendosur tek pulsanti i majtë Win."
+
+#: xfree86.xml.in.h:208
+msgid "Microsoft Internet Keyboard"
+msgstr "Tastierë Microsoft Internet"
+
+#: xfree86.xml.in.h:209
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Suedeze"
+
+#: xfree86.xml.in.h:210
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: xfree86.xml.in.h:211
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: xfree86.xml.in.h:212
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: xfree86.xml.in.h:213
+msgid "Microsoft Office Keyboard"
+msgstr "Tastierë Microsoft Office"
+
+#: xfree86.xml.in.h:214
+msgid "Miscellaneous compatibility options"
+msgstr "Opcione të ndryshme kompatibiliteti"
+
+#: xfree86.xml.in.h:215
+msgid "Mkd"
+msgstr "Mkd"
+
+#: xfree86.xml.in.h:216
+msgid "Mlt"
+msgstr "Mlt"
+
+#: xfree86.xml.in.h:217
+msgid "Mmr"
+msgstr "Mmr"
+
+#: xfree86.xml.in.h:218
+msgid "Mng"
+msgstr "Mng"
+
+#: xfree86.xml.in.h:219
+msgid "Mongolian"
+msgstr "Mongoliane"
+
+#: xfree86.xml.in.h:220
+msgid "Nld"
+msgstr "Nld"
+
+#: xfree86.xml.in.h:221
+msgid "Nor"
+msgstr "Nor"
+
+#: xfree86.xml.in.h:222
+msgid "Northern Saami (Finland)"
+msgstr "Northern Saami (Finlandeze)"
+
+#: xfree86.xml.in.h:223
+msgid "Northern Saami (Norway)"
+msgstr "Northern Saami (Norvegjeze)"
+
+#: xfree86.xml.in.h:224
+msgid "Northern Saami (Sweden)"
+msgstr "Northern Saami (Suedeze)"
+
+#: xfree86.xml.in.h:225
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: xfree86.xml.in.h:226
+msgid "Norwegian"
+msgstr "Norvegjeze"
+
+#: xfree86.xml.in.h:227
+msgid "Num_Lock LED shows alternative group"
+msgstr "Llampa e Num_Lock tregon grupin alternativ"
+
+#: xfree86.xml.in.h:228
+msgid "Ogh"
+msgstr "Ogh"
+
+#: xfree86.xml.in.h:229
+msgid "Ogham"
+msgstr "Ogham"
+
+#: xfree86.xml.in.h:230
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Tastierë Oretec MCK-800 MM/Internet"
+
+#: xfree86.xml.in.h:231
+msgid "Ori"
+msgstr "Ori"
+
+#: xfree86.xml.in.h:232
+msgid "Oriya"
+msgstr "Oriya"
+
+#: xfree86.xml.in.h:233
+msgid "PC-98xx Series"
+msgstr "Seritë PC-98xx"
+
+#: xfree86.xml.in.h:234
+msgid "PC104"
+msgstr "PC104"
+
+#: xfree86.xml.in.h:235
+msgid "Pan"
+msgstr "Pan"
+
+#: xfree86.xml.in.h:236
+msgid "Phonetic"
+msgstr "Phonetic"
+
+#: xfree86.xml.in.h:237
+msgid "Pol"
+msgstr "Pol"
+
+#: xfree86.xml.in.h:238
+msgid "Polish"
+msgstr "Polonisht"
+
+#: xfree86.xml.in.h:239
+msgid "Polish (qwertz)"
+msgstr "Polake (qwertz)"
+
+#: xfree86.xml.in.h:240
+msgid "Polytonic"
+msgstr "Polytonic"
+
+#: xfree86.xml.in.h:241
+msgid "Portuguese"
+msgstr "Portugeze"
+
+#: xfree86.xml.in.h:242
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: xfree86.xml.in.h:243
+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
+msgid "Press Menu key to choose 3rd level"
+msgstr "Shtyp pulsantin Menu për të zgjedhur nivelin e tretë"
+
+#: xfree86.xml.in.h:245
+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
+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
+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
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: xfree86.xml.in.h:249
+msgid "Prt"
+msgstr "Prt"
+
+#: xfree86.xml.in.h:250
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: xfree86.xml.in.h:251
+msgid "R-Alt switches group while pressed"
+msgstr "D-Alt ndryshon grupin kur është i shtypur"
+
+#: xfree86.xml.in.h:252
+msgid "Right Alt is Compose"
+msgstr "Alt i djathtë u krijua"
+
+#: xfree86.xml.in.h:253
+msgid "Right Alt key changes group"
+msgstr "Pulsanti i djathtë Alt ndryshon grupin"
+
+#: xfree86.xml.in.h:254
+msgid "Right Control key works as Right Alt"
+msgstr "Pulsanti i djathtë Control punon si Alt i djathtë"
+
+#: xfree86.xml.in.h:255
+msgid "Right Ctrl key changes group"
+msgstr "Pulsanti i djathtë Ctrl ndryshon grupin"
+
+#: xfree86.xml.in.h:256
+msgid "Right Shift key changes group"
+msgstr "Pulsanti i djathtë Shift ndryshon grupin"
+
+#: xfree86.xml.in.h:257
+msgid "Right Win-key changes group"
+msgstr "Pulsanti i djathtë Win ndryshon grupin"
+
+#: xfree86.xml.in.h:258
+msgid "Right Win-key is Compose"
+msgstr "Pulsanti Win i djathtë u krijua"
+
+#: xfree86.xml.in.h:259
+msgid "Right Win-key switches group while pressed"
+msgstr "Pulsanti i djathtë Win ndryshon grupin kur është i shtypur"
+
+#: xfree86.xml.in.h:260
+msgid "Romanian"
+msgstr "Rumanisht"
+
+#: xfree86.xml.in.h:261
+msgid "Rou"
+msgstr "Rou"
+
+#: xfree86.xml.in.h:262
+msgid "Rus"
+msgstr "Rus"
+
+#: xfree86.xml.in.h:263
+msgid "Russian"
+msgstr "Rusisht"
+
+#: xfree86.xml.in.h:264
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: xfree86.xml.in.h:265
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: xfree86.xml.in.h:266
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: xfree86.xml.in.h:267
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: xfree86.xml.in.h:268
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: xfree86.xml.in.h:269
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: xfree86.xml.in.h:270
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: xfree86.xml.in.h:271
+msgid "Sapmi"
+msgstr "Sapmi"
+
+#: xfree86.xml.in.h:272
+msgid "Scg"
+msgstr "Scg"
+
+#: xfree86.xml.in.h:273
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "Llampa e Scroll_Lock tregon grupin alternativ"
+
+#: xfree86.xml.in.h:274
+msgid "Serbian"
+msgstr "Sërbisht"
+
+#: xfree86.xml.in.h:275
+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
+msgid "Slovak"
+msgstr "Sllovake"
+
+#: xfree86.xml.in.h:277
+msgid "Slovak (qwerty)"
+msgstr "Sllovake (qwerty)"
+
+#: xfree86.xml.in.h:278
+msgid "Slovenian"
+msgstr "Sllovene"
+
+#: xfree86.xml.in.h:279
+msgid "Sme"
+msgstr "Sme"
+
+#: xfree86.xml.in.h:280
+msgid "Spanish"
+msgstr "Spanjisht"
+
+#: xfree86.xml.in.h:281
+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
+msgid "Standard"
+msgstr "Standart"
+
+#: xfree86.xml.in.h:283
+msgid "Sun dead keys"
+msgstr "Pulsantë të vdekur Sun"
+
+#: xfree86.xml.in.h:284
+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
+msgid "Svk"
+msgstr "Svk"
+
+#: xfree86.xml.in.h:287
+msgid "Svn"
+msgstr "Svn"
+
+#: xfree86.xml.in.h:288
+msgid "Swap Control and Caps Lock"
+msgstr "Shkëmbyesi Control dhe Caps Lock"
+
+#: xfree86.xml.in.h:289
+msgid "Swe"
+msgstr "Swe"
+
+#: xfree86.xml.in.h:290
+msgid "Swedish"
+msgstr "Suedisht"
+
+#: xfree86.xml.in.h:291
+msgid "Swiss French"
+msgstr "Frengjisht e Zvicrës"
+
+#: xfree86.xml.in.h:292
+msgid "Swiss German"
+msgstr "Gjermenishte e Zvicrës"
+
+#: xfree86.xml.in.h:293
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: xfree86.xml.in.h:294
+msgid "Syr"
+msgstr "Syr"
+
+#: xfree86.xml.in.h:295
+msgid "Syriac"
+msgstr "Siriane"
+
+#: xfree86.xml.in.h:296
+msgid "Tajik"
+msgstr "Tajik"
+
+#: xfree86.xml.in.h:297
+msgid "Tamil"
+msgstr "Tamil"
+
+#: xfree86.xml.in.h:298
+msgid "Tel"
+msgstr "Tel"
+
+#: xfree86.xml.in.h:299
+msgid "Telugu"
+msgstr "Telugu"
+
+#: xfree86.xml.in.h:300
+msgid "Tha"
+msgstr "Tha"
+
+#: xfree86.xml.in.h:301
+msgid "Thai (Kedmanee)"
+msgstr "Thai (Kedmanee)"
+
+#: xfree86.xml.in.h:302
+msgid "Thai (Pattachote)"
+msgstr "Thai (Pattachote)"
+
+#: xfree86.xml.in.h:303
+msgid "Thai (TIS-820.2538)"
+msgstr "Thai (TIS-820.2538)"
+
+#: xfree86.xml.in.h:304
+msgid "Third level choosers"
+msgstr "Zgjedhësit e nivelit të tretë"
+
+#: xfree86.xml.in.h:305
+msgid "Tjk"
+msgstr "Tjk"
+
+#: xfree86.xml.in.h:306
+msgid "Tml"
+msgstr "Tml"
+
+#: xfree86.xml.in.h:307
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: xfree86.xml.in.h:308
+msgid "Trust Direct Access Keyboard"
+msgstr "Tastierë Trust Direct Access"
+
+#: xfree86.xml.in.h:309
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Tastierë klasike Trust Wireless"
+
+#: xfree86.xml.in.h:310
+msgid "Tur"
+msgstr "Tur"
+
+#: xfree86.xml.in.h:311
+msgid "Turkish"
+msgstr "Turqisht"
+
+#: xfree86.xml.in.h:312
+msgid "Turkish (F)"
+msgstr "Turke (F)"
+
+#: xfree86.xml.in.h:313
+msgid "Turkish Alt-Q Layout"
+msgstr "Planimetria Alt-Q Turke"
+
+#: xfree86.xml.in.h:314
+msgid "U.S. English"
+msgstr "U.S. Anglisht"
+
+#: xfree86.xml.in.h:315
+msgid "U.S. English w/ ISO9995-3"
+msgstr "U.S. Anglisht w/ ISO9995-3"
+
+#: xfree86.xml.in.h:316
+msgid "U.S. English w/ dead keys"
+msgstr "U.S. Anglisht w/ dead keys"
+
+#: xfree86.xml.in.h:317
+msgid "US"
+msgstr "US"
+
+#: xfree86.xml.in.h:318
+msgid "US keyboard with Romanian letters"
+msgstr "Tastierë US me gërma Romane"
+
+#: xfree86.xml.in.h:319
+msgid "USA"
+msgstr "USA"
+
+#: xfree86.xml.in.h:320
+msgid "Ukr"
+msgstr "Ukr"
+
+#: xfree86.xml.in.h:321
+msgid "Ukrainian"
+msgstr "Ukrahinase"
+
+#: xfree86.xml.in.h:322
+msgid "UnicodeExpert"
+msgstr "EkspertUnicode"
+
+#: xfree86.xml.in.h:323
+msgid "United Kingdom"
+msgstr "Mbretëria e Bashkuar"
+
+#: xfree86.xml.in.h:324
+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
+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
+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
+msgid "Uzb"
+msgstr "Uzb"
+
+#: xfree86.xml.in.h:328
+msgid "Uzbek"
+msgstr "Uzbek"
+
+#: xfree86.xml.in.h:329
+msgid "Vietnamese"
+msgstr "Vietnamisht"
+
+#: xfree86.xml.in.h:330
+msgid "Vnm"
+msgstr "Vnm"
+
+#: xfree86.xml.in.h:331
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: xfree86.xml.in.h:332
+msgid "Winkeys"
+msgstr "Winkeys"
+
+#: xfree86.xml.in.h:333
+msgid "Yahoo! Internet Keyboard"
+msgstr "Tastierë Yahoo! Internet"
+
+#: xfree86.xml.in.h:334
+msgid "Yug"
+msgstr "Yug"
+
+#: xfree86.xml.in.h:335
+msgid "Yugoslavian"
+msgstr "Yugoslavian"
+
+#: xfree86.xml.in.h:336
+msgid "abnt2"
+msgstr "abnt2"
+
+#: xfree86.xml.in.h:337
+msgid "azerty"
+msgstr "azerty"
+
+#: xfree86.xml.in.h:338
+msgid "azerty/digits"
+msgstr "azerty/digits"
+
+#: xfree86.xml.in.h:339
+msgid "bksl"
+msgstr "bksl"
+
+#: xfree86.xml.in.h:340
+msgid "digits"
+msgstr "numra"
+
+#: xfree86.xml.in.h:341
+msgid "l2/101/qwerty/comma"
+msgstr "l2/101/qwerty/presje"
+
+#: xfree86.xml.in.h:342
+msgid "l2/101/qwerty/dot"
+msgstr "l2/101/qwerty/pikë"
+
+#: xfree86.xml.in.h:343
+msgid "l2/101/qwertz/comma"
+msgstr "l2/101/qwertz/presje"
+
+#: xfree86.xml.in.h:344
+msgid "l2/101/qwertz/dot"
+msgstr "l2/101/qwertz/pikë"
+
+#: xfree86.xml.in.h:345
+msgid "l2/102/qwerty/comma"
+msgstr "l2/102/qwerty/presje"
+
+#: xfree86.xml.in.h:346
+msgid "l2/102/qwerty/dot"
+msgstr "l2/102/qwerty/pikë"
+
+#: xfree86.xml.in.h:347
+msgid "l2/102/qwertz/comma"
+msgstr "l2/102/qwertz/presje"
+
+#: xfree86.xml.in.h:348
+msgid "l2/102/qwertz/dot"
+msgstr "l2/102/qwertz/pikë"
+
+#: xfree86.xml.in.h:349
+msgid "laptop"
+msgstr "laptop"
+
+#: xfree86.xml.in.h:350
+msgid "lyx"
+msgstr "lyx"
+
+#: xfree86.xml.in.h:351
+msgid "qwerty"
+msgstr "qwerty"
+
+#: xfree86.xml.in.h:352
+msgid "qwerty/digits"
+msgstr "qwerty/numra"
+
+#: xfree86.xml.in.h:353
+msgid "sefi"
+msgstr "sefi"
+
+#: xfree86.xml.in.h:354
+msgid "si1452"
+msgstr "si1452"
+
+#: xfree86.xml.in.h:355
+msgid "uni/101/qwerty/comma"
+msgstr "uni/101/qwerty/presje"
+
+#: xfree86.xml.in.h:356
+msgid "uni/101/qwerty/dot"
+msgstr "uni/101/qwerty/pikë"
+
+#: xfree86.xml.in.h:357
+msgid "uni/101/qwertz/comma"
+msgstr "uni/101/qwertz/presje"
+
+#: xfree86.xml.in.h:358
+msgid "uni/101/qwertz/dot"
+msgstr "uni/101/qwertz/pikë"
+
+#: xfree86.xml.in.h:359
+msgid "uni/102/qwerty/comma"
+msgstr "uni/102/qwerty/presje"
+
+#: xfree86.xml.in.h:360
+msgid "uni/102/qwerty/dot"
+msgstr "uni/102/qwerty/pikë"
+
+#: xfree86.xml.in.h:361
+msgid "uni/102/qwertz/comma"
+msgstr "uni/102/qwertz/presje"
+
+#: xfree86.xml.in.h:362
+msgid "uni/102/qwertz/dot"
+msgstr "uni/102/qwertz/pikë"
+
diff --git a/xorg-server/xkbdata.src/po/sr.po b/xorg-server/xkbdata.src/po/sr.po
new file mode 100644
index 000000000..d4ed4a5f3
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/sr.po
@@ -0,0 +1,2066 @@
+# Serbian translation of xfree_xkb_xml-4.4pre1
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-02 19:07+0100\n"
+"PO-Revision-Date: 2006-03-02 19:14+0100\n"
+"Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/запета/акценти"
+
+#: ../rules/base.xml.in.h:3
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/запета/без акцената"
+
+#: ../rules/base.xml.in.h:4
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/тачка/акценти"
+
+#: ../rules/base.xml.in.h:5
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/тачка/без акцената"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/запета/акценти"
+
+#: ../rules/base.xml.in.h:7
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/запета/без акцената"
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/тачка/акценти"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/тачка/без акцената"
+
+#: ../rules/base.xml.in.h:10
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/запета/акценти"
+
+#: ../rules/base.xml.in.h:11
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/запета/без акцената"
+
+#: ../rules/base.xml.in.h:12
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/тачка/акценти"
+
+#: ../rules/base.xml.in.h:13
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/тачка/без акцената"
+
+#: ../rules/base.xml.in.h:14
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/запета/акценти"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/запета/без акцената"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/тачка/акценти"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/тачка/без акцената"
+
+#: ../rules/base.xml.in.h:18
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:19
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:20
+msgid "ACPI Standard"
+msgstr "ACPI �тандард"
+
+#: ../rules/base.xml.in.h:21
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:22
+msgid "Acer TravelMate 800"
+msgstr "Acer TravelMate 800"
+
+#: ../rules/base.xml.in.h:23
+msgid "Add the EuroSign to the 2 key."
+msgstr "Додај знак за евро на та�тер 2."
+
+#: ../rules/base.xml.in.h:24
+msgid "Add the EuroSign to the 5 key."
+msgstr "Додај знак за евро на та�тер 5."
+
+#: ../rules/base.xml.in.h:25
+msgid "Add the EuroSign to the E key."
+msgstr "Додај знак за евро на та�тер E."
+
+#: ../rules/base.xml.in.h:26
+msgid "Add the standard behavior to Menu key."
+msgstr "Додај обично понашање Menu та�теру."
+
+#: ../rules/base.xml.in.h:27
+msgid "Adding the EuroSign to certain keys"
+msgstr "Додавање знака за евро одређеним та�терима"
+
+#
+#: ../rules/base.xml.in.h:28
+msgid "Advance Scorpius KI"
+msgstr "�апредни Шкорпион КИ"
+
+#: ../rules/base.xml.in.h:29
+msgid "Afg"
+msgstr "афг"
+
+#: ../rules/base.xml.in.h:30
+msgid "Afghanistan"
+msgstr "�фгани�тан"
+
+#: ../rules/base.xml.in.h:31
+msgid "Akan"
+msgstr "акан"
+
+#: ../rules/base.xml.in.h:32
+msgid "Alb"
+msgstr "алб"
+
+#: ../rules/base.xml.in.h:33
+msgid "Albania"
+msgstr "�лбанија"
+
+#: ../rules/base.xml.in.h:34
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Alt и Meta �у на Alt та�терима (подразумевано)."
+
+#: ../rules/base.xml.in.h:35
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt је мапиран на де�ни Windows та�тер, а Super на Menu."
+
+#: ../rules/base.xml.in.h:36
+msgid "Alt+Ctrl changes group."
+msgstr "Alt+Ctrl мења групу."
+
+#: ../rules/base.xml.in.h:37
+msgid "Alt+Shift changes group."
+msgstr "Alt+Shift мења групу."
+
+#: ../rules/base.xml.in.h:38
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:39
+msgid "Alt/Win key behavior"
+msgstr "Понашање Alt/Win та�тера"
+
+# �аизменично?
+#: ../rules/base.xml.in.h:40
+msgid "Alternative"
+msgstr "Допун�ка"
+
+#: ../rules/base.xml.in.h:41
+msgid "Alternative international (former us_intl)"
+msgstr "Допун�ка међународна (бивша us_intl)"
+
+#: ../rules/base.xml.in.h:42
+msgid "Alternative, Sun dead keys"
+msgstr "Допун�ка, Sun-ови акценти"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alternative, eliminate dead keys"
+msgstr "Допун�ка, без акцената"
+
+#: ../rules/base.xml.in.h:44
+msgid "And"
+msgstr "анд"
+
+#: ../rules/base.xml.in.h:45
+msgid "Andorra"
+msgstr "�ндора"
+
+#: ../rules/base.xml.in.h:46
+msgid "Apostrophe (') variant"
+msgstr "Варијанта �а апо�трофом (')"
+
+#: ../rules/base.xml.in.h:47
+msgid "Ara"
+msgstr "ара"
+
+#: ../rules/base.xml.in.h:48
+msgid "Arabic"
+msgstr "арап�ки"
+
+#: ../rules/base.xml.in.h:49
+msgid "Arm"
+msgstr "јрм"
+
+#: ../rules/base.xml.in.h:50
+msgid "Armenia"
+msgstr "Јерменија"
+
+#: ../rules/base.xml.in.h:51
+msgid "Aze"
+msgstr "азб"
+
+#: ../rules/base.xml.in.h:52
+msgid "Azerbaijan"
+msgstr "�зербејџан"
+
+#: ../rules/base.xml.in.h:53
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 бежична Интернет та�татура"
+
+#: ../rules/base.xml.in.h:54
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:55
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF мултимедијална"
+
+#: ../rules/base.xml.in.h:56
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:57
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:58
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:59
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:60
+msgid "Ban"
+msgstr "бан"
+
+#: ../rules/base.xml.in.h:61
+msgid "Bangladesh"
+msgstr "Бангладеш"
+
+#: ../rules/base.xml.in.h:62
+msgid "Bel"
+msgstr "блг"
+
+#: ../rules/base.xml.in.h:63
+msgid "Belarus"
+msgstr "Белору�ија"
+
+#: ../rules/base.xml.in.h:64
+msgid "Belgium"
+msgstr "Белгија"
+
+#: ../rules/base.xml.in.h:65
+msgid "Bengali"
+msgstr "бенгал�ки"
+
+#: ../rules/base.xml.in.h:66
+msgid "Bengali Probhat"
+msgstr "бенгал�ки пробат"
+
+#: ../rules/base.xml.in.h:67
+msgid "Bgr"
+msgstr "буг"
+
+#: ../rules/base.xml.in.h:68
+msgid "Bhu"
+msgstr "бут"
+
+#: ../rules/base.xml.in.h:69
+msgid "Bhutan"
+msgstr "Бутан"
+
+#: ../rules/base.xml.in.h:70
+msgid "Bih"
+msgstr "бих"
+
+#: ../rules/base.xml.in.h:71
+msgid "Blr"
+msgstr "блр"
+
+#: ../rules/base.xml.in.h:72
+msgid "Bosnia and Herzegovina"
+msgstr "Бо�на и Херцеговина"
+
+#: ../rules/base.xml.in.h:73
+msgid "Both Alt keys together change group."
+msgstr "Оба Alt та�тера мењају групу."
+
+#: ../rules/base.xml.in.h:74
+msgid "Both Ctrl keys together change group."
+msgstr "Оба Ctrl та�тера мењају групу."
+
+#: ../rules/base.xml.in.h:75
+msgid "Both Shift keys together change group."
+msgstr "Оба Shift та�тера мењају групу."
+
+#: ../rules/base.xml.in.h:76
+msgid "Both Win-keys switch group while pressed."
+msgstr "Оба Win-та�тера мењају групу када �у прити�нути."
+
+#: ../rules/base.xml.in.h:77
+msgid "Bra"
+msgstr "бра"
+
+#: ../rules/base.xml.in.h:78
+msgid "Brazil"
+msgstr "Бразил"
+
+#: ../rules/base.xml.in.h:79
+msgid "Brazilian ABNT2"
+msgstr "бразил�ка ABNT2"
+
+#: ../rules/base.xml.in.h:80
+msgid "Brother Internet Keyboard"
+msgstr "Brother Интернет та�татура"
+
+#: ../rules/base.xml.in.h:81
+msgid "Bulgaria"
+msgstr "Бугар�ка"
+
+#: ../rules/base.xml.in.h:82
+msgid "Cambodia"
+msgstr "Камбоџа"
+
+#: ../rules/base.xml.in.h:83
+msgid "Can"
+msgstr "кан"
+
+#: ../rules/base.xml.in.h:84
+msgid "Canada"
+msgstr "Канада"
+
+#: ../rules/base.xml.in.h:85
+msgid "Caps Lock is Compose."
+msgstr "Caps Lock је комбинујући та�тер."
+
+#: ../rules/base.xml.in.h:86
+msgid "CapsLock LED shows alternative group."
+msgstr "Лампица за Caps Lock показује измењивање групе."
+
+#: ../rules/base.xml.in.h:87
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "CapsLock �е понаша као трајни Shift. Shift укида Caps."
+
+#: ../rules/base.xml.in.h:88
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "CapsLock �е понаша као трајни Shift. Shift не укида Caps."
+
+#: ../rules/base.xml.in.h:89
+msgid "CapsLock just locks the Shift modifier."
+msgstr "CapsLock про�то трајно укључује Shift."
+
+#: ../rules/base.xml.in.h:90
+msgid "CapsLock key behavior"
+msgstr "Понашање Caps Lock та�тера"
+
+#: ../rules/base.xml.in.h:91
+msgid "CapsLock key changes group."
+msgstr "Caps Lock та�тер мења групу."
+
+#: ../rules/base.xml.in.h:92
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "CapsLock мења Shift �тање па делује на �ве та�тере."
+
+#: ../rules/base.xml.in.h:93
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "CapsLock мења обичну величину �лова."
+
+#: ../rules/base.xml.in.h:94
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr "CapsLock кори�ти унутрашњу величину �лова. Shift укида Caps Lock."
+
+#: ../rules/base.xml.in.h:95
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr "CapsLock кори�ти унутрашњу величину �лова. Shift не укида Caps Lock."
+
+#: ../rules/base.xml.in.h:96
+msgid "Catalan variant with middle-dot L"
+msgstr "каталон�ка варијанта �а L и �редњом тачком"
+
+#: ../rules/base.xml.in.h:97
+msgid "Che"
+msgstr "швц"
+
+#: ../rules/base.xml.in.h:98
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:99
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (друга могућно�т)"
+
+#: ../rules/base.xml.in.h:100
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:101
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:102
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Интернет та�татура"
+
+#: ../rules/base.xml.in.h:103
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:104
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:105
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq та�татура за лак при�туп"
+
+#: ../rules/base.xml.in.h:106
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Интернет та�татура (13 та�тера)"
+
+#: ../rules/base.xml.in.h:107
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Интернет та�татура (18 та�тера)"
+
+#: ../rules/base.xml.in.h:108
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Интернет та�татура (7 та�тера)"
+
+#: ../rules/base.xml.in.h:109
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq та�татура"
+
+#: ../rules/base.xml.in.h:110
+msgid "Compose key position"
+msgstr "Положај та�тера Compose"
+
+#: ../rules/base.xml.in.h:111
+msgid "Croatia"
+msgstr "Хрват�ка"
+
+#: ../rules/base.xml.in.h:112
+msgid "Ctrl key at bottom left"
+msgstr "Та�тер Ctrl је у дну лево"
+
+#: ../rules/base.xml.in.h:113
+msgid "Ctrl key at left of 'A'"
+msgstr "Та�тер Ctrl је у лево од „�“"
+
+#: ../rules/base.xml.in.h:114
+msgid "Ctrl key position"
+msgstr "Положај та�тера Ctrl"
+
+#: ../rules/base.xml.in.h:115
+msgid "Ctrl+Shift changes group."
+msgstr "Ctrl+Shift мења групу."
+
+#: ../rules/base.xml.in.h:116
+msgid "Cyrillic"
+msgstr "ћирилични"
+
+#: ../rules/base.xml.in.h:117
+msgid "Cze"
+msgstr "чеш"
+
+#: ../rules/base.xml.in.h:118
+msgid "Czechia"
+msgstr "Чешка"
+
+#: ../rules/base.xml.in.h:119
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:120
+msgid "Dead acute"
+msgstr "�кут�ки акценат"
+
+#: ../rules/base.xml.in.h:121
+msgid "Dead grave acute"
+msgstr "Грави� акут�ки акценат"
+
+#: ../rules/base.xml.in.h:122
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:123
+msgid "Dell 101-key PC"
+msgstr "Dell 101-та�тер PC"
+
+#: ../rules/base.xml.in.h:124
+msgid "Dell USB Multimedia Keybard"
+msgstr "Dell USB мултимедијална та�татура"
+
+#: ../rules/base.xml.in.h:125
+msgid "Denmark"
+msgstr "Дан�ка"
+
+#: ../rules/base.xml.in.h:126
+msgid "Deu"
+msgstr "нем"
+
+#: ../rules/base.xml.in.h:127
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa бежична та�татура"
+
+#: ../rules/base.xml.in.h:128
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 �ерија"
+
+#: ../rules/base.xml.in.h:129
+msgid "Dnk"
+msgstr "дан"
+
+#: ../rules/base.xml.in.h:130
+msgid "Dvorak"
+msgstr "дворак"
+
+#: ../rules/base.xml.in.h:131
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "дворак, пољ�ки наводници на та�теру „1/!“"
+
+#: ../rules/base.xml.in.h:132
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "дворак, пољ�ки наводници на та�теру наводника"
+
+#: ../rules/base.xml.in.h:133
+msgid "Eliminate dead keys"
+msgstr "Уклони акценте"
+
+#: ../rules/base.xml.in.h:134
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:135
+msgid "Epo"
+msgstr "е�п"
+
+#: ../rules/base.xml.in.h:136
+msgid "Esp"
+msgstr "шпа"
+
+#: ../rules/base.xml.in.h:137
+msgid "Esperanto"
+msgstr "е�перанто"
+
+#: ../rules/base.xml.in.h:138
+msgid "Est"
+msgstr "е�т"
+
+#: ../rules/base.xml.in.h:139
+msgid "Estonia"
+msgstr "Е�тонија"
+
+#: ../rules/base.xml.in.h:140
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:141
+msgid "Ewe"
+msgstr "Еве"
+
+#: ../rules/base.xml.in.h:142
+msgid "Extended"
+msgstr "Проширено"
+
+#: ../rules/base.xml.in.h:143
+msgid "Extended Backslash"
+msgstr "Проширено уз обрнуту ко�у црту"
+
+#: ../rules/base.xml.in.h:144
+msgid "F-letter (F) variant"
+msgstr "Варијанта �а F-�ловом (F)"
+
+#: ../rules/base.xml.in.h:145
+msgid "Fao"
+msgstr "фар"
+
+#: ../rules/base.xml.in.h:146
+msgid "Faroe Islands"
+msgstr "Фар�ка о�трва"
+
+#: ../rules/base.xml.in.h:147
+msgid "Fin"
+msgstr "фин"
+
+#: ../rules/base.xml.in.h:148
+msgid "Finland"
+msgstr "Фин�ка"
+
+#: ../rules/base.xml.in.h:149
+msgid "Fra"
+msgstr "фра"
+
+#: ../rules/base.xml.in.h:150
+msgid "France"
+msgstr "Францу�ка"
+
+#: ../rules/base.xml.in.h:151
+msgid "French"
+msgstr "францу�ки"
+
+#: ../rules/base.xml.in.h:152
+msgid "French (legacy)"
+msgstr "францу�ки (кла�ични)"
+
+#: ../rules/base.xml.in.h:153
+msgid "French Dvorak"
+msgstr "францу�ки дворак"
+
+#: ../rules/base.xml.in.h:154
+msgid "French, Sun dead keys"
+msgstr "францу�ки, Sun-ови акценти"
+
+#: ../rules/base.xml.in.h:155
+msgid "French, eliminate dead keys"
+msgstr "Францу�ки, без акцената"
+
+#: ../rules/base.xml.in.h:156
+msgid "Fula"
+msgstr "Фула"
+
+#: ../rules/base.xml.in.h:157
+msgid "GBr"
+msgstr "вбр"
+
+#: ../rules/base.xml.in.h:158
+msgid "Ga"
+msgstr "Га"
+
+#: ../rules/base.xml.in.h:159
+msgid "Generic 101-key PC"
+msgstr "Обична �а 101 та�тером"
+
+#: ../rules/base.xml.in.h:160
+msgid "Generic 102-key (Intl) PC"
+msgstr "Обична �а 102 та�тера (међунар.)"
+
+#: ../rules/base.xml.in.h:161
+msgid "Generic 104-key PC"
+msgstr "Обична �а 104 та�тера"
+
+#: ../rules/base.xml.in.h:162
+msgid "Generic 105-key (Intl) PC"
+msgstr "Обична �а 105 та�тера (међунар.)"
+
+#: ../rules/base.xml.in.h:163
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:164
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius ММ та�татура KWD-910"
+
+#: ../rules/base.xml.in.h:165
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:166
+msgid "Geo"
+msgstr "гру"
+
+#: ../rules/base.xml.in.h:167
+msgid "Georgia"
+msgstr "Грузија"
+
+#: ../rules/base.xml.in.h:168
+msgid "German, Sun dead keys"
+msgstr "немачки, Sun-ови акценти"
+
+#: ../rules/base.xml.in.h:169
+msgid "German, eliminate dead keys"
+msgstr "немачки, без акцената"
+
+#: ../rules/base.xml.in.h:170
+msgid "Germany"
+msgstr "�емачка"
+
+#: ../rules/base.xml.in.h:171
+msgid "Gha"
+msgstr "га"
+
+#: ../rules/base.xml.in.h:172
+msgid "Ghana"
+msgstr "Гана"
+
+#: ../rules/base.xml.in.h:173
+msgid "Gre"
+msgstr "грк"
+
+#: ../rules/base.xml.in.h:174
+msgid "Greece"
+msgstr "Грчка"
+
+#: ../rules/base.xml.in.h:175
+msgid "Group Shift/Lock behavior"
+msgstr "Понашање измене/избора групе"
+
+#: ../rules/base.xml.in.h:176
+msgid "Gujarati"
+msgstr "гујарати"
+
+#: ../rules/base.xml.in.h:177
+msgid "Gurmukhi"
+msgstr "гурмуки"
+
+#: ../rules/base.xml.in.h:178
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:179
+msgid "Hausa"
+msgstr "Хау�а"
+
+#: ../rules/base.xml.in.h:180
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Интернет та�татура"
+
+#: ../rules/base.xml.in.h:181
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:182
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:183
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:184
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:185
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:186
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:187
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:188
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 мултимедијална та�татура"
+
+#: ../rules/base.xml.in.h:189
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Интернет та�татура"
+
+#: ../rules/base.xml.in.h:190
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:191
+msgid "Hrv"
+msgstr "хрв"
+
+#: ../rules/base.xml.in.h:192
+msgid "Hun"
+msgstr "мађ"
+
+#: ../rules/base.xml.in.h:193
+msgid "Hungary"
+msgstr "Мађар�ка"
+
+#: ../rules/base.xml.in.h:194
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper је мапиран на Win та�тере."
+
+#: ../rules/base.xml.in.h:195
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:196
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:197
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (друга могућно�т)"
+
+#: ../rules/base.xml.in.h:198
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:199
+msgid "ISO Alternate"
+msgstr "Додатни ИСО"
+
+#: ../rules/base.xml.in.h:200
+msgid "Iceland"
+msgstr "И�ланд"
+
+#: ../rules/base.xml.in.h:201
+msgid "Ind"
+msgstr "инд"
+
+#: ../rules/base.xml.in.h:202
+msgid "India"
+msgstr "Индија"
+
+#: ../rules/base.xml.in.h:203
+msgid "International (with dead keys)"
+msgstr "Међународна (�а акцентима)"
+
+#: ../rules/base.xml.in.h:204
+msgid "Inuktitut"
+msgstr "инуктитут"
+
+#: ../rules/base.xml.in.h:205
+msgid "Iran"
+msgstr "Иран"
+
+#: ../rules/base.xml.in.h:206
+msgid "Ireland"
+msgstr "Ир�ка"
+
+#: ../rules/base.xml.in.h:207
+msgid "Irl"
+msgstr "ир�"
+
+#: ../rules/base.xml.in.h:208
+msgid "Irn"
+msgstr "ирн"
+
+#: ../rules/base.xml.in.h:209
+msgid "Isl"
+msgstr "и�л"
+
+#: ../rules/base.xml.in.h:210
+msgid "Isr"
+msgstr "изр"
+
+#: ../rules/base.xml.in.h:211
+msgid "Israel"
+msgstr "Израел"
+
+#: ../rules/base.xml.in.h:212
+msgid "Ita"
+msgstr "ита"
+
+#: ../rules/base.xml.in.h:213
+msgid "Italy"
+msgstr "Италија"
+
+#: ../rules/base.xml.in.h:214
+msgid "Japan"
+msgstr "Јапан"
+
+#: ../rules/base.xml.in.h:215
+msgid "Japanese 106-key"
+msgstr "јапан�ки �а 106 та�тера"
+
+#: ../rules/base.xml.in.h:216
+msgid "Jpn"
+msgstr "јпн"
+
+#: ../rules/base.xml.in.h:217
+msgid "Kannada"
+msgstr "канада (јужна индија)"
+
+#: ../rules/base.xml.in.h:218
+msgid "Kaz"
+msgstr "каз"
+
+#: ../rules/base.xml.in.h:219
+msgid "Kazakh with Russian"
+msgstr "казах�тан�ки �а ру�ким"
+
+#: ../rules/base.xml.in.h:220
+msgid "Kazakhstan"
+msgstr "Казах�тан"
+
+#: ../rules/base.xml.in.h:221
+msgid "Keypad"
+msgstr "�умеричка та�татура"
+
+#: ../rules/base.xml.in.h:222
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:223
+msgid "Khm"
+msgstr "кмб"
+
+#: ../rules/base.xml.in.h:224
+msgid "Kyr"
+msgstr "кир"
+
+#: ../rules/base.xml.in.h:225
+msgid "Kyrgyzstan"
+msgstr "Кирги�тан"
+
+#: ../rules/base.xml.in.h:226
+msgid "LAm"
+msgstr "Ј�м"
+
+#: ../rules/base.xml.in.h:227
+msgid "Lao"
+msgstr "лао"
+
+#: ../rules/base.xml.in.h:228
+msgid "Laos"
+msgstr "Лао�"
+
+#: ../rules/base.xml.in.h:229
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Та�татуре прено�них рачунара из Compaq-а (нпр. Armada)"
+
+#: ../rules/base.xml.in.h:230
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Та�татуре прено�них рачунара из Compaq-а (нпр. Presario)"
+
+#: ../rules/base.xml.in.h:231
+msgid "Laptop/notebook Dell Inspiron 6xxx/8xxx"
+msgstr "Та�татуре прено�них рачунара Dell Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:232
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Прено�не eMachines m68xx"
+
+#: ../rules/base.xml.in.h:233
+msgid "Latin"
+msgstr "латинични"
+
+#: ../rules/base.xml.in.h:234
+msgid "Latin American"
+msgstr "јужноамерички"
+
+#: ../rules/base.xml.in.h:235
+msgid "Latin Unicode"
+msgstr "латинични Уникод"
+
+#: ../rules/base.xml.in.h:236
+msgid "Latin Unicode qwerty"
+msgstr "латинични Уникод qwerty"
+
+#: ../rules/base.xml.in.h:237
+msgid "Latin qwerty"
+msgstr "латинични qwerty"
+
+#: ../rules/base.xml.in.h:238
+msgid "Latin with guillemots"
+msgstr "латинични �а гиљемотима"
+
+#: ../rules/base.xml.in.h:239
+msgid "Latvia"
+msgstr "Летонија"
+
+#: ../rules/base.xml.in.h:240
+msgid "Left Alt key changes group."
+msgstr "Леви Alt та�тер мења групу."
+
+#: ../rules/base.xml.in.h:241
+msgid "Left Alt key switches group while pressed."
+msgstr "Леви Alt та�тер мења групу док је прити�нут."
+
+#: ../rules/base.xml.in.h:242
+msgid "Left Ctrl key changes group."
+msgstr "Леви Ctrl та�тер мења групу."
+
+#: ../rules/base.xml.in.h:243
+msgid "Left Shift key changes group."
+msgstr "Леви Shift та�тер мења групу."
+
+#: ../rules/base.xml.in.h:244
+msgid "Left Win-key changes group."
+msgstr "Леви Windows та�тер мења групу."
+
+#: ../rules/base.xml.in.h:245
+msgid "Left Win-key switches group while pressed."
+msgstr "Леви Windows та�тер мења групу док је прити�нут."
+
+#: ../rules/base.xml.in.h:246
+msgid "Left handed Dvorak"
+msgstr "Леворучни Дворак"
+
+#: ../rules/base.xml.in.h:247
+msgid "Lithuania"
+msgstr "Литванија"
+
+#: ../rules/base.xml.in.h:248
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access та�татура"
+
+#: ../rules/base.xml.in.h:249
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:250
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:251
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:252
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: ../rules/base.xml.in.h:253
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (додатна могућно�т)"
+
+#: ../rules/base.xml.in.h:254
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (додатна могућно�т 2)"
+
+#: ../rules/base.xml.in.h:255
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:256
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:257
+msgid "Logitech Deluxe Access Keyboard"
+msgstr "Logitech Deluxe Access та�татура"
+
+#: ../rules/base.xml.in.h:258
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Интернет та�татура"
+
+#: ../rules/base.xml.in.h:259
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Интернет навигатор та�татура"
+
+#: ../rules/base.xml.in.h:260
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X та�татура"
+
+#: ../rules/base.xml.in.h:261
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:262
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless та�татура (модел Y-RB6)"
+
+#: ../rules/base.xml.in.h:263
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr "Logitech iTouch та�татура Интернет навигатор"
+
+#: ../rules/base.xml.in.h:264
+msgid "Ltu"
+msgstr "лит"
+
+#: ../rules/base.xml.in.h:265
+msgid "Lva"
+msgstr "лет"
+
+#: ../rules/base.xml.in.h:266
+msgid "Macedonia"
+msgstr "Македонија"
+
+#: ../rules/base.xml.in.h:267
+msgid "Macintosh"
+msgstr "Мекинтош"
+
+#: ../rules/base.xml.in.h:268
+msgid "Macintosh Old"
+msgstr "Стари Мекинтош"
+
+#: ../rules/base.xml.in.h:269
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Учини Caps Lock додатним Ctrl та�тером."
+
+#: ../rules/base.xml.in.h:270
+msgid "Mal"
+msgstr "мал"
+
+#: ../rules/base.xml.in.h:271
+msgid "Malayalam"
+msgstr "малајам�ки"
+
+#: ../rules/base.xml.in.h:272
+msgid "Maldives"
+msgstr "Малдиви"
+
+#: ../rules/base.xml.in.h:273
+msgid "Malta"
+msgstr "Малта"
+
+#: ../rules/base.xml.in.h:274
+msgid "Mao"
+msgstr "мао"
+
+#: ../rules/base.xml.in.h:275
+msgid "Maori"
+msgstr "Маори"
+
+#: ../rules/base.xml.in.h:276
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:277
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access та�татура"
+
+#: ../rules/base.xml.in.h:278
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:279
+msgid "Menu is Compose."
+msgstr "Menu је комбинујући та�тер."
+
+#: ../rules/base.xml.in.h:280
+msgid "Menu key changes group."
+msgstr "Menu та�тер мења групу."
+
+#: ../rules/base.xml.in.h:281
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta је мапиран на Windows та�тере."
+
+#: ../rules/base.xml.in.h:282
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta је мапиран на леви Windows та�тер."
+
+#: ../rules/base.xml.in.h:283
+msgid "Microsoft Internet Keyboard"
+msgstr "Микро�офтова Интернет та�татура"
+
+#: ../rules/base.xml.in.h:284
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Микро�офтова Интернет Про та�татура, швед�ки"
+
+#: ../rules/base.xml.in.h:285
+msgid "Microsoft Natural"
+msgstr "Микро�офт �атурал"
+
+#: ../rules/base.xml.in.h:286
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Микро�офт �атурал та�татура Про / Микро�офт Интернет та�татура Про "
+
+#: ../rules/base.xml.in.h:287
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Микро�офт �атурал та�татура Про ОЕМ"
+
+#: ../rules/base.xml.in.h:288
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr ""
+"Микро�офтова �атурал та�татура Про УСБ / Микро�офт Интернет та�татура Про "
+
+#: ../rules/base.xml.in.h:289
+msgid "Microsoft Office Keyboard"
+msgstr "Микро�офтова канцелариј�ка та�татура"
+
+#: ../rules/base.xml.in.h:290
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Микро�офтова бежична мултимедијална та�татура 1.0�"
+
+#: ../rules/base.xml.in.h:291
+msgid "Miscellaneous compatibility options"
+msgstr "Разне могућно�ти за �агла�но�т"
+
+#: ../rules/base.xml.in.h:292
+msgid "Mkd"
+msgstr "мак"
+
+#: ../rules/base.xml.in.h:293
+msgid "Mlt"
+msgstr "мал"
+
+#: ../rules/base.xml.in.h:294
+msgid "Mmr"
+msgstr "ммр"
+
+#: ../rules/base.xml.in.h:295
+msgid "Mng"
+msgstr "мнг"
+
+#: ../rules/base.xml.in.h:296
+msgid "Mongolia"
+msgstr "Монголија"
+
+#: ../rules/base.xml.in.h:297
+msgid "Multilingual"
+msgstr "Вишејезична"
+
+#: ../rules/base.xml.in.h:298
+msgid "Multilingual, first part"
+msgstr "Вишејезична, први део"
+
+#: ../rules/base.xml.in.h:299
+msgid "Multilingual, second part"
+msgstr "Вишејезична, други део"
+
+#: ../rules/base.xml.in.h:300
+msgid "Myanmar"
+msgstr "Мијанмар"
+
+#: ../rules/base.xml.in.h:301
+msgid "Netherlands"
+msgstr "Холандија"
+
+#: ../rules/base.xml.in.h:302
+msgid "Nld"
+msgstr "хол"
+
+#: ../rules/base.xml.in.h:303
+msgid "Nor"
+msgstr "нор"
+
+#: ../rules/base.xml.in.h:304
+msgid "Northern Saami"
+msgstr "�еверно�аам�ки"
+
+#: ../rules/base.xml.in.h:305
+msgid "Northern Saami, eliminate dead keys"
+msgstr "�еверно�аам�ки, без акцената"
+
+#: ../rules/base.xml.in.h:306
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:307
+msgid "Norway"
+msgstr "�орвешка"
+
+#: ../rules/base.xml.in.h:308
+msgid "NumLock LED shows alternative group."
+msgstr "NumLock лампица приказује измене група."
+
+#: ../rules/base.xml.in.h:309
+msgid "Ogham"
+msgstr "огам"
+
+#: ../rules/base.xml.in.h:310
+msgid "Ogham IS434"
+msgstr "огам IS434"
+
+#: ../rules/base.xml.in.h:311
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 ММ/Интернет та�татура"
+
+#: ../rules/base.xml.in.h:312
+msgid "Oriya"
+msgstr "орија"
+
+#: ../rules/base.xml.in.h:313
+msgid "PC-98xx Series"
+msgstr "PC-98xx �ерија"
+
+#: ../rules/base.xml.in.h:314
+msgid "Pak"
+msgstr "пак"
+
+#: ../rules/base.xml.in.h:315
+msgid "Pakistan"
+msgstr "Паки�тан"
+
+#: ../rules/base.xml.in.h:316
+msgid "Pashto"
+msgstr "пашто"
+
+#: ../rules/base.xml.in.h:317
+msgid "Pattachote"
+msgstr "Паташоте"
+
+#: ../rules/base.xml.in.h:318
+msgid "Phonetic"
+msgstr "фонет�ки"
+
+#: ../rules/base.xml.in.h:319
+msgid "Pol"
+msgstr "пољ"
+
+#: ../rules/base.xml.in.h:320
+msgid "Poland"
+msgstr "Пољ�ка"
+
+# не ваља, можда вишезвучни?
+#: ../rules/base.xml.in.h:321
+msgid "Polytonic"
+msgstr "вишезвучни"
+
+#: ../rules/base.xml.in.h:322
+msgid "Portugal"
+msgstr "Португалија"
+
+#: ../rules/base.xml.in.h:323
+msgid "Power G5"
+msgstr "Power G5"
+
+#: ../rules/base.xml.in.h:324
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:325
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Прити�кање левог Alt та�тера за избор 3. нивоа."
+
+#: ../rules/base.xml.in.h:326
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Прити�кање левог Windows та�тера за избор 3. нивоа."
+
+#: ../rules/base.xml.in.h:327
+msgid "Press Menu key to choose 3rd level."
+msgstr "Прити�кање Menu та�тера за избор 3. нивоа."
+
+#: ../rules/base.xml.in.h:328
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Прити�кање де�ног Alt та�тера за избор 3. нивоа."
+
+#: ../rules/base.xml.in.h:329
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Прити�кање де�ног Ctrl та�тера за избор 3. нивоа."
+
+#: ../rules/base.xml.in.h:330
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Прити�кање де�ног Windows та�тера за избор 3. нивоа."
+
+#: ../rules/base.xml.in.h:331
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Прити�кање било ког Alt та�тера за избор 3. нивоа."
+
+#: ../rules/base.xml.in.h:332
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Прити�кање било ког Windows та�тера за избор 3. нивоа."
+
+#: ../rules/base.xml.in.h:333
+msgid "Pro"
+msgstr "про"
+
+#: ../rules/base.xml.in.h:334
+msgid "Pro Keypad"
+msgstr "Про та�татура"
+
+#: ../rules/base.xml.in.h:335
+msgid "Probhat"
+msgstr "пробат"
+
+#: ../rules/base.xml.in.h:336
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:337
+msgid "Prt"
+msgstr "прт"
+
+#: ../rules/base.xml.in.h:338
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:339
+msgid "R-Alt switches group while pressed."
+msgstr "Де�ни Alt мења групу док је прити�нут."
+
+#: ../rules/base.xml.in.h:340
+msgid "Right Alt is Compose."
+msgstr "Де�ни Alt је комбинујући."
+
+#: ../rules/base.xml.in.h:341
+msgid "Right Alt key changes group."
+msgstr "Де�ни Alt је мења групу."
+
+#: ../rules/base.xml.in.h:342
+msgid "Right Ctrl is Compose."
+msgstr "Де�ни Ctrl је комбинујући."
+
+#: ../rules/base.xml.in.h:343
+msgid "Right Ctrl key changes group."
+msgstr "Де�ни Ctrl мења групу."
+
+#: ../rules/base.xml.in.h:344
+msgid "Right Ctrl key switches group while pressed."
+msgstr "Де�ни Ctrl та�тер мења групу док је прити�нут."
+
+#: ../rules/base.xml.in.h:345
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Де�ни Ctrl та�тер �е понаша као де�ни Alt."
+
+#: ../rules/base.xml.in.h:346
+msgid "Right Shift key changes group."
+msgstr "Де�ни Shift мења групу."
+
+#: ../rules/base.xml.in.h:347
+msgid "Right Win-key changes group."
+msgstr "Де�ни Windows та�тер мења групу."
+
+#: ../rules/base.xml.in.h:348
+msgid "Right Win-key is Compose."
+msgstr "Де�ни Windows та�тер је комбинујући."
+
+#: ../rules/base.xml.in.h:349
+msgid "Right Win-key switches group while pressed."
+msgstr "Де�ни Windows та�тер мења групу док је прити�нут."
+
+#: ../rules/base.xml.in.h:350
+msgid "Right handed Dvorak"
+msgstr "Де�норучни Дворак"
+
+#: ../rules/base.xml.in.h:351
+msgid "Romania"
+msgstr "Румунија"
+
+#: ../rules/base.xml.in.h:352
+msgid "Romanian keyboard with German letters"
+msgstr "румун�ка та�татура �а немачким �ловима"
+
+#: ../rules/base.xml.in.h:353
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "румун�ка та�татура �а немачким �ловима, без акцената"
+
+#: ../rules/base.xml.in.h:354
+msgid "Rou"
+msgstr "рум"
+
+#: ../rules/base.xml.in.h:355
+msgid "Rus"
+msgstr "ру�"
+
+#: ../rules/base.xml.in.h:356
+msgid "Russia"
+msgstr "Ру�ија"
+
+#: ../rules/base.xml.in.h:357
+msgid "Russian"
+msgstr "ру�ки"
+
+#: ../rules/base.xml.in.h:358
+msgid "Russian phonetic"
+msgstr "ру�ки фонет�ки"
+
+#: ../rules/base.xml.in.h:359
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "ру�ки фонет�ки, без акцената"
+
+#: ../rules/base.xml.in.h:360
+msgid "Russian with Kazakh"
+msgstr "ру�ки �а казах�тан�ким"
+
+#: ../rules/base.xml.in.h:361
+msgid "SCG"
+msgstr "СЦГ"
+
+#: ../rules/base.xml.in.h:362
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST мултимедијална бежична та�татура"
+
+#: ../rules/base.xml.in.h:363
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:364
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:365
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:366
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:367
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN ергоном�ка 2500"
+
+#: ../rules/base.xml.in.h:368
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:369
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:370
+msgid "ScrollLock LED shows alternative group."
+msgstr "ScrollLock лампица приказује измене група."
+
+#: ../rules/base.xml.in.h:371
+msgid "Serbia and Montenegro"
+msgstr "Србија и Црна Гора"
+
+#: ../rules/base.xml.in.h:372
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Shift уз нумеричку та�атуру ради као у MS Windows-у."
+
+#: ../rules/base.xml.in.h:373
+msgid "Shift+CapsLock changes group."
+msgstr "Shift+CapsLock та�тер мења групу."
+
+#: ../rules/base.xml.in.h:374
+msgid "Slovakia"
+msgstr "Словачка"
+
+#: ../rules/base.xml.in.h:375
+msgid "Slovenia"
+msgstr "Словенија"
+
+#: ../rules/base.xml.in.h:376
+msgid "South Africa"
+msgstr "Јужна �фрика"
+
+#: ../rules/base.xml.in.h:377
+msgid "Southern Uzbek"
+msgstr "Јужни Узбеки�тан"
+
+#: ../rules/base.xml.in.h:378
+msgid "Spain"
+msgstr "Шпанија"
+
+#: ../rules/base.xml.in.h:379
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "�арочити та�тери (Ctrl+Alt+&lt;та�тер&gt;) које обрађује �ервер."
+
+#: ../rules/base.xml.in.h:380
+msgid "SrL"
+msgstr "шрл"
+
+#: ../rules/base.xml.in.h:381
+msgid "Sri Lanka"
+msgstr "Шри Ланка"
+
+#: ../rules/base.xml.in.h:382
+msgid "Standard"
+msgstr "�тандардна"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:384
+msgid "Standard RSTU"
+msgstr "�тандардна RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:386
+msgid "Standard RSTU on Russian layout"
+msgstr "�тандардна RSTU на ру�ком ра�пореду"
+
+#: ../rules/base.xml.in.h:387
+msgid "Sun dead keys"
+msgstr "Sun-ови акценти"
+
+#: ../rules/base.xml.in.h:388
+msgid "Super Power Multimedia Keyboard"
+msgstr "Супер моћна мултимедијална та�татура"
+
+#: ../rules/base.xml.in.h:389
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "Super је мапиран на Windows та�тере (подразумевано)."
+
+#: ../rules/base.xml.in.h:390
+msgid "Svk"
+msgstr "�лк"
+
+#: ../rules/base.xml.in.h:391
+msgid "Svn"
+msgstr "�ло"
+
+#: ../rules/base.xml.in.h:392
+msgid "Swap Ctrl and CapsLock."
+msgstr "Размени Ctrl и Caps Lock."
+
+#: ../rules/base.xml.in.h:393
+msgid "Swe"
+msgstr "шве"
+
+#: ../rules/base.xml.in.h:394
+msgid "Sweden"
+msgstr "Швед�ка"
+
+#: ../rules/base.xml.in.h:395
+msgid "Switzerland"
+msgstr "Швајцар�ка"
+
+#: ../rules/base.xml.in.h:396
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:397
+msgid "Syr"
+msgstr "�ир"
+
+#: ../rules/base.xml.in.h:398
+msgid "Syria"
+msgstr "Сирија"
+
+#: ../rules/base.xml.in.h:399
+msgid "Syriac"
+msgstr "�ириј�ки"
+
+#: ../rules/base.xml.in.h:400
+msgid "Syriac phonetic"
+msgstr "�ириј�ки фонет�ки"
+
+#: ../rules/base.xml.in.h:401
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:402
+msgid "Tajikistan"
+msgstr "Таџики�тан"
+
+#: ../rules/base.xml.in.h:403
+msgid "Tamil"
+msgstr "тамил"
+
+#: ../rules/base.xml.in.h:404
+msgid "Tamil TAB Typewriter"
+msgstr "тамил TAB куцаћа машина"
+
+#: ../rules/base.xml.in.h:405
+msgid "Tamil TSCII Typewriter"
+msgstr "тамил TSCII куцаћа машина"
+
+#: ../rules/base.xml.in.h:406
+msgid "Tamil Unicode"
+msgstr "тамил Уникод"
+
+#: ../rules/base.xml.in.h:407
+msgid "Tatar"
+msgstr "татар�ки"
+
+#: ../rules/base.xml.in.h:408
+msgid "Telugu"
+msgstr "телугу"
+
+#: ../rules/base.xml.in.h:409
+msgid "Tha"
+msgstr "тај"
+
+#: ../rules/base.xml.in.h:410
+msgid "Thailand"
+msgstr "Тајланд"
+
+#: ../rules/base.xml.in.h:411
+msgid "Third level choosers"
+msgstr "Избор трећег нивоа"
+
+#: ../rules/base.xml.in.h:412
+msgid "Tilde (~) variant"
+msgstr "Варијанта �а тилдом (~)"
+
+#: ../rules/base.xml.in.h:413
+msgid "Tjk"
+msgstr "тџк"
+
+#: ../rules/base.xml.in.h:414
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:415
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access та�татура"
+
+#: ../rules/base.xml.in.h:416
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust кла�ична бежична та�татура"
+
+#: ../rules/base.xml.in.h:417
+msgid "Tur"
+msgstr "тур"
+
+#: ../rules/base.xml.in.h:418
+msgid "Turkey"
+msgstr "Тур�ка"
+
+#: ../rules/base.xml.in.h:419
+msgid "Typewriter"
+msgstr "„Куцаћа машина“"
+
+#: ../rules/base.xml.in.h:420
+msgid "U.S. English"
+msgstr "амерички енгле�ки"
+
+#: ../rules/base.xml.in.h:421
+msgid "US keyboard with Bosnian digraphs"
+msgstr "�меричка та�татура �а бо�ан�ким диграфима"
+
+#: ../rules/base.xml.in.h:422
+msgid "US keyboard with Bosnian letters"
+msgstr "�меричка та�татура �а бо�ан�ким �ловима"
+
+#: ../rules/base.xml.in.h:423
+msgid "US keyboard with Croatian digraphs"
+msgstr "�меричка та�татура �а хрват�ким диграфима"
+
+#: ../rules/base.xml.in.h:424
+msgid "US keyboard with Croatian letters"
+msgstr "�меричка та�татура �а хрват�ким �ловима"
+
+#: ../rules/base.xml.in.h:425
+msgid "US keyboard with Lithuanian letters"
+msgstr "�меричка та�татура �а литван�ким �ловима"
+
+#: ../rules/base.xml.in.h:426
+msgid "US keyboard with Maltian letters"
+msgstr "�меричка та�татура �а малтешким �ловима"
+
+#: ../rules/base.xml.in.h:427
+msgid "US keyboard with Slovenian digraphs"
+msgstr "�меричка та�татура �а �ловеначким диграфима"
+
+#: ../rules/base.xml.in.h:428
+msgid "US keyboard with Slovenian letters"
+msgstr "�меричка та�татура �а �ловеначким �ловима"
+
+#: ../rules/base.xml.in.h:429
+msgid "USA"
+msgstr "С�Д"
+
+#: ../rules/base.xml.in.h:430
+msgid "Ukr"
+msgstr "укр"
+
+#: ../rules/base.xml.in.h:431
+msgid "Ukraine"
+msgstr "Украјина"
+
+#: ../rules/base.xml.in.h:432
+msgid "UnicodeExpert"
+msgstr "Стручна за Уникод"
+
+#: ../rules/base.xml.in.h:433
+msgid "United Kingdom"
+msgstr "Велика Британија"
+
+#: ../rules/base.xml.in.h:434
+msgid "Urdu"
+msgstr "Урду"
+
+#: ../rules/base.xml.in.h:435
+msgid "Use Bosnian digraphs"
+msgstr "Кори�ти бо�ан�ке диграфе"
+
+#: ../rules/base.xml.in.h:436
+msgid "Use Croatian digraphs"
+msgstr "Кори�ти хрват�ке диграфе"
+
+#: ../rules/base.xml.in.h:437
+msgid "Use Slovenian digraphs"
+msgstr "Кори�ти �ловеначке диграфе"
+
+#: ../rules/base.xml.in.h:438
+msgid "Use guillemots for quotes"
+msgstr "Кори�ти гиљемоте за наводнике"
+
+#: ../rules/base.xml.in.h:439
+msgid "Use keyboard LED to show alternative group."
+msgstr "Кори�ти лампицу та�татуре за приказ измене група."
+
+#: ../rules/base.xml.in.h:440
+msgid "Uzb"
+msgstr "узб"
+
+#: ../rules/base.xml.in.h:441
+msgid "Uzbekistan"
+msgstr "Узбеки�тан"
+
+#: ../rules/base.xml.in.h:442
+msgid "Vietnam"
+msgstr "Вијетнам"
+
+#: ../rules/base.xml.in.h:443
+msgid "Vnm"
+msgstr "вјт"
+
+#: ../rules/base.xml.in.h:444
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:445
+msgid "Winkeys"
+msgstr "Windows та�тери"
+
+#: ../rules/base.xml.in.h:446
+msgid "With &lt;\\|&gt; key"
+msgstr "Уз та�тер &lt;\\|&gt;"
+
+#: ../rules/base.xml.in.h:447
+msgid "With guillemots"
+msgstr "Са гиљемотима"
+
+#: ../rules/base.xml.in.h:448
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Интернет та�татура"
+
+#: ../rules/base.xml.in.h:449
+msgid "Z and ZHE swapped"
+msgstr "Размењено З и Ж"
+
+#: ../rules/base.xml.in.h:450
+msgid "Zar"
+msgstr "Зар"
+
+#: ../rules/base.xml.in.h:451
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:452
+msgid "azerty/digits"
+msgstr "azerty/цифре"
+
+#: ../rules/base.xml.in.h:453
+msgid "digits"
+msgstr "цифре"
+
+#: ../rules/base.xml.in.h:454
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:455
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:456
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, проширено �а обрнутом ко�ом цртом"
+
+#: ../rules/base.xml.in.h:457
+msgid "qwerty/digits"
+msgstr "qwerty/цифре"
+
+#: ../rules/base.xml.in.h:458
+msgid "qwertz"
+msgstr "qwertz"
+
+#: ../rules/base.xml.in.h:459
+msgid "si1452"
+msgstr "si1452"
+
+#~ msgid "Turkish"
+#~ msgstr "тур�ки"
+
+#~ msgid "\"Standard\""
+#~ msgstr "„Стандардна“"
+
+# bug: Serbia and Montenegro
+#~ msgid "Serbia"
+#~ msgstr "Србија"
+
+#~ msgid "Srp"
+#~ msgstr "�рп"
+
+#~ msgid "Tamil INSCRIPT"
+#~ msgstr "тамил ин�крипт"
+
+#~ msgid "US keyboard with Romanian letters"
+#~ msgstr "�меричка та�татура �а румун�ким �ловима"
+
+#~ msgid "A Tamil typewrite-style keymap; TAB encoding"
+#~ msgstr "Тамил ра�поред налик куцаћој машини; TAB кодирање"
+
+#~ msgid "A Tamil typewrite-style keymap; TSCII encoding"
+#~ msgstr "Тамил ра�поред налик куцаћој машини; TSCII кодирање"
+
+#~ msgid "A Tamil typewrite-style keymap; Unicode encoding"
+#~ msgstr "Тамил ра�поред налик куцаћој машини; Уникод кодирање"
+
+#~ msgid "Arb"
+#~ msgstr "арп"
+
+#~ msgid "Basic"
+#~ msgstr "О�новно"
+
+#~ msgid "Ben"
+#~ msgstr "бнг"
+
+#~ msgid "Bosnian"
+#~ msgstr "бошњачки"
+
+#~ msgid "Burmese"
+#~ msgstr "бурми�ки"
+
+#~ msgid "CloGaelach Laptop"
+#~ msgstr "CloGaelach за прено�не рачунаре"
+
+#~ msgid "Czech (qwerty)"
+#~ msgstr "Чешки (qwerty)"
+
+#~ msgid "Danish"
+#~ msgstr "дан�ки"
+
+#~ msgid "Dutch"
+#~ msgstr "холанд�ки"
+
+#~ msgid "Dvo"
+#~ msgstr "дво"
+
+#~ msgid "Finnish"
+#~ msgstr "фин�ки"
+
+#~ msgid "French Canadian"
+#~ msgstr "францу�ки канад�ки"
+
+#~ msgid "Georgian (latin)"
+#~ msgstr "грузиј�ки (латиница)"
+
+#~ msgid "Georgian (russian)"
+#~ msgstr "грузиј�ки (ру�ки)"
+
+#~ msgid "Grc"
+#~ msgstr "грк"
+
+#~ msgid "Guj"
+#~ msgstr "гуј"
+
+#~ msgid "Hin"
+#~ msgstr "инд"
+
+#~ msgid "Hindi"
+#~ msgstr "индиј�ки"
+
+#~ msgid "Hungarian (qwerty)"
+#~ msgstr "Мађар�ки (qwerty)"
+
+#~ msgid "INSCRIPT layout"
+#~ msgstr "INSCRIPT ра�поред"
+
+#~ msgid "IS434 laptop"
+#~ msgstr "IS434 прено�ни"
+
+#~ msgid "Iku"
+#~ msgstr "ику"
+
+#~ msgid "Irish"
+#~ msgstr "ир�ки"
+
+#~ msgid "Italian"
+#~ msgstr "италијан�ки"
+
+#~ msgid "Lithuanian azerty standard"
+#~ msgstr "литван�ки azerty ра�поред"
+
+#~ msgid "Lithuanian qwerty \"numeric\""
+#~ msgstr "литван�ки qwerty „бројевни“"
+
+#~ msgid "Maltese (US layout)"
+#~ msgstr "малт�ки (амерички ра�поред)"
+
+#~ msgid "Northern Saami (Finland)"
+#~ msgstr "�еверно�аам�ки (Фин�ка)"
+
+#~ msgid "Northern Saami (Sweden)"
+#~ msgstr "�еверно�аам�ки (Швед�ка)"
+
+#~ msgid "Ogh"
+#~ msgstr "огм"
+
+#~ msgid "Ori"
+#~ msgstr "ори"
+
+#~ msgid "PC104"
+#~ msgstr "PC104"
+
+#~ msgid "Polish"
+#~ msgstr "пољ�ки"
+
+#~ msgid "Polish (qwertz)"
+#~ msgstr "пољ�ки (qwertz)"
+
+#~ msgid "Sapmi"
+#~ msgstr "Sapmi"
+
+#~ msgid "Scg"
+#~ msgstr "�рп"
+
+#~ msgid "Slovak (qwerty)"
+#~ msgstr "�ловачки (qwerty)"
+
+#~ msgid "Sme"
+#~ msgstr "�ме"
+
+#~ msgid "Sv"
+#~ msgstr "�в"
+
+#~ msgid "Swedish"
+#~ msgstr "швед�ки"
+
+#~ msgid "Swiss French"
+#~ msgstr "швајцар�ки францу�ки"
+
+#~ msgid "Tel"
+#~ msgstr "тел"
+
+#~ msgid "Thai (Kedmanee)"
+#~ msgstr "тајланд�ки (Кедмани)"
+
+#~ msgid "Tml"
+#~ msgstr "тмл"
+
+#~ msgid "Turkish (F)"
+#~ msgstr "тур�ки (F)"
+
+#~ msgid "Turkish Alt-Q Layout"
+#~ msgstr "тур�ки Alt-Q ра�поред"
+
+#~ msgid "U.S. English w/ ISO9995-3"
+#~ msgstr "амерички енгле�ки �а ИСО9995-3"
+
+#~ msgid "U.S. English w/ dead keys"
+#~ msgstr "амерички енгле�ки �а акцентима"
+
+#~ msgid "US"
+#~ msgstr "С�Д"
+
+#~ msgid "Yug"
+#~ msgstr "�цг"
+
+#~ msgid "Yugoslavian"
+#~ msgstr "латинични �рп�ки"
+
+#~ msgid "abnt2"
+#~ msgstr "абнт2"
+
+#~ msgid "bksl"
+#~ msgstr "бк�л"
+
+#~ msgid "laptop"
+#~ msgstr "прено�ни"
+
+#~ msgid "sefi"
+#~ msgstr "sefi"
+
+#~ msgid "uni/101/qwerty/comma"
+#~ msgstr "уни/101/qwerty/запета"
+
+#~ msgid "uni/101/qwerty/dot"
+#~ msgstr "уни/101/qwerty/тачка"
+
+#~ msgid "uni/101/qwertz/comma"
+#~ msgstr "уни/101/qwertz/запета"
+
+#~ msgid "uni/101/qwertz/dot"
+#~ msgstr "уни/101/qwertz/тачка"
+
+#~ msgid "uni/102/qwerty/comma"
+#~ msgstr "уни/102/qwerty/запета"
+
+#~ msgid "uni/102/qwerty/dot"
+#~ msgstr "уни/102/qwerty/тачка"
+
+#~ msgid "uni/102/qwertz/comma"
+#~ msgstr "уни/102/qwertz/запета"
+
+#~ msgid "uni/102/qwertz/dot"
+#~ msgstr "уни/102/qwertz/тачка"
diff --git a/xorg-server/xkbdata.src/po/sr@Latn.po b/xorg-server/xkbdata.src/po/sr@Latn.po
new file mode 100644
index 000000000..b99ad2a91
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/sr@Latn.po
@@ -0,0 +1,2996 @@
+# Serbian translation of xfree_xkb_xml-4.4pre1
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-05-01 23:23+0100\n"
+"PO-Revision-Date: 2005-08-25 11:03+0200\n"
+"Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+# Naizmeni�no?
+#: ../rules/base.xml.in.h:2
+#, fuzzy
+msgid "(Legacy) Alternative"
+msgstr "Dopunska"
+
+#: ../rules/base.xml.in.h:3
+#, fuzzy
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "Dopunska, Sun-ovi akcenti"
+
+#: ../rules/base.xml.in.h:4
+#, fuzzy
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "Dopunska, bez akcenata"
+
+#: ../rules/base.xml.in.h:5
+#, fuzzy
+msgid "(Legacy) Dvorak"
+msgstr "francuski dvorak"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/104 key Compatible"
+msgstr ""
+
+#: ../rules/base.xml.in.h:7
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/zapeta/akcenti"
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/zapeta/bez akcenata"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/ta�ka/akcenti"
+
+#: ../rules/base.xml.in.h:10
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/ta�ka/bez akcenata"
+
+#: ../rules/base.xml.in.h:11
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/zapeta/akcenti"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/zapeta/bez akcenata"
+
+#: ../rules/base.xml.in.h:13
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/ta�ka/akcenti"
+
+#: ../rules/base.xml.in.h:14
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/ta�ka/bez akcenata"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/zapeta/akcenti"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/zapeta/bez akcenata"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/ta�ka/akcenti"
+
+#: ../rules/base.xml.in.h:18
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/ta�ka/bez akcenata"
+
+#: ../rules/base.xml.in.h:19
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/zapeta/akcenti"
+
+#: ../rules/base.xml.in.h:20
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/zapeta/bez akcenata"
+
+#: ../rules/base.xml.in.h:21
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/ta�ka/akcenti"
+
+#: ../rules/base.xml.in.h:22
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/ta�ka/bez akcenata"
+
+#: ../rules/base.xml.in.h:23
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:24
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:25
+#, fuzzy
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "Dexxa beži�na tastatura"
+
+#: ../rules/base.xml.in.h:26
+msgid "ACPI Standard"
+msgstr "ACPI standard"
+
+#: ../rules/base.xml.in.h:27
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:28
+msgid "Acer C300"
+msgstr ""
+
+#: ../rules/base.xml.in.h:29
+msgid "Acer Ferrari 4000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:30
+msgid "Acer Laptop"
+msgstr ""
+
+#: ../rules/base.xml.in.h:31
+msgid "Add the EuroSign to the 2 key."
+msgstr "Dodaj znak za evro na taster 2."
+
+#: ../rules/base.xml.in.h:32
+#, fuzzy
+msgid "Add the EuroSign to the 4 key."
+msgstr "Dodaj znak za evro na taster 2."
+
+#: ../rules/base.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "Dodaj znak za evro na taster 5."
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "Dodaj znak za evro na taster E."
+
+#: ../rules/base.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "Dodaj obi�no ponašanje Menu tasteru."
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Dodavanje znaka za evro određenim tasterima"
+
+#
+#: ../rules/base.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Napredni Å korpion KI"
+
+#: ../rules/base.xml.in.h:38
+msgid "Afg"
+msgstr ""
+
+#: ../rules/base.xml.in.h:39
+#, fuzzy
+msgid "Afghanistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:40
+msgid "Akan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:41
+msgid "Alb"
+msgstr "alb"
+
+#: ../rules/base.xml.in.h:42
+msgid "Albania"
+msgstr "Albanija"
+
+#: ../rules/base.xml.in.h:43
+#, fuzzy
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt i Meta su na Alt tasterima (podrazumevano)."
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt je mapiran na desni Windows taster, a Super na Menu."
+
+#: ../rules/base.xml.in.h:45
+#, fuzzy
+msgid "Alt+CapsLock changes layout."
+msgstr "Shift+CapsLock taster menja grupu."
+
+#: ../rules/base.xml.in.h:46
+#, fuzzy
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+Control menja grupu."
+
+#: ../rules/base.xml.in.h:47
+#, fuzzy
+msgid "Alt+Shift change layout."
+msgstr "Alt+Shift menja grupu."
+
+#: ../rules/base.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Ponašanje Alt/Win tastera"
+
+# Naizmeni�no?
+#: ../rules/base.xml.in.h:50
+msgid "Alternative"
+msgstr "Dopunska"
+
+# Naizmeni�no?
+#: ../rules/base.xml.in.h:51
+#, fuzzy
+msgid "Alternative Eastern"
+msgstr "Dopunska"
+
+# Naizmeni�no?
+#: ../rules/base.xml.in.h:52
+#, fuzzy
+msgid "Alternative Phonetic"
+msgstr "Dopunska"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "Dopunska međunarodna (bivša us_intl)"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "Dopunska, Sun-ovi akcenti"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "Dopunska, bez akcenata"
+
+#: ../rules/base.xml.in.h:56
+#, fuzzy
+msgid "Alternative, latin-9 only"
+msgstr "Dopunska, bez akcenata"
+
+#: ../rules/base.xml.in.h:57
+#, fuzzy
+msgid "And"
+msgstr "ind"
+
+#: ../rules/base.xml.in.h:58
+#, fuzzy
+msgid "Andorra"
+msgstr "ara"
+
+#: ../rules/base.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "Varijanta sa apostrofom (')"
+
+#: ../rules/base.xml.in.h:60
+msgid "Apple"
+msgstr ""
+
+#: ../rules/base.xml.in.h:61
+#, fuzzy
+msgid "Apple Laptop"
+msgstr "prenosni"
+
+#: ../rules/base.xml.in.h:62
+msgid "Ara"
+msgstr "ara"
+
+#: ../rules/base.xml.in.h:63
+msgid "Arabic"
+msgstr "arapski"
+
+#: ../rules/base.xml.in.h:64
+msgid "Arm"
+msgstr "jrm"
+
+#: ../rules/base.xml.in.h:65
+msgid "Armenia"
+msgstr "Jermenija"
+
+#: ../rules/base.xml.in.h:66
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr ""
+
+#: ../rules/base.xml.in.h:67
+msgid "Asus Laptop"
+msgstr ""
+
+#: ../rules/base.xml.in.h:68
+msgid "Aze"
+msgstr "azb"
+
+#: ../rules/base.xml.in.h:69
+msgid "Azerbaijan"
+msgstr "Azerbejdžan"
+
+#: ../rules/base.xml.in.h:70
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 beži�na Internet tastatura"
+
+#: ../rules/base.xml.in.h:71
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:72
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF multimedijalna"
+
+#: ../rules/base.xml.in.h:73
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:74
+msgid "BTC 6301URF"
+msgstr ""
+
+#: ../rules/base.xml.in.h:75
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:76
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:77
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:78
+#, fuzzy
+msgid "BTC 9019U"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:79
+#, fuzzy
+msgid "Baltic+"
+msgstr "Osnovno"
+
+#: ../rules/base.xml.in.h:80
+msgid "Ban"
+msgstr "ban"
+
+#: ../rules/base.xml.in.h:81
+msgid "Bangladesh"
+msgstr "Bangladeš"
+
+#: ../rules/base.xml.in.h:82
+msgid "Bel"
+msgstr "blg"
+
+#: ../rules/base.xml.in.h:83
+msgid "Belarus"
+msgstr "Belorusija"
+
+#: ../rules/base.xml.in.h:84
+msgid "Belgium"
+msgstr "Belgija"
+
+#: ../rules/base.xml.in.h:85
+msgid "BenQ X-Touch"
+msgstr ""
+
+#: ../rules/base.xml.in.h:86
+msgid "BenQ X-Touch 730"
+msgstr ""
+
+#: ../rules/base.xml.in.h:87
+msgid "BenQ X-Touch 800"
+msgstr ""
+
+#: ../rules/base.xml.in.h:88
+msgid "Bengali"
+msgstr "bengalski"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bengali Probhat"
+msgstr "bengalski probat"
+
+#: ../rules/base.xml.in.h:90
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr ""
+
+#: ../rules/base.xml.in.h:91
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr ""
+
+#: ../rules/base.xml.in.h:92
+msgid "Bgr"
+msgstr "bug"
+
+#: ../rules/base.xml.in.h:93
+msgid "Bhu"
+msgstr "but"
+
+#: ../rules/base.xml.in.h:94
+msgid "Bhutan"
+msgstr "Butan"
+
+#: ../rules/base.xml.in.h:95
+msgid "Biblical Hebrew (Tiro)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:96
+msgid "Bih"
+msgstr "bih"
+
+#: ../rules/base.xml.in.h:97
+msgid "Blr"
+msgstr "blr"
+
+#: ../rules/base.xml.in.h:98
+msgid "Bosnia and Herzegovina"
+msgstr "Bosna i Hercegovina"
+
+#: ../rules/base.xml.in.h:99
+#, fuzzy
+msgid "Both Alt keys together change layout."
+msgstr "Oba Alt tastera menjaju grupu."
+
+#: ../rules/base.xml.in.h:100
+#, fuzzy
+msgid "Both Ctrl keys together change layout."
+msgstr "Oba Control tastera menjaju grupu."
+
+#: ../rules/base.xml.in.h:101
+#, fuzzy
+msgid "Both Shift keys together change layout."
+msgstr "Oba Shift tastera menjaju grupu."
+
+#: ../rules/base.xml.in.h:102
+#, fuzzy
+msgid "Both Win-keys switch layout while pressed."
+msgstr "Oba Win-tastera menjaju grupu kada su pritisnuti."
+
+#: ../rules/base.xml.in.h:103
+msgid "Bra"
+msgstr "bra"
+
+#: ../rules/base.xml.in.h:104
+#, fuzzy
+msgid "Braille"
+msgstr "Brazil"
+
+#: ../rules/base.xml.in.h:105
+msgid "Brazil"
+msgstr "Brazil"
+
+#: ../rules/base.xml.in.h:106
+msgid "Brazilian ABNT2"
+msgstr "brazilska ABNT2"
+
+#: ../rules/base.xml.in.h:107
+#, fuzzy
+msgid "Brl"
+msgstr "blg"
+
+#: ../rules/base.xml.in.h:108
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet tastatura"
+
+#: ../rules/base.xml.in.h:109
+msgid "Buckwalter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:110
+msgid "Bulgaria"
+msgstr "Bugarska"
+
+#: ../rules/base.xml.in.h:111
+msgid "Cambodia"
+msgstr ""
+
+#: ../rules/base.xml.in.h:112
+msgid "Can"
+msgstr "kan"
+
+#: ../rules/base.xml.in.h:113
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rules/base.xml.in.h:114
+#, fuzzy
+msgid "Caps Lock is Compose."
+msgstr "Menu je kombinujući taster."
+
+#: ../rules/base.xml.in.h:115
+#, fuzzy
+msgid "CapsLock LED shows alternative layout."
+msgstr "Lampica za Caps Lock pokazuje izmenjivanje grupe."
+
+#: ../rules/base.xml.in.h:116
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "CapsLock se ponaša kao trajni Shift. Shift ukida Caps."
+
+#: ../rules/base.xml.in.h:117
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "CapsLock se ponaša kao trajni Shift. Shift ne ukida Caps."
+
+#: ../rules/base.xml.in.h:118
+msgid "CapsLock just locks the Shift modifier."
+msgstr "CapsLock prosto trajno uklju�uje Shift."
+
+#: ../rules/base.xml.in.h:119
+msgid "CapsLock key behavior"
+msgstr "Ponašanje Caps Lock tastera"
+
+#: ../rules/base.xml.in.h:120
+#, fuzzy
+msgid "CapsLock key changes layout."
+msgstr "Caps Lock taster menja grupu."
+
+#: ../rules/base.xml.in.h:121
+msgid "CapsLock switch to first layout, Shift+CapsLock switch to last layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:122
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "CapsLock menja Shift stanje pa deluje na sve tastere."
+
+#: ../rules/base.xml.in.h:123
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "CapsLock menja obi�nu veli�inu slova."
+
+#: ../rules/base.xml.in.h:124
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "CapsLock koristi unutrašnju veli�inu slova. Shift ukida Caps Lock."
+
+#: ../rules/base.xml.in.h:125
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "CapsLock koristi unutrašnju veli�inu slova. Shift ne ukida Caps Lock."
+
+#: ../rules/base.xml.in.h:126
+msgid "Catalan variant with middle-dot L"
+msgstr ""
+
+#: ../rules/base.xml.in.h:127
+msgid "Che"
+msgstr "Å¡vc"
+
+#: ../rules/base.xml.in.h:128
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:129
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (druga mogućnost)"
+
+#: ../rules/base.xml.in.h:130
+#, fuzzy
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:131
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:132
+#, fuzzy
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:133
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet tastatura"
+
+#: ../rules/base.xml.in.h:134
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:135
+#, fuzzy
+msgid "Chicony KU-0108"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:136
+#, fuzzy
+msgid "China"
+msgstr "Češka"
+
+#: ../rules/base.xml.in.h:137
+msgid "Chuvash"
+msgstr ""
+
+#: ../rules/base.xml.in.h:138
+msgid "Chuvash Latin"
+msgstr ""
+
+#: ../rules/base.xml.in.h:139
+#, fuzzy
+msgid "Classic"
+msgstr "Osnovno"
+
+#: ../rules/base.xml.in.h:140
+#, fuzzy
+msgid "Classic Dvorak"
+msgstr "dvorak"
+
+#: ../rules/base.xml.in.h:141
+msgid "Classmate PC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:142
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:143
+msgid "Colemak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:144
+msgid "Commabelow"
+msgstr ""
+
+#: ../rules/base.xml.in.h:145
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq tastatura za lak pristup"
+
+#: ../rules/base.xml.in.h:146
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet tastatura (13 tastera)"
+
+#: ../rules/base.xml.in.h:147
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet tastatura (18 tastera)"
+
+#: ../rules/base.xml.in.h:148
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet tastatura (7 tastera)"
+
+#: ../rules/base.xml.in.h:149
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq tastatura"
+
+#: ../rules/base.xml.in.h:150
+msgid "Compose key position"
+msgstr "Položaj tastera Compose"
+
+#: ../rules/base.xml.in.h:151
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+
+#: ../rules/base.xml.in.h:152
+#, fuzzy
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "Super je mapiran na Windows tastere (podrazumevano)."
+
+#: ../rules/base.xml.in.h:153
+msgid "Croatia"
+msgstr "Hrvatska"
+
+#: ../rules/base.xml.in.h:154
+#, fuzzy
+msgid "Ctrl key at bottom left"
+msgstr "Taster Control je u dnu levo"
+
+#: ../rules/base.xml.in.h:155
+#, fuzzy
+msgid "Ctrl key at left of 'A'"
+msgstr "Taster Control je u levo od „A“"
+
+#: ../rules/base.xml.in.h:156
+#, fuzzy
+msgid "Ctrl key position"
+msgstr "Položaj tastera Control"
+
+#: ../rules/base.xml.in.h:157
+#, fuzzy
+msgid "Ctrl+Shift change layout."
+msgstr "Control+Shift menja grupu."
+
+#: ../rules/base.xml.in.h:158
+msgid "Cyrillic"
+msgstr "ćirili�ni"
+
+#: ../rules/base.xml.in.h:159
+#, fuzzy
+msgid "Cyrillic with guillemets"
+msgstr "latini�ni sa giljemotima"
+
+#: ../rules/base.xml.in.h:160
+#, fuzzy
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Razmenjeno Z i Ž"
+
+#: ../rules/base.xml.in.h:161
+msgid "Cze"
+msgstr "�eš"
+
+#: ../rules/base.xml.in.h:162
+msgid "Czechia"
+msgstr "Češka"
+
+#: ../rules/base.xml.in.h:163
+msgid "DRC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:164
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:165
+#, fuzzy
+msgid "Dan"
+msgstr "ban"
+
+#: ../rules/base.xml.in.h:166
+msgid "Dead acute"
+msgstr "Akutski akcenat"
+
+#: ../rules/base.xml.in.h:167
+msgid "Dead grave acute"
+msgstr "Gravis akutski akcenat"
+
+#: ../rules/base.xml.in.h:168
+msgid "Default numeric keypad keys."
+msgstr ""
+
+#: ../rules/base.xml.in.h:169
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:170
+msgid "Dell 101-key PC"
+msgstr "Dell 101-taster PC"
+
+#: ../rules/base.xml.in.h:171
+#, fuzzy
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Tastature prenosnih ra�unara Dell Inspiron 8xxx"
+
+#: ../rules/base.xml.in.h:172
+#, fuzzy
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Tastature prenosnih ra�unara Dell Inspiron 8xxx"
+
+#: ../rules/base.xml.in.h:173
+msgid "Dell Latitude series laptop"
+msgstr ""
+
+#: ../rules/base.xml.in.h:174
+msgid "Dell Precision M65"
+msgstr ""
+
+#: ../rules/base.xml.in.h:175
+msgid "Dell SK-8125"
+msgstr ""
+
+#: ../rules/base.xml.in.h:176
+msgid "Dell SK-8135"
+msgstr ""
+
+#: ../rules/base.xml.in.h:177
+#, fuzzy
+msgid "Dell USB Multimedia Keybard"
+msgstr "Super moćna multimedijalna tastatura"
+
+#: ../rules/base.xml.in.h:178
+msgid "Denmark"
+msgstr "Danska"
+
+#: ../rules/base.xml.in.h:179
+msgid "Deu"
+msgstr "nem"
+
+#: ../rules/base.xml.in.h:180
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa beži�na tastatura"
+
+#: ../rules/base.xml.in.h:181
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 serija"
+
+#: ../rules/base.xml.in.h:182
+msgid "Dvorak"
+msgstr "dvorak"
+
+#: ../rules/base.xml.in.h:183
+msgid "Dvorak international"
+msgstr ""
+
+#: ../rules/base.xml.in.h:184
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "dvorak, poljski navodnici na tasteru „1/!“"
+
+#: ../rules/base.xml.in.h:185
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "dvorak, poljski navodnici na tasteru navodnika"
+
+#: ../rules/base.xml.in.h:186
+#, fuzzy
+msgid "Eastern"
+msgstr "est"
+
+#: ../rules/base.xml.in.h:187
+msgid "Eliminate dead keys"
+msgstr "Ukloni akcente"
+
+#: ../rules/base.xml.in.h:188
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:189
+#, fuzzy
+msgid "Epo"
+msgstr "Å¡pa"
+
+#: ../rules/base.xml.in.h:190
+#, fuzzy
+msgid "Ergonomic"
+msgstr "SVEN ergonomska 2500"
+
+#: ../rules/base.xml.in.h:191
+msgid "Esp"
+msgstr "Å¡pa"
+
+#: ../rules/base.xml.in.h:192
+msgid "Esperanto"
+msgstr ""
+
+#: ../rules/base.xml.in.h:193
+msgid "Est"
+msgstr "est"
+
+#: ../rules/base.xml.in.h:194
+msgid "Estonia"
+msgstr "Estonija"
+
+#: ../rules/base.xml.in.h:195
+#, fuzzy
+msgid "Eth"
+msgstr "est"
+
+#: ../rules/base.xml.in.h:196
+#, fuzzy
+msgid "Ethiopia"
+msgstr "Estonija"
+
+#: ../rules/base.xml.in.h:197
+msgid "Evdev-managed keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:198
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:199
+#, fuzzy
+msgid "Ewe"
+msgstr "Å¡ve"
+
+#: ../rules/base.xml.in.h:200
+msgid "Extended"
+msgstr "Prošireno"
+
+#: ../rules/base.xml.in.h:201
+msgid "Extended Backslash"
+msgstr "Prošireno uz obrnutu kosu crtu"
+
+#: ../rules/base.xml.in.h:202
+msgid "F-letter (F) variant"
+msgstr "Varijanta sa F-slovom (F)"
+
+#: ../rules/base.xml.in.h:203
+msgid "Fao"
+msgstr "far"
+
+#: ../rules/base.xml.in.h:204
+msgid "Faroe Islands"
+msgstr "Farska ostrva"
+
+#: ../rules/base.xml.in.h:205
+msgid "Fin"
+msgstr "fin"
+
+#: ../rules/base.xml.in.h:206
+msgid "Finland"
+msgstr "Finska"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:209
+msgid "Four-level key with abstract separators"
+msgstr ""
+
+#: ../rules/base.xml.in.h:210
+msgid "Four-level key with comma"
+msgstr ""
+
+#: ../rules/base.xml.in.h:211
+msgid "Four-level key with dot"
+msgstr ""
+
+#: ../rules/base.xml.in.h:212
+msgid "Four-level key with momayyez"
+msgstr ""
+
+#: ../rules/base.xml.in.h:213
+msgid "Fra"
+msgstr "fra"
+
+#: ../rules/base.xml.in.h:214
+msgid "France"
+msgstr "Francuska"
+
+#: ../rules/base.xml.in.h:215
+msgid "French"
+msgstr "francuski"
+
+#: ../rules/base.xml.in.h:216
+#, fuzzy
+msgid "French (Macintosh)"
+msgstr "francuski (klasi�ni)"
+
+#: ../rules/base.xml.in.h:217
+msgid "French (legacy)"
+msgstr "francuski (klasi�ni)"
+
+#: ../rules/base.xml.in.h:218
+msgid "French Dvorak"
+msgstr "francuski dvorak"
+
+#: ../rules/base.xml.in.h:219
+msgid "French, Sun dead keys"
+msgstr "francuski, Sun-ovi akcenti"
+
+#: ../rules/base.xml.in.h:220
+msgid "French, eliminate dead keys"
+msgstr "Francuski, bez akcenata"
+
+#: ../rules/base.xml.in.h:221
+msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
+msgstr ""
+
+#: ../rules/base.xml.in.h:222
+msgid "Fula"
+msgstr ""
+
+#: ../rules/base.xml.in.h:223
+msgid "GBr"
+msgstr "vbr"
+
+#: ../rules/base.xml.in.h:224
+msgid "Ga"
+msgstr ""
+
+#: ../rules/base.xml.in.h:225
+msgid "Generic 101-key PC"
+msgstr "Obi�na sa 101 tasterom"
+
+#: ../rules/base.xml.in.h:226
+msgid "Generic 102-key (Intl) PC"
+msgstr "Obi�na sa 102 tastera (međunar.)"
+
+#: ../rules/base.xml.in.h:227
+msgid "Generic 104-key PC"
+msgstr "Obi�na sa 104 tastera"
+
+#: ../rules/base.xml.in.h:228
+msgid "Generic 105-key (Intl) PC"
+msgstr "Obi�na sa 105 tastera (međunar.)"
+
+#: ../rules/base.xml.in.h:229
+#, fuzzy
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:230
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM tastatura KWD-910"
+
+#: ../rules/base.xml.in.h:231
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:232
+msgid "Genius KB-19e NB"
+msgstr ""
+
+#: ../rules/base.xml.in.h:233
+msgid "Geo"
+msgstr "gru"
+
+#: ../rules/base.xml.in.h:234
+msgid "Georgia"
+msgstr "Gruzija"
+
+#: ../rules/base.xml.in.h:235
+#, fuzzy
+msgid "Georgian"
+msgstr "Gruzija"
+
+#: ../rules/base.xml.in.h:236
+msgid "Georgian AZERTY Tskapo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:237
+#, fuzzy
+msgid "German (Macintosh)"
+msgstr "Mekintoš"
+
+#: ../rules/base.xml.in.h:238
+msgid "German, Sun dead keys"
+msgstr "nema�ki, Sun-ovi akcenti"
+
+#: ../rules/base.xml.in.h:239
+msgid "German, eliminate dead keys"
+msgstr "nema�ki, bez akcenata"
+
+#: ../rules/base.xml.in.h:240
+msgid "Germany"
+msgstr "Nema�ka"
+
+#: ../rules/base.xml.in.h:241
+#, fuzzy
+msgid "Gha"
+msgstr "taj"
+
+#: ../rules/base.xml.in.h:242
+msgid "Ghana"
+msgstr ""
+
+#: ../rules/base.xml.in.h:243
+msgid "Gre"
+msgstr "grk"
+
+#: ../rules/base.xml.in.h:244
+msgid "Greece"
+msgstr "Gr�ka"
+
+#: ../rules/base.xml.in.h:245
+msgid "Group toggle on multiply/divide key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:246
+#, fuzzy
+msgid "Gui"
+msgstr "guj"
+
+#: ../rules/base.xml.in.h:247
+msgid "Guinea"
+msgstr ""
+
+#: ../rules/base.xml.in.h:248
+msgid "Gujarati"
+msgstr "gujarati"
+
+#: ../rules/base.xml.in.h:249
+msgid "Gurmukhi"
+msgstr "gurmuki"
+
+#: ../rules/base.xml.in.h:250
+#, fuzzy
+msgid "Gurmukhi Jhelum"
+msgstr "gurmuki"
+
+#: ../rules/base.xml.in.h:251
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:252
+msgid "Happy Hacking Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:253
+msgid "Happy Hacking Keyboard for Mac"
+msgstr ""
+
+#: ../rules/base.xml.in.h:254
+msgid "Hausa"
+msgstr ""
+
+#: ../rules/base.xml.in.h:255
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet tastatura"
+
+#: ../rules/base.xml.in.h:256
+#, fuzzy
+msgid "Hewlett-Packard Internet Keyboard 5181"
+msgstr "Hewlett-Packard Internet tastatura"
+
+#: ../rules/base.xml.in.h:257
+#, fuzzy
+msgid "Hewlett-Packard Internet Keyboard 5185"
+msgstr "Hewlett-Packard Internet tastatura"
+
+#: ../rules/base.xml.in.h:258
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:259
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:260
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:261
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:262
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:263
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:264
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:265
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 multimedijalna tastatura"
+
+#: ../rules/base.xml.in.h:266
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet tastatura"
+
+#: ../rules/base.xml.in.h:267
+#, fuzzy
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:268
+msgid "Hindi Bolnagri"
+msgstr ""
+
+#: ../rules/base.xml.in.h:269
+msgid "Homophonic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:270
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:271
+msgid "Hrv"
+msgstr "hrv"
+
+#: ../rules/base.xml.in.h:272
+msgid "Hun"
+msgstr "mađ"
+
+#: ../rules/base.xml.in.h:273
+msgid "Hungary"
+msgstr "Mađarska"
+
+#: ../rules/base.xml.in.h:274
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper je mapiran na Win tastere."
+
+#: ../rules/base.xml.in.h:275
+msgid "IBM (LST 1205-92)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:276
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:277
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:278
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (druga mogućnost)"
+
+#: ../rules/base.xml.in.h:279
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:280
+#, fuzzy
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:281
+msgid "IBM ThinkPad R60/T60/Z60m/Z60t/R61/T61/Z61m/Z61t"
+msgstr ""
+
+#: ../rules/base.xml.in.h:282
+msgid "ISO Alternate"
+msgstr "Dodatni ISO"
+
+#: ../rules/base.xml.in.h:283
+msgid "Iceland"
+msgstr "Island"
+
+#: ../rules/base.xml.in.h:284
+msgid "Igbo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:285
+msgid "Ind"
+msgstr "ind"
+
+#: ../rules/base.xml.in.h:286
+msgid "India"
+msgstr "Indija"
+
+#: ../rules/base.xml.in.h:287
+#, fuzzy
+msgid "International (AltGr dead keys)"
+msgstr "Međunarodna (sa akcentima)"
+
+#: ../rules/base.xml.in.h:288
+msgid "International (with dead keys)"
+msgstr "Međunarodna (sa akcentima)"
+
+#: ../rules/base.xml.in.h:289
+msgid "Inuktitut"
+msgstr "inuktitut"
+
+#: ../rules/base.xml.in.h:290
+msgid "Iran"
+msgstr "Iran"
+
+#: ../rules/base.xml.in.h:291
+#, fuzzy
+msgid "Iraq"
+msgstr "Iran"
+
+#: ../rules/base.xml.in.h:292
+msgid "Ireland"
+msgstr "Irska"
+
+#: ../rules/base.xml.in.h:293
+msgid "Irl"
+msgstr "irs"
+
+#: ../rules/base.xml.in.h:294
+msgid "Irn"
+msgstr "irn"
+
+#: ../rules/base.xml.in.h:295
+#, fuzzy
+msgid "Irq"
+msgstr "irs"
+
+#: ../rules/base.xml.in.h:296
+msgid "Isl"
+msgstr "isl"
+
+#: ../rules/base.xml.in.h:297
+msgid "Isr"
+msgstr "izr"
+
+#: ../rules/base.xml.in.h:298
+msgid "Israel"
+msgstr "Izrael"
+
+#: ../rules/base.xml.in.h:299
+msgid "Ita"
+msgstr "ita"
+
+#: ../rules/base.xml.in.h:300
+msgid "Italy"
+msgstr "Italija"
+
+#: ../rules/base.xml.in.h:301
+msgid "Japan"
+msgstr "Japan"
+
+#: ../rules/base.xml.in.h:302
+#, fuzzy
+msgid "Japan (PC-98xx Series)"
+msgstr "PC-98xx serija"
+
+#: ../rules/base.xml.in.h:303
+msgid "Japanese 106-key"
+msgstr "japanski sa 106 tastera"
+
+#: ../rules/base.xml.in.h:304
+msgid "Japanese keyboard options"
+msgstr ""
+
+#: ../rules/base.xml.in.h:305
+msgid "Jpn"
+msgstr "jpn"
+
+#: ../rules/base.xml.in.h:306
+#, fuzzy
+msgid "Kana"
+msgstr "knd"
+
+#: ../rules/base.xml.in.h:307
+msgid "Kana Lock key is locking"
+msgstr ""
+
+#: ../rules/base.xml.in.h:308
+msgid "Kannada"
+msgstr "kanada (južna indija)"
+
+#: ../rules/base.xml.in.h:309
+msgid "Kashubian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:310
+#, fuzzy
+msgid "Kaz"
+msgstr "knd"
+
+#: ../rules/base.xml.in.h:311
+msgid "Kazakh with Russian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:312
+#, fuzzy
+msgid "Kazakhstan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:313
+msgid "Keypad"
+msgstr "Numeri�ka tastatura"
+
+#: ../rules/base.xml.in.h:314
+msgid "Keypad with unicode additions (arrows and math operators)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:315
+msgid ""
+"Keypad with unicode additions (arrows and math operators). Math operators on "
+"default level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:316
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:317
+msgid "Khm"
+msgstr ""
+
+#: ../rules/base.xml.in.h:318
+#, fuzzy
+msgid "Kir"
+msgstr "kir"
+
+#: ../rules/base.xml.in.h:319
+msgid "Komi"
+msgstr ""
+
+#: ../rules/base.xml.in.h:320
+#, fuzzy
+msgid "Kor"
+msgstr "kir"
+
+#: ../rules/base.xml.in.h:321
+msgid "Korea, Republic of"
+msgstr ""
+
+#: ../rules/base.xml.in.h:322
+#, fuzzy
+msgid "Korean 106-key"
+msgstr "japanski sa 106 tastera"
+
+#: ../rules/base.xml.in.h:323
+#, fuzzy
+msgid "Kurdish, (F)"
+msgstr "turski (F)"
+
+#: ../rules/base.xml.in.h:324
+msgid "Kurdish, Arabic-Latin"
+msgstr ""
+
+#: ../rules/base.xml.in.h:325
+msgid "Kurdish, Latin Alt-Q"
+msgstr ""
+
+#: ../rules/base.xml.in.h:326
+msgid "Kurdish, Latin Q"
+msgstr ""
+
+#: ../rules/base.xml.in.h:327
+msgid "Kyrgyzstan"
+msgstr "Kirgistan"
+
+#: ../rules/base.xml.in.h:328
+msgid "LAm"
+msgstr "JAm"
+
+#: ../rules/base.xml.in.h:329
+#, fuzzy
+msgid "LCtrl+LShift change layout."
+msgstr "Control+Shift menja grupu."
+
+#: ../rules/base.xml.in.h:330
+msgid "LEKP"
+msgstr ""
+
+#: ../rules/base.xml.in.h:331
+msgid "LEKPa"
+msgstr ""
+
+#: ../rules/base.xml.in.h:332
+msgid "Lao"
+msgstr "lao"
+
+#: ../rules/base.xml.in.h:333
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:334
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Tastature prenosnih ra�unara iz Compaq-a (npr. Armada)"
+
+#: ../rules/base.xml.in.h:335
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Tastature prenosnih ra�unara iz Compaq-a (npr. Presario)"
+
+#: ../rules/base.xml.in.h:336
+#, fuzzy
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Tastature prenosnih ra�unara Dell Inspiron 8xxx"
+
+#: ../rules/base.xml.in.h:337
+msgid "Latin"
+msgstr "latini�ni"
+
+#: ../rules/base.xml.in.h:338
+msgid "Latin American"
+msgstr "južnoameri�ki"
+
+#: ../rules/base.xml.in.h:339
+msgid "Latin Unicode"
+msgstr "latini�ni Unikod"
+
+#: ../rules/base.xml.in.h:340
+msgid "Latin Unicode qwerty"
+msgstr "latini�ni Unikod qwerty"
+
+#: ../rules/base.xml.in.h:341
+msgid "Latin qwerty"
+msgstr "latini�ni qwerty"
+
+#: ../rules/base.xml.in.h:342
+#, fuzzy
+msgid "Latin unicode"
+msgstr "latini�ni Unikod"
+
+#: ../rules/base.xml.in.h:343
+#, fuzzy
+msgid "Latin unicode qwerty"
+msgstr "latini�ni Unikod qwerty"
+
+#: ../rules/base.xml.in.h:344
+#, fuzzy
+msgid "Latin with guillemets"
+msgstr "latini�ni sa giljemotima"
+
+#: ../rules/base.xml.in.h:345
+msgid "Latvia"
+msgstr "Letonija"
+
+#: ../rules/base.xml.in.h:346
+#, fuzzy
+msgid "Lav"
+msgstr "lao"
+
+#: ../rules/base.xml.in.h:347
+msgid "Layout switching"
+msgstr ""
+
+#: ../rules/base.xml.in.h:348
+#, fuzzy
+msgid "Left Alt is swapped with left Win-key."
+msgstr "Meta je mapiran na levi Windows taster."
+
+#: ../rules/base.xml.in.h:349
+#, fuzzy
+msgid "Left Alt key changes layout."
+msgstr "Levi Alt taster menja grupu."
+
+#: ../rules/base.xml.in.h:350
+#, fuzzy
+msgid "Left Alt key switches layout while pressed."
+msgstr "Levi Alt taster menja grupu dok je pritisnut."
+
+#: ../rules/base.xml.in.h:351
+#, fuzzy
+msgid "Left Ctrl key changes layout."
+msgstr "Levi Ctrl taster menja grupu."
+
+#: ../rules/base.xml.in.h:352
+#, fuzzy
+msgid "Left Shift key changes layout."
+msgstr "Levi Shift taster menja grupu."
+
+#: ../rules/base.xml.in.h:353
+#, fuzzy
+msgid "Left Win-key changes layout."
+msgstr "Levi Windows taster menja grupu."
+
+#: ../rules/base.xml.in.h:354
+#, fuzzy
+msgid "Left Win-key is Compose."
+msgstr "Desni Windows taster je kombinujući."
+
+#: ../rules/base.xml.in.h:355
+#, fuzzy
+msgid "Left Win-key switches layout while pressed."
+msgstr "Levi Windows taster menja grupu dok je pritisnut."
+
+#: ../rules/base.xml.in.h:356
+#, fuzzy
+msgid "Left hand"
+msgstr "Holandija"
+
+#: ../rules/base.xml.in.h:357
+msgid "Left handed Dvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:358
+msgid "Legacy"
+msgstr ""
+
+#: ../rules/base.xml.in.h:359
+msgid "Legacy Wang 724 keypad"
+msgstr ""
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:361
+msgid "Legacy key with comma"
+msgstr ""
+
+#: ../rules/base.xml.in.h:362
+msgid "Legacy key with dot"
+msgstr ""
+
+#: ../rules/base.xml.in.h:363
+msgid "Legacy keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:364
+msgid "Less-than/Greater-than is Compose."
+msgstr ""
+
+#: ../rules/base.xml.in.h:365
+msgid "Lithuania"
+msgstr "Litvanija"
+
+#: ../rules/base.xml.in.h:366
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access tastatura"
+
+#: ../rules/base.xml.in.h:367
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:368
+#, fuzzy
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (dodatna mogućnost)"
+
+#: ../rules/base.xml.in.h:369
+#, fuzzy
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:370
+#, fuzzy
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:371
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:372
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:373
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (dodatna mogućnost 2)"
+
+#: ../rules/base.xml.in.h:374
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:375
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:376
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr ""
+
+#: ../rules/base.xml.in.h:377
+#, fuzzy
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech Internet tastatura"
+
+#: ../rules/base.xml.in.h:378
+#, fuzzy
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet tastatura"
+
+#: ../rules/base.xml.in.h:379
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet tastatura"
+
+#: ../rules/base.xml.in.h:380
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet navigator tastatura"
+
+#: ../rules/base.xml.in.h:381
+#, fuzzy
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Ultra-X tastatura"
+
+#: ../rules/base.xml.in.h:382
+#, fuzzy
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: ../rules/base.xml.in.h:383
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X tastatura"
+
+#: ../rules/base.xml.in.h:384
+#, fuzzy
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech Access tastatura"
+
+#: ../rules/base.xml.in.h:385
+#, fuzzy
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech Access tastatura"
+
+#: ../rules/base.xml.in.h:386
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:387
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless tastatura (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:388
+#, fuzzy
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech Internet navigator tastatura"
+
+#: ../rules/base.xml.in.h:389
+#, fuzzy
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech Internet navigator tastatura"
+
+#: ../rules/base.xml.in.h:390
+msgid "Ltu"
+msgstr "lit"
+
+#: ../rules/base.xml.in.h:391
+msgid "MESS"
+msgstr ""
+
+#: ../rules/base.xml.in.h:392
+msgid "MNE"
+msgstr ""
+
+#: ../rules/base.xml.in.h:393
+msgid "MacBook/MacBook Pro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:394
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:395
+#, fuzzy
+msgid "Macedonia"
+msgstr "Makedonija"
+
+#: ../rules/base.xml.in.h:396
+msgid "Macintosh"
+msgstr "Mekintoš"
+
+#: ../rules/base.xml.in.h:397
+msgid "Macintosh Old"
+msgstr "Stari Mekintoš"
+
+#: ../rules/base.xml.in.h:398
+#, fuzzy
+msgid "Macintosh, Sun dead keys"
+msgstr "francuski, Sun-ovi akcenti"
+
+#: ../rules/base.xml.in.h:399
+#, fuzzy
+msgid "Macintosh, eliminate dead keys"
+msgstr "Francuski, bez akcenata"
+
+#: ../rules/base.xml.in.h:400
+#, fuzzy
+msgid "Make CapsLock an additional Ctrl."
+msgstr "U�ini Caps Lock dodatnim Control tasterom."
+
+#: ../rules/base.xml.in.h:401
+msgid "Mal"
+msgstr "mal"
+
+#: ../rules/base.xml.in.h:402
+msgid "Malayalam"
+msgstr "malajamski"
+
+#: ../rules/base.xml.in.h:403
+#, fuzzy
+msgid "Malayalam Lalitha"
+msgstr "malajamski"
+
+#: ../rules/base.xml.in.h:404
+msgid "Maldives"
+msgstr "Maldivi"
+
+#: ../rules/base.xml.in.h:405
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:406
+#, fuzzy
+msgid "Maltese keyboard with US layout"
+msgstr "rumunska tastatura sa nema�kim slovima"
+
+#: ../rules/base.xml.in.h:407
+msgid "Mao"
+msgstr "mao"
+
+#: ../rules/base.xml.in.h:408
+msgid "Maori"
+msgstr "Maori"
+
+#: ../rules/base.xml.in.h:409
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:410
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access tastatura"
+
+#: ../rules/base.xml.in.h:411
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:412
+msgid "Menu is Compose."
+msgstr "Menu je kombinujući taster."
+
+#: ../rules/base.xml.in.h:413
+#, fuzzy
+msgid "Menu key changes layout."
+msgstr "Menu taster menja grupu."
+
+#: ../rules/base.xml.in.h:414
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta je mapiran na Windows tastere."
+
+#: ../rules/base.xml.in.h:415
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta je mapiran na levi Windows taster."
+
+#: ../rules/base.xml.in.h:416
+msgid "Microsoft Internet Keyboard"
+msgstr "Mikrosoftova Internet tastatura"
+
+#: ../rules/base.xml.in.h:417
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Mikrosoftova Internet Pro tastatura, Å¡vedski"
+
+#: ../rules/base.xml.in.h:418
+msgid "Microsoft Natural"
+msgstr "Mikrosoft Natural"
+
+#: ../rules/base.xml.in.h:419
+#, fuzzy
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Mikrosoft Natural tastatura Pro OEM"
+
+#: ../rules/base.xml.in.h:420
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Mikrosoft Natural tastatura Pro / Mikrosoft Internet tastatura Pro "
+
+#: ../rules/base.xml.in.h:421
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Mikrosoft Natural tastatura Pro OEM"
+
+#: ../rules/base.xml.in.h:422
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr ""
+"Mikrosoftova Natural tastatura Pro USB / Mikrosoft Internet tastatura Pro "
+
+#: ../rules/base.xml.in.h:423
+msgid "Microsoft Office Keyboard"
+msgstr "Mikrosoftova kancelarijska tastatura"
+
+#: ../rules/base.xml.in.h:424
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Mikrosoftova beži�na multimedijalna tastatura 1.0A"
+
+#: ../rules/base.xml.in.h:425
+msgid "Miscellaneous compatibility options"
+msgstr "Razne mogućnosti za saglasnost"
+
+#: ../rules/base.xml.in.h:426
+msgid "Mkd"
+msgstr "mak"
+
+#: ../rules/base.xml.in.h:427
+msgid "Mlt"
+msgstr "mal"
+
+#: ../rules/base.xml.in.h:428
+msgid "Mmr"
+msgstr "mmr"
+
+#: ../rules/base.xml.in.h:429
+msgid "Mng"
+msgstr "mng"
+
+#: ../rules/base.xml.in.h:430
+msgid "Mongolia"
+msgstr "Mongolija"
+
+#: ../rules/base.xml.in.h:431
+msgid "Montenegro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:432
+msgid "Morocco"
+msgstr ""
+
+#: ../rules/base.xml.in.h:433
+msgid "Multilingual"
+msgstr "Višejezi�na"
+
+#: ../rules/base.xml.in.h:434
+#, fuzzy
+msgid "Multilingual, first part"
+msgstr "Višejezi�na, drugi deo"
+
+#: ../rules/base.xml.in.h:435
+msgid "Multilingual, second part"
+msgstr "Višejezi�na, drugi deo"
+
+#: ../rules/base.xml.in.h:436
+msgid "Myanmar"
+msgstr "Mijanmar"
+
+#: ../rules/base.xml.in.h:437
+msgid "NICOLA-F style Backspace"
+msgstr ""
+
+#: ../rules/base.xml.in.h:438
+msgid "Neostyle"
+msgstr ""
+
+#: ../rules/base.xml.in.h:439
+msgid "Nep"
+msgstr ""
+
+#: ../rules/base.xml.in.h:440
+msgid "Nepal"
+msgstr ""
+
+#: ../rules/base.xml.in.h:441
+msgid "Netherlands"
+msgstr "Holandija"
+
+#: ../rules/base.xml.in.h:442
+msgid "Nig"
+msgstr ""
+
+# bug: Serbia and Montenegro
+#: ../rules/base.xml.in.h:443
+#, fuzzy
+msgid "Nigeria"
+msgstr "Srbija"
+
+#: ../rules/base.xml.in.h:444
+msgid "Nld"
+msgstr "hol"
+
+#: ../rules/base.xml.in.h:445
+msgid "Nor"
+msgstr "nor"
+
+#: ../rules/base.xml.in.h:446
+msgid "Northern Saami"
+msgstr "severnosaamski"
+
+#: ../rules/base.xml.in.h:447
+msgid "Northern Saami, eliminate dead keys"
+msgstr "severnosaamski, bez akcenata"
+
+#: ../rules/base.xml.in.h:448
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:449
+msgid "Norway"
+msgstr "Norveška"
+
+#: ../rules/base.xml.in.h:450
+#, fuzzy
+msgid "NumLock LED shows alternative layout."
+msgstr "NumLock lampica prikazuje izmene grupa."
+
+#: ../rules/base.xml.in.h:451
+msgid "Numeric keypad delete key behaviour"
+msgstr ""
+
+#: ../rules/base.xml.in.h:452
+msgid "Numeric keypad keys work as with Mac."
+msgstr ""
+
+#: ../rules/base.xml.in.h:453
+msgid "Numeric keypad layout selection"
+msgstr ""
+
+#: ../rules/base.xml.in.h:454
+msgid "OADG 109A"
+msgstr ""
+
+#: ../rules/base.xml.in.h:455
+msgid "OLPC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:456
+msgid "OLPC Dari"
+msgstr ""
+
+#: ../rules/base.xml.in.h:457
+msgid "OLPC Pashto"
+msgstr ""
+
+#: ../rules/base.xml.in.h:458
+msgid "OLPC Southern Uzbek"
+msgstr ""
+
+#: ../rules/base.xml.in.h:459
+msgid "Ogham"
+msgstr "ogam"
+
+#: ../rules/base.xml.in.h:460
+msgid "Ogham IS434"
+msgstr "ogam IS434"
+
+#: ../rules/base.xml.in.h:461
+msgid "Oriya"
+msgstr "orija"
+
+#: ../rules/base.xml.in.h:462
+#, fuzzy
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/Internet tastatura"
+
+#: ../rules/base.xml.in.h:463
+#, fuzzy
+msgid "Ossetian"
+msgstr "ruski"
+
+#: ../rules/base.xml.in.h:464
+msgid "Ossetian, Winkeys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:465
+msgid "Ossetian, legacy"
+msgstr ""
+
+#: ../rules/base.xml.in.h:466
+msgid "PC-98xx Series"
+msgstr "PC-98xx serija"
+
+#: ../rules/base.xml.in.h:467
+msgid "Pak"
+msgstr "pak"
+
+#: ../rules/base.xml.in.h:468
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:469
+msgid "Pashto"
+msgstr ""
+
+#: ../rules/base.xml.in.h:470
+msgid "Pattachote"
+msgstr "Patašote"
+
+#: ../rules/base.xml.in.h:471
+msgid "Phonetic"
+msgstr "fonetski"
+
+#: ../rules/base.xml.in.h:472
+msgid "Pol"
+msgstr "polj"
+
+#: ../rules/base.xml.in.h:473
+msgid "Poland"
+msgstr "Poljska"
+
+# ne valja, možda višezvu�ni?
+#: ../rules/base.xml.in.h:474
+msgid "Polytonic"
+msgstr "višezvu�ni"
+
+#: ../rules/base.xml.in.h:475
+msgid "Portugal"
+msgstr "Portugalija"
+
+#: ../rules/base.xml.in.h:476
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Pritiskanje levog Alt tastera za izbor 3. nivoa."
+
+#: ../rules/base.xml.in.h:477
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Pritiskanje levog Windows tastera za izbor 3. nivoa."
+
+#: ../rules/base.xml.in.h:478
+msgid "Press Menu key to choose 3rd level."
+msgstr "Pritiskanje Menu tastera za izbor 3. nivoa."
+
+#: ../rules/base.xml.in.h:479
+#, fuzzy
+msgid ""
+"Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "Pritiskanje desnog Alt tastera za izbor 3. nivoa."
+
+#: ../rules/base.xml.in.h:480
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Pritiskanje desnog Alt tastera za izbor 3. nivoa."
+
+#: ../rules/base.xml.in.h:481
+#, fuzzy
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Pritiskanje desnog Control tastera za izbor 3. nivoa."
+
+#: ../rules/base.xml.in.h:482
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Pritiskanje desnog Windows tastera za izbor 3. nivoa."
+
+#: ../rules/base.xml.in.h:483
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Pritiskanje bilo kog Alt tastera za izbor 3. nivoa."
+
+#: ../rules/base.xml.in.h:484
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Pritiskanje bilo kog Windows tastera za izbor 3. nivoa."
+
+#: ../rules/base.xml.in.h:485
+msgid "Pro"
+msgstr "pro"
+
+#: ../rules/base.xml.in.h:486
+msgid "Pro Keypad"
+msgstr "Pro tastatura"
+
+#: ../rules/base.xml.in.h:487
+msgid "Probhat"
+msgstr "probat"
+
+#: ../rules/base.xml.in.h:488
+#, fuzzy
+msgid "Programmer Dvorak"
+msgstr "francuski dvorak"
+
+#: ../rules/base.xml.in.h:489
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:490
+msgid "Prt"
+msgstr "prt"
+
+#: ../rules/base.xml.in.h:491
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:492
+#, fuzzy
+msgid "R-Alt switches layout while pressed."
+msgstr "Desni Alt menja grupu dok je pritisnut."
+
+#: ../rules/base.xml.in.h:493
+msgid "Right Alt is Compose."
+msgstr "Desni Alt je kombinujući."
+
+#: ../rules/base.xml.in.h:494
+#, fuzzy
+msgid "Right Alt key changes layout."
+msgstr "Desni Alt je menja grupu."
+
+#: ../rules/base.xml.in.h:495
+#, fuzzy
+msgid "Right Alt key never chooses 3rd level."
+msgstr "Pritiskanje desnog Alt tastera za izbor 3. nivoa."
+
+#: ../rules/base.xml.in.h:496
+msgid "Right Ctrl is Compose."
+msgstr "Desni Ctrl je kombinujući."
+
+#: ../rules/base.xml.in.h:497
+#, fuzzy
+msgid "Right Ctrl key changes layout."
+msgstr "Desni Ctrl menja grupu."
+
+#: ../rules/base.xml.in.h:498
+#, fuzzy
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "Desni Ctrl taster menja grupu dok je pritisnut."
+
+#: ../rules/base.xml.in.h:499
+#, fuzzy
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Desni Control taster se ponaša kao desni Alt."
+
+#: ../rules/base.xml.in.h:500
+#, fuzzy
+msgid "Right Shift key changes layout."
+msgstr "Desni Shift menja grupu."
+
+#: ../rules/base.xml.in.h:501
+#, fuzzy
+msgid "Right Win-key changes layout."
+msgstr "Desni Windows taster menja grupu."
+
+#: ../rules/base.xml.in.h:502
+msgid "Right Win-key is Compose."
+msgstr "Desni Windows taster je kombinujući."
+
+#: ../rules/base.xml.in.h:503
+#, fuzzy
+msgid "Right Win-key switches layout while pressed."
+msgstr "Desni Windows taster menja grupu dok je pritisnut."
+
+#: ../rules/base.xml.in.h:504
+msgid "Right hand"
+msgstr ""
+
+#: ../rules/base.xml.in.h:505
+msgid "Right handed Dvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:506
+msgid "Romania"
+msgstr "Rumunija"
+
+#: ../rules/base.xml.in.h:507
+msgid "Romanian keyboard with German letters"
+msgstr "rumunska tastatura sa nema�kim slovima"
+
+#: ../rules/base.xml.in.h:508
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "rumunska tastatura sa nema�kim slovima, bez akcenata"
+
+#: ../rules/base.xml.in.h:509
+msgid "Rou"
+msgstr "rum"
+
+#: ../rules/base.xml.in.h:510
+msgid "Rus"
+msgstr "rus"
+
+#: ../rules/base.xml.in.h:511
+msgid "Russia"
+msgstr "Rusija"
+
+#: ../rules/base.xml.in.h:512
+msgid "Russian"
+msgstr "ruski"
+
+#: ../rules/base.xml.in.h:513
+msgid "Russian phonetic"
+msgstr "ruski fonetski"
+
+#: ../rules/base.xml.in.h:514
+#, fuzzy
+msgid "Russian phonetic Dvorak"
+msgstr "ruski fonetski"
+
+#: ../rules/base.xml.in.h:515
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "ruski fonetski, bez akcenata"
+
+#: ../rules/base.xml.in.h:516
+msgid "Russian with Kazakh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:517
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:518
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:519
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:520
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:521
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:522
+msgid "SRB"
+msgstr ""
+
+#: ../rules/base.xml.in.h:523
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN ergonomska 2500"
+
+#: ../rules/base.xml.in.h:524
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:525
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:526
+#, fuzzy
+msgid "ScrollLock LED shows alternative layout."
+msgstr "ScrollLock lampica prikazuje izmene grupa."
+
+#: ../rules/base.xml.in.h:527
+msgid "Secwepemctsin"
+msgstr ""
+
+# bug: Serbia and Montenegro
+#: ../rules/base.xml.in.h:528
+msgid "Serbia"
+msgstr "Srbija"
+
+#: ../rules/base.xml.in.h:529
+#, fuzzy
+msgid "Shift cancels CapsLock."
+msgstr "Razmeni Control i Caps Lock."
+
+#: ../rules/base.xml.in.h:530
+#, fuzzy
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "Shift uz numeri�ku tasaturu radi kao u MS Windows-u."
+
+#: ../rules/base.xml.in.h:531
+#, fuzzy
+msgid "Shift+CapsLock changes layout."
+msgstr "Shift+CapsLock taster menja grupu."
+
+#: ../rules/base.xml.in.h:532
+msgid "Slovakia"
+msgstr "Slova�ka"
+
+#: ../rules/base.xml.in.h:533
+msgid "Slovenia"
+msgstr "Slovenija"
+
+#: ../rules/base.xml.in.h:534
+msgid "South Africa"
+msgstr ""
+
+#: ../rules/base.xml.in.h:535
+msgid "Southern Uzbek"
+msgstr ""
+
+#: ../rules/base.xml.in.h:536
+msgid ""
+"Space key outputs non-breakable space character at fourth level, thin non-"
+"breakable space character at sixth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:537
+msgid ""
+"Space key outputs non-breakable space character at fourth level, thin non-"
+"breakable space character at sixth level (via Ctrl+Shift"
+msgstr ""
+
+#: ../rules/base.xml.in.h:538
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:539
+msgid "Space key outputs non-breakable space character at second level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:540
+msgid ""
+"Space key outputs non-breakable space character at third level, nothing at "
+"fourth level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:541
+msgid ""
+"Space key outputs non-breakable space character at third level, thin non-"
+"breakable space character at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:542
+msgid "Space key outputs non-breakable space character at third level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:543
+msgid "Space key outputs usual space at any level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:544
+msgid "Spain"
+msgstr "Å panija"
+
+#: ../rules/base.xml.in.h:545
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Naro�iti tasteri (Ctrl+Alt+&lt;taster&gt;) koje obrađuje server."
+
+#: ../rules/base.xml.in.h:546
+msgid "SrL"
+msgstr "Å¡rl"
+
+#: ../rules/base.xml.in.h:547
+msgid "Sri Lanka"
+msgstr "Å ri Lanka"
+
+#: ../rules/base.xml.in.h:548
+msgid "Standard"
+msgstr "standardna"
+
+#: ../rules/base.xml.in.h:549
+#, fuzzy
+msgid "Standard (Cedilla)"
+msgstr "standardna"
+
+#: ../rules/base.xml.in.h:550
+msgid "Standard (Commabelow)"
+msgstr ""
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:552
+msgid "Standard RSTU"
+msgstr "standardna RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:554
+msgid "Standard RSTU on Russian layout"
+msgstr "standardna RSTU na ruskom rasporedu"
+
+#: ../rules/base.xml.in.h:555
+msgid "Sun Type 5/6"
+msgstr ""
+
+#: ../rules/base.xml.in.h:556
+msgid "Sun dead keys"
+msgstr "Sun-ovi akcenti"
+
+#: ../rules/base.xml.in.h:557
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super moćna multimedijalna tastatura"
+
+#: ../rules/base.xml.in.h:558
+#, fuzzy
+msgid "Super is mapped to the Win-keys."
+msgstr "Hyper je mapiran na Win tastere."
+
+#: ../rules/base.xml.in.h:559
+#, fuzzy
+msgid "Svdvorak"
+msgstr "dvorak"
+
+#: ../rules/base.xml.in.h:560
+msgid "Svk"
+msgstr "slk"
+
+#: ../rules/base.xml.in.h:561
+msgid "Svn"
+msgstr "slo"
+
+#: ../rules/base.xml.in.h:562
+#, fuzzy
+msgid "Swap Ctrl and CapsLock."
+msgstr "Razmeni Control i Caps Lock."
+
+#: ../rules/base.xml.in.h:563
+#, fuzzy
+msgid "Swap ESC and CapsLock."
+msgstr "Razmeni Control i Caps Lock."
+
+#: ../rules/base.xml.in.h:564
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr ""
+
+#: ../rules/base.xml.in.h:565
+msgid "Swe"
+msgstr "Å¡ve"
+
+#: ../rules/base.xml.in.h:566
+msgid "Sweden"
+msgstr "Å vedska"
+
+#: ../rules/base.xml.in.h:567
+msgid "Switzerland"
+msgstr "Å vajcarska"
+
+#: ../rules/base.xml.in.h:568
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:569
+msgid "Syr"
+msgstr "sir"
+
+#: ../rules/base.xml.in.h:570
+msgid "Syria"
+msgstr "Sirija"
+
+#: ../rules/base.xml.in.h:571
+msgid "Syriac"
+msgstr "sirijski"
+
+#: ../rules/base.xml.in.h:572
+msgid "Syriac phonetic"
+msgstr "sirijski fonetski"
+
+#: ../rules/base.xml.in.h:573
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:574
+msgid "Tajikistan"
+msgstr "Tadžikistan"
+
+#: ../rules/base.xml.in.h:575
+msgid "Tamil"
+msgstr "tamil"
+
+#: ../rules/base.xml.in.h:576
+msgid "Tamil TAB Typewriter"
+msgstr "tamil TAB kucaća mašina"
+
+#: ../rules/base.xml.in.h:577
+msgid "Tamil TSCII Typewriter"
+msgstr "tamil TSCII kucaća mašina"
+
+#: ../rules/base.xml.in.h:578
+msgid "Tamil Unicode"
+msgstr "tamil Unikod"
+
+#: ../rules/base.xml.in.h:579
+#, fuzzy
+msgid "Tatar"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:580
+msgid "Telugu"
+msgstr "telugu"
+
+#: ../rules/base.xml.in.h:581
+msgid "Tha"
+msgstr "taj"
+
+#: ../rules/base.xml.in.h:582
+msgid "Thailand"
+msgstr "Tajland"
+
+#: ../rules/base.xml.in.h:583
+msgid "Third level choosers"
+msgstr "Izbor trećeg nivoa"
+
+#: ../rules/base.xml.in.h:584
+msgid "Tibetan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:585
+msgid "Tibetan (with ASCII numerals)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:586
+msgid "Tifinagh"
+msgstr ""
+
+# Naizmeni�no?
+#: ../rules/base.xml.in.h:587
+#, fuzzy
+msgid "Tifinagh Alternative"
+msgstr "Dopunska"
+
+#: ../rules/base.xml.in.h:588
+msgid "Tifinagh Alternative Phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:589
+#, fuzzy
+msgid "Tifinagh Extended"
+msgstr "Prošireno"
+
+#: ../rules/base.xml.in.h:590
+msgid "Tifinagh Extended Phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:591
+#, fuzzy
+msgid "Tifinagh Phonetic"
+msgstr "fonetski"
+
+#: ../rules/base.xml.in.h:592
+msgid "Tilde (~) variant"
+msgstr "Varijanta sa tildom (~)"
+
+#: ../rules/base.xml.in.h:593
+msgid "Tjk"
+msgstr "tdžk"
+
+#: ../rules/base.xml.in.h:594
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:595
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access tastatura"
+
+#: ../rules/base.xml.in.h:596
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust klasi�na beži�na tastatura"
+
+#: ../rules/base.xml.in.h:597
+msgid "Tur"
+msgstr "tur"
+
+#: ../rules/base.xml.in.h:598
+#, fuzzy
+msgid "Turkey"
+msgstr "tur"
+
+#: ../rules/base.xml.in.h:599
+msgid "Typewriter"
+msgstr "„Kucaća mašina“"
+
+#: ../rules/base.xml.in.h:600
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Ameri�ka tastatura sa bosanskim digrafima"
+
+#: ../rules/base.xml.in.h:601
+msgid "US keyboard with Bosnian letters"
+msgstr "Ameri�ka tastatura sa bosanskim slovima"
+
+#: ../rules/base.xml.in.h:602
+msgid "US keyboard with Croatian digraphs"
+msgstr "Ameri�ka tastatura sa hrvatskim digrafima"
+
+#: ../rules/base.xml.in.h:603
+msgid "US keyboard with Croatian letters"
+msgstr "Ameri�ka tastatura sa hrvatskim slovima"
+
+#: ../rules/base.xml.in.h:604
+#, fuzzy
+msgid "US keyboard with Estonian letters"
+msgstr "Ameri�ka tastatura sa bosanskim slovima"
+
+#: ../rules/base.xml.in.h:605
+msgid "US keyboard with Lithuanian letters"
+msgstr "Ameri�ka tastatura sa litvanskim slovima"
+
+#: ../rules/base.xml.in.h:606
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Ameri�ka tastatura sa slovena�kim digrafima"
+
+#: ../rules/base.xml.in.h:607
+msgid "US keyboard with Slovenian letters"
+msgstr "Ameri�ka tastatura sa slovena�kim slovima"
+
+#: ../rules/base.xml.in.h:608
+msgid "USA"
+msgstr "SAD"
+
+#: ../rules/base.xml.in.h:609
+#, fuzzy
+msgid "Udmurt"
+msgstr "Urdu"
+
+#: ../rules/base.xml.in.h:610
+msgid "Ukr"
+msgstr "ukr"
+
+#: ../rules/base.xml.in.h:611
+msgid "Ukraine"
+msgstr "Ukrajina"
+
+#: ../rules/base.xml.in.h:612
+msgid "UnicodeExpert"
+msgstr "Stru�na za Unikod"
+
+#: ../rules/base.xml.in.h:613
+msgid "United Kingdom"
+msgstr "Velika Britanija"
+
+#: ../rules/base.xml.in.h:614
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../rules/base.xml.in.h:615
+msgid "Use Bosnian digraphs"
+msgstr "Koristi bosanske digrafe"
+
+#: ../rules/base.xml.in.h:616
+msgid "Use Croatian digraphs"
+msgstr "Koristi hrvatske digrafe"
+
+#: ../rules/base.xml.in.h:617
+msgid "Use Slovenian digraphs"
+msgstr "Koristi slovena�ke digrafe"
+
+#: ../rules/base.xml.in.h:618
+#, fuzzy
+msgid "Use guillemets for quotes"
+msgstr "Koristi giljemote za navodnike"
+
+#: ../rules/base.xml.in.h:619
+#, fuzzy
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Koristi lampicu tastature za prikaz izmene grupa."
+
+#: ../rules/base.xml.in.h:620
+msgid "Using space key to input non-breakable space character"
+msgstr ""
+
+#: ../rules/base.xml.in.h:621
+msgid "Uzb"
+msgstr "uzb"
+
+#: ../rules/base.xml.in.h:622
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+#: ../rules/base.xml.in.h:623
+msgid "Vietnam"
+msgstr "Vijetnam"
+
+#: ../rules/base.xml.in.h:624
+#, fuzzy
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "Chicony Internet tastatura"
+
+#: ../rules/base.xml.in.h:625
+msgid "Vnm"
+msgstr "vjt"
+
+#: ../rules/base.xml.in.h:626
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:627
+msgid ""
+"Wang 724 keypad with unicode additions (arrows and math operators). Math "
+"operators on default level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:628
+msgid "Wang model 724 azerty"
+msgstr ""
+
+#: ../rules/base.xml.in.h:629
+msgid "Western"
+msgstr ""
+
+#: ../rules/base.xml.in.h:630
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:631
+msgid "Winkeys"
+msgstr "Windows tasteri"
+
+#: ../rules/base.xml.in.h:632
+msgid "With &lt;\\|&gt; key"
+msgstr "Uz taster &lt;\\|&gt;"
+
+#: ../rules/base.xml.in.h:633
+#, fuzzy
+msgid "With EuroSign on 5"
+msgstr "Dodaj znak za evro na taster 5."
+
+#: ../rules/base.xml.in.h:634
+#, fuzzy
+msgid "With guillemets"
+msgstr "Sa giljemotima"
+
+#: ../rules/base.xml.in.h:635
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet tastatura"
+
+#: ../rules/base.xml.in.h:636
+msgid "Yoruba"
+msgstr ""
+
+#: ../rules/base.xml.in.h:637
+msgid "Z and ZHE swapped"
+msgstr "Razmenjeno Z i Ž"
+
+#: ../rules/base.xml.in.h:638
+msgid "Zar"
+msgstr ""
+
+#: ../rules/base.xml.in.h:639
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:640
+msgid "azerty/digits"
+msgstr "azerty/cifre"
+
+#: ../rules/base.xml.in.h:641
+msgid "digits"
+msgstr "cifre"
+
+#: ../rules/base.xml.in.h:642
+msgid "displaced semicolon and quote (obsolete)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:643
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:644
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:645
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, prošireno sa obrnutom kosom crtom"
+
+#: ../rules/base.xml.in.h:646
+msgid "qwerty/digits"
+msgstr "qwerty/cifre"
+
+#: ../rules/base.xml.in.h:647
+msgid "qwertz"
+msgstr "qwertz"
+
+#~ msgid "Acer TravelMate 800"
+#~ msgstr "Acer TravelMate 800"
+
+#~ msgid "Dnk"
+#~ msgstr "dan"
+
+#~ msgid "Group Shift/Lock behavior"
+#~ msgstr "Ponašanje izmene/izbora grupe"
+
+#~ msgid "Logitech Deluxe Access Keyboard"
+#~ msgstr "Logitech Deluxe Access tastatura"
+
+#~ msgid "Logitech iTouch keyboard Internet Navigator"
+#~ msgstr "Logitech iTouch tastatura Internet navigator"
+
+#~ msgid "Lva"
+#~ msgstr "let"
+
+#, fuzzy
+#~ msgid "Power G5"
+#~ msgstr "PowerPC PS/2"
+
+#~ msgid "PowerPC PS/2"
+#~ msgstr "PowerPC PS/2"
+
+#~ msgid "Turkish"
+#~ msgstr "turski"
+
+#~ msgid "U.S. English"
+#~ msgstr "ameri�ki engleski"
+
+#~ msgid "US keyboard with Maltian letters"
+#~ msgstr "Ameri�ka tastatura sa malteškim slovima"
+
+#~ msgid "si1452"
+#~ msgstr "si1452"
+
+#~ msgid "\"Standard\""
+#~ msgstr "„Standardna“"
+
+#~ msgid "Srp"
+#~ msgstr "srp"
+
+#~ msgid "Tamil INSCRIPT"
+#~ msgstr "tamil inskript"
+
+#~ msgid "US keyboard with Romanian letters"
+#~ msgstr "Ameri�ka tastatura sa rumunskim slovima"
+
+#~ msgid "A Tamil typewrite-style keymap; TAB encoding"
+#~ msgstr "Tamil raspored nalik kucaćoj mašini; TAB kodiranje"
+
+#~ msgid "A Tamil typewrite-style keymap; TSCII encoding"
+#~ msgstr "Tamil raspored nalik kucaćoj mašini; TSCII kodiranje"
+
+#~ msgid "A Tamil typewrite-style keymap; Unicode encoding"
+#~ msgstr "Tamil raspored nalik kucaćoj mašini; Unikod kodiranje"
+
+#~ msgid "Arb"
+#~ msgstr "arp"
+
+#~ msgid "Ben"
+#~ msgstr "bng"
+
+#~ msgid "Bosnian"
+#~ msgstr "bošnja�ki"
+
+#~ msgid "Burmese"
+#~ msgstr "burmiski"
+
+#~ msgid "CloGaelach Laptop"
+#~ msgstr "CloGaelach za prenosne ra�unare"
+
+#~ msgid "Czech (qwerty)"
+#~ msgstr "Češki (qwerty)"
+
+#~ msgid "Danish"
+#~ msgstr "danski"
+
+#~ msgid "Dutch"
+#~ msgstr "holandski"
+
+#~ msgid "Dvo"
+#~ msgstr "dvo"
+
+#~ msgid "Finnish"
+#~ msgstr "finski"
+
+#~ msgid "French Canadian"
+#~ msgstr "francuski kanadski"
+
+#~ msgid "Georgian (latin)"
+#~ msgstr "gruzijski (latinica)"
+
+#~ msgid "Georgian (russian)"
+#~ msgstr "gruzijski (ruski)"
+
+#~ msgid "Grc"
+#~ msgstr "grk"
+
+#~ msgid "Hin"
+#~ msgstr "ind"
+
+#~ msgid "Hindi"
+#~ msgstr "indijski"
+
+#~ msgid "Hungarian (qwerty)"
+#~ msgstr "Mađarski (qwerty)"
+
+#~ msgid "INSCRIPT layout"
+#~ msgstr "INSCRIPT raspored"
+
+#~ msgid "IS434 laptop"
+#~ msgstr "IS434 prenosni"
+
+#~ msgid "Iku"
+#~ msgstr "iku"
+
+#~ msgid "Irish"
+#~ msgstr "irski"
+
+#~ msgid "Italian"
+#~ msgstr "italijanski"
+
+#~ msgid "Lithuanian azerty standard"
+#~ msgstr "litvanski azerty raspored"
+
+#~ msgid "Lithuanian qwerty \"numeric\""
+#~ msgstr "litvanski qwerty „brojevni“"
+
+#~ msgid "Maltese (US layout)"
+#~ msgstr "maltski (ameri�ki raspored)"
+
+#~ msgid "Northern Saami (Finland)"
+#~ msgstr "severnosaamski (Finska)"
+
+#~ msgid "Northern Saami (Sweden)"
+#~ msgstr "severnosaamski (Å vedska)"
+
+#~ msgid "Ogh"
+#~ msgstr "ogm"
+
+#~ msgid "Ori"
+#~ msgstr "ori"
+
+#~ msgid "PC104"
+#~ msgstr "PC104"
+
+#~ msgid "Polish"
+#~ msgstr "poljski"
+
+#~ msgid "Polish (qwertz)"
+#~ msgstr "poljski (qwertz)"
+
+#~ msgid "Sapmi"
+#~ msgstr "Sapmi"
+
+#~ msgid "Scg"
+#~ msgstr "srp"
+
+#~ msgid "Slovak (qwerty)"
+#~ msgstr "slova�ki (qwerty)"
+
+#~ msgid "Sme"
+#~ msgstr "sme"
+
+#~ msgid "Sv"
+#~ msgstr "sv"
+
+#~ msgid "Swedish"
+#~ msgstr "Å¡vedski"
+
+#~ msgid "Swiss French"
+#~ msgstr "Å¡vajcarski francuski"
+
+#~ msgid "Tel"
+#~ msgstr "tel"
+
+#~ msgid "Thai (Kedmanee)"
+#~ msgstr "tajlandski (Kedmani)"
+
+#~ msgid "Tml"
+#~ msgstr "tml"
+
+#~ msgid "Turkish Alt-Q Layout"
+#~ msgstr "turski Alt-Q raspored"
+
+#~ msgid "U.S. English w/ ISO9995-3"
+#~ msgstr "ameri�ki engleski sa ISO9995-3"
+
+#~ msgid "U.S. English w/ dead keys"
+#~ msgstr "ameri�ki engleski sa akcentima"
+
+#~ msgid "US"
+#~ msgstr "SAD"
+
+#~ msgid "Yug"
+#~ msgstr "scg"
+
+#~ msgid "Yugoslavian"
+#~ msgstr "latini�ni srpski"
+
+#~ msgid "abnt2"
+#~ msgstr "abnt2"
+
+#~ msgid "bksl"
+#~ msgstr "bksl"
+
+#~ msgid "sefi"
+#~ msgstr "sefi"
+
+#~ msgid "uni/101/qwerty/comma"
+#~ msgstr "uni/101/qwerty/zapeta"
+
+#~ msgid "uni/101/qwerty/dot"
+#~ msgstr "uni/101/qwerty/ta�ka"
+
+#~ msgid "uni/101/qwertz/comma"
+#~ msgstr "uni/101/qwertz/zapeta"
+
+#~ msgid "uni/101/qwertz/dot"
+#~ msgstr "uni/101/qwertz/ta�ka"
+
+#~ msgid "uni/102/qwerty/comma"
+#~ msgstr "uni/102/qwerty/zapeta"
+
+#~ msgid "uni/102/qwerty/dot"
+#~ msgstr "uni/102/qwerty/ta�ka"
+
+#~ msgid "uni/102/qwertz/comma"
+#~ msgstr "uni/102/qwertz/zapeta"
+
+#~ msgid "uni/102/qwertz/dot"
+#~ msgstr "uni/102/qwertz/ta�ka"
diff --git a/xorg-server/xkbdata.src/po/sv.po b/xorg-server/xkbdata.src/po/sv.po
new file mode 100644
index 000000000..9847c17c9
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/sv.po
@@ -0,0 +1,3516 @@
+# Swedish messages for xkeyboard-config.
+# Copyright (C) 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+# Christian Rose <menthos@menthos.com>, 2004.
+# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.4-pre1\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2008-09-15 23:52+0100\n"
+"PO-Revision-Date: 2008-09-17 23:49+0100\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../rules/base.xml.in.h:1 ../rules/evdev.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2 ../rules/evdev.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(Äldre) Alternativ"
+
+#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Äldre) Alternativ, Sun stumma tangenter"
+
+#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Äldre) Alternativ, eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
+msgid "101/104 key Compatible"
+msgstr "101/104-tangenters kompatibel"
+
+#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/komma/Stumma tangenter"
+
+#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/komma/Eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/punkt/Stumma tangenter"
+
+#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/punkt/Eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/komma/Stumma tangenter"
+
+#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/komma/Eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/punkt/Stumma tangenter"
+
+#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/punkt/Eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/komma/Stumma tangenter"
+
+#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/komma/Eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/punkt/Stumma tangenter"
+
+#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/punkt/Eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/komma/Stumma tangenter"
+
+#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/komma/Eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/punkt/Stumma tangenter"
+
+#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/punkt/Eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:23 ../rules/evdev.xml.in.h:23
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
+msgid "ACPI Standard"
+msgstr "ACPI-standard"
+
+#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
+msgid "ATM/phone-style hexadecimal keypad"
+msgstr "ATM/telefonliknande hexadecimalt numeriskt tangentbord"
+
+#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
+msgid "Acer Laptop"
+msgstr "Bärbar Acer-dator"
+
+#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
+msgid "Add the EuroSign to the 2 key."
+msgstr "Lägg till eurotecknet till tangenten 2."
+
+#: ../rules/base.xml.in.h:32 ../rules/evdev.xml.in.h:32
+msgid "Add the EuroSign to the 4 key."
+msgstr "Lägg till eurotecknet till tangenten 4."
+
+#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "Lägg till eurotecknet till tangenten 5."
+
+#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "Lägg till eurotecknet till tangenten E."
+
+#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "Lägg till standardbeteendet till Meny-tangenten."
+
+#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Lägger till eurotecknet till vissa tangenter"
+
+#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38 ../rules/evdev.xml.in.h:38
+msgid "Afg"
+msgstr "Afg"
+
+#: ../rules/base.xml.in.h:39 ../rules/evdev.xml.in.h:39
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+#: ../rules/base.xml.in.h:40 ../rules/evdev.xml.in.h:40
+msgid "Akan"
+msgstr "Akan"
+
+#: ../rules/base.xml.in.h:41 ../rules/evdev.xml.in.h:41
+msgid "Alb"
+msgstr "Alb"
+
+#: ../rules/base.xml.in.h:42 ../rules/evdev.xml.in.h:42
+msgid "Albania"
+msgstr "Albanien"
+
+#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt och Meta finns på Alt-tangenterna."
+
+#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt är mappad till högra Win-tangenten och Super till Meny."
+
+#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Alt+CapsLock byter layout."
+
+#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+Ctrl byter layout."
+
+#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Alt+Shift byter layout."
+
+#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win-tangentbeteende"
+
+#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
+msgid "Alternative"
+msgstr "Alternativ"
+
+#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "Alternativ östlig"
+
+#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "Alternativ fonetisk"
+
+#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "Alternativ internationell (tidigare us_intl)"
+
+#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "Alternativ, Sun stumma tangenter"
+
+#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "Alternativ, eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "Alternativ, endast latin-9"
+
+#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "Apostrof (') variant"
+
+#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Bärbar Apple-dator"
+
+#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
+msgid "Arabic"
+msgstr "Arabisk"
+
+#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
+msgid "Armenia"
+msgstr "Armenien"
+
+#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "Asturisk variant med nederpunkts H och nederpunkts L"
+
+#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
+msgid "Asus Laptop"
+msgstr "Bärbar Asus-dator"
+
+#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
+msgid "Azerbaijan"
+msgstr "Azerbajdzjan"
+
+#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet Keyboard"
+
+#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
+
+#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
+msgid "Baltic+"
+msgstr "Baltisk+"
+
+#: ../rules/base.xml.in.h:80 ../rules/evdev.xml.in.h:80
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
+msgid "Belarus"
+msgstr "Vitryssland"
+
+#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
+msgid "Belgium"
+msgstr "Belgien"
+
+#: ../rules/base.xml.in.h:85 ../rules/evdev.xml.in.h:85
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
+msgid "Bengali"
+msgstr "Bengalisk"
+
+#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
+msgid "Bengali Probhat"
+msgstr "Bengali Probhat"
+
+#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonomisk, Dvorak"
+
+#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonomisk, Dvorak, endast latin-9"
+
+#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Biblisk hebreisk (Tiro)"
+
+#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnien och Herzegovina"
+
+#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
+msgid "Both Alt keys together change layout."
+msgstr "BÃ¥da Alt-tangenterna tillsammans byter layout."
+
+#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
+msgid "Both Ctrl keys together change layout."
+msgstr "BÃ¥da Ctrl-tangenterna tillsammans byter layout."
+
+#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
+msgid "Both Shift keys together change layout."
+msgstr "BÃ¥da Skift-tangenterna tillsammans byter layout."
+
+#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
+msgid "Both Win-keys switch layout while pressed."
+msgstr "Båda Win-tangenterna byter layout då de trycks ned."
+
+#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
+msgid "Braille"
+msgstr "Braille"
+
+#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+msgid "Brazil"
+msgstr "Brasilien"
+
+#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
+msgid "Brazilian ABNT2"
+msgstr "Brasiliansk ABNT2"
+
+#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internettangentbord"
+
+#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
+msgid "Bulgaria"
+msgstr "Bulgarien"
+
+#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
+msgid "Cambodia"
+msgstr "Cambodia"
+
+#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
+msgid "Caps Lock is Compose."
+msgstr "Caps Lock är Compose."
+
+#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
+msgid "CapsLock LED shows alternative layout."
+msgstr "CapsLock-lampan visar alternativ layout."
+
+#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "CapsLock fungerar som Skift med låsning. Skift \"pausar\" Caps Lock."
+
+#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "CapsLock fungerar som Skift med låsning. Skift påverkar inte Caps Lock."
+
+#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
+msgid "CapsLock just locks the Shift modifier."
+msgstr "CapsLock låser bara Skift-modifieraren."
+
+#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
+msgid "CapsLock key behavior"
+msgstr "Beteende för Caps Lock-tangenten"
+
+#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
+msgid "CapsLock key changes layout."
+msgstr "CapsLock-tangenten byter layout."
+
+#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
+msgid "CapsLock switch to first layout, Shift+CapsLock switch to last layout."
+msgstr "CapsLock växlar till första layouten, Skift+CapsLock växlar till sista layouten."
+
+#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "CapsLock växlar Skift så alla tangenter påverkas."
+
+#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "CapsLock växla normalt skiftläge på alfabetiska tecken."
+
+#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "CapsLock använder intern skiftlägesstyrning. Skift \"pausar\" CapsLock."
+
+#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "CapsLock använder intern skiftlägesstyrning. Skift påverkar inte CapsLock."
+
+#: ../rules/base.xml.in.h:126 ../rules/evdev.xml.in.h:126
+msgid "Catalan variant with middle-dot L"
+msgstr "Katalansk variant med mittenpunkts L"
+
+#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
+msgid "Cedilla"
+msgstr "Cedilj"
+
+#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+msgid "Cherokee"
+msgstr "Cherokee"
+
+#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternativ)"
+
+#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-hubb"
+
+#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internettangentbord"
+
+#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
+msgid "China"
+msgstr "Kina"
+
+#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+msgid "Chuvash"
+msgstr "Tjuvasjiska"
+
+#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
+msgid "Chuvash Latin"
+msgstr "Tjuvasjiska latin"
+
+#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
+msgid "Classic"
+msgstr "Klassisk"
+
+#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
+msgid "Classic Dvorak"
+msgstr "Klassisk Dvorak"
+
+#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access-tangentbord"
+
+#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internettangentbord (13 tangenter)"
+
+#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internettangentbord (18 tangenter)"
+
+#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internettangentbord (7 tangenter)"
+
+#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq-tangentbord"
+
+#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
+msgid "Compose key position"
+msgstr "Position för Compose-tangenten"
+
+#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
+msgid "Congo, Democratic Republic of the"
+msgstr "Kongo, Demokratiska republiken"
+
+#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "Control är mappat till Win-tangenterna (och de vanliga Ctrl-tangenterna)."
+
+#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
+msgid "Croatia"
+msgstr "Kroatien"
+
+#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
+msgid "Ctrl key at bottom left"
+msgstr "Ctrl-tangenten nere till vänster"
+
+#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
+msgid "Ctrl key at left of 'A'"
+msgstr "Ctrl-tangenten till vänster om \"A\""
+
+#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
+msgid "Ctrl key position"
+msgstr "Position för Ctrl-tangenten"
+
+#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
+msgid "Ctrl+Shift change layout."
+msgstr "Ctrl+Skift byter layout."
+
+#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
+msgid "Cyrillic"
+msgstr "Kyrillisk"
+
+#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
+msgid "Cyrillic with guillemets"
+msgstr "Kyrillisk med gåsögon"
+
+#: ../rules/base.xml.in.h:161 ../rules/evdev.xml.in.h:161
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Kyrillisk, Z och ZHE utbytta"
+
+#: ../rules/base.xml.in.h:162 ../rules/evdev.xml.in.h:162
+msgid "Cze"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
+msgid "Czechia"
+msgstr "Tjeckien"
+
+#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
+msgid "Dan"
+msgstr "Dan"
+
+#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
+msgid "Dead acute"
+msgstr "Stum akut accent"
+
+#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
+msgid "Dead grave acute"
+msgstr "Stum grav och akut accent"
+
+#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
+msgid "Default numeric keypad keys."
+msgstr "Standardtangenter för numeriskt tangentbord."
+
+#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
+msgid "Dell 101-key PC"
+msgstr "Dell 101-tangenters PC"
+
+#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Bärbar Dell Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Bärbar Dell Precision M series"
+
+#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
+msgid "Dell Latitude series laptop"
+msgstr "Bärbar Dell Latitude-serien"
+
+#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB-multimediatangentbord"
+
+#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
+msgid "Denmark"
+msgstr "Danmark"
+
+#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
+msgid "Deu"
+msgstr "Deu"
+
+#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa trådlöst skrivbordstangentbord"
+
+#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801/9802-serien"
+
+#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+msgid "Dvorak (UK Punctuation)"
+msgstr "Dvorak (brittisk-engelska skiljetecken)"
+
+#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+msgid "Dvorak international"
+msgstr "Dvorak internationell"
+
+#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak, polska citattecken på tangent \"1/!\""
+
+#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, polska citattecken på citattangent"
+
+#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
+msgid "Eastern"
+msgstr "Östlig"
+
+#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
+msgid "Eliminate dead keys"
+msgstr "Eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
+msgid "Ergonomic"
+msgstr "Ergonomisk"
+
+#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
+msgid "Estonia"
+msgstr "Estland"
+
+#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
+msgid "Eth"
+msgstr "Eth"
+
+#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+msgid "Ethiopia"
+msgstr "Etiopien"
+
+#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
+msgid "Evdev-managed keyboard"
+msgstr "Evdev-hanterat tangentbord"
+
+#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
+msgid "Extended"
+msgstr "Utökad"
+
+#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
+msgid "Extended Backslash"
+msgstr "Utökat omvänt snedstreck"
+
+#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
+msgid "F-letter (F) variant"
+msgstr "F-bokstavs (F) variant"
+
+#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
+msgid "Faroe Islands"
+msgstr "Färöarna"
+
+#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
+msgid "Finland"
+msgstr "Finland"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
+msgid "Four-level key with abstract separators"
+msgstr "Fjärdenivåstangent med abstrakta avgränsare"
+
+#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
+msgid "Four-level key with comma"
+msgstr "Fjärdenivåstangent med komma"
+
+#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
+msgid "Four-level key with dot"
+msgstr "Fjärdenivåstangent med punkt"
+
+#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+msgid "Four-level key with momayyez"
+msgstr "Fjärdenivåstangent med momayyez"
+
+#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
+msgid "France"
+msgstr "Frankrike"
+
+#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
+msgid "French"
+msgstr "Fransk"
+
+#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
+msgid "French (Macintosh)"
+msgstr "Fransk (Macintosh)"
+
+#: ../rules/base.xml.in.h:219 ../rules/evdev.xml.in.h:219
+msgid "French (legacy)"
+msgstr "Fransk (äldre)"
+
+#: ../rules/base.xml.in.h:220 ../rules/evdev.xml.in.h:220
+msgid "French Dvorak"
+msgstr "Fransk Dvorak"
+
+#: ../rules/base.xml.in.h:221 ../rules/evdev.xml.in.h:221
+msgid "French, Sun dead keys"
+msgstr "Fransk, Sun stumma tangenter"
+
+#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
+msgid "French, eliminate dead keys"
+msgstr "Fransk, eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
+msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
+msgstr "Fujitsu-Siemens Computers AMILO A1667G"
+
+#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
+msgid "Fula"
+msgstr "Fula"
+
+#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
+msgid "Generic 101-key PC"
+msgstr "Allmän 101-tangenters PC"
+
+#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
+msgid "Generic 102-key (Intl) PC"
+msgstr "Allmän 102-tangenters (internationell) PC"
+
+#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
+msgid "Generic 104-key PC"
+msgstr "Allmän 104-tangenters PC"
+
+#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
+msgid "Generic 105-key (Intl) PC"
+msgstr "Allmän 105-tangenters (internationell) PC"
+
+#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM-tangentbord KWD-910"
+
+#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
+msgid "Georgia"
+msgstr "Georgien"
+
+#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
+msgid "Georgian"
+msgstr "Georgisk"
+
+#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
+msgid "Georgian AZERTY Tskapo"
+msgstr "Georgian AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
+msgid "German (Macintosh)"
+msgstr "Tysk (Macintosh)"
+
+#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
+msgid "German, Sun dead keys"
+msgstr "Tysk, Sun stumma tangenter"
+
+#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
+msgid "German, eliminate dead keys"
+msgstr "Tysk, eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
+msgid "Germany"
+msgstr "Tyskland"
+
+#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
+msgid "Greece"
+msgstr "Grekland"
+
+#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
+msgid "Group toggle on multiply/divide key"
+msgstr "Gruppväxling på multiplicera/dividera-tangent"
+
+#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
+msgid "Gui"
+msgstr "Gui"
+
+#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
+msgid "Guinea"
+msgstr "Guinea"
+
+#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
+msgid "Gujarati"
+msgstr "Gujaratisk"
+
+#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
+msgid "Gurmukhi"
+msgstr "Gurmukhisk"
+
+#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
+msgid "Gurmukhi Jhelum"
+msgstr "Gurmukhi Jhelum"
+
+#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking-tangentbord"
+
+#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking-tangentbord för Mac"
+
+#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
+msgid "Hausa"
+msgstr "Hausa"
+
+#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internettangentbord"
+
+#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
+msgid "Hewlett-Packard Internet Keyboard 5181"
+msgstr "Hewlett-Packard Internet Keyboard 5181"
+
+#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
+msgid "Hewlett-Packard Internet Keyboard 5185"
+msgstr "Hewlett-Packard Internet Keyboard 5185"
+
+#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 multimediatangentbord"
+
+#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internettangentbord"
+
+#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
+msgid "Hindi Bolnagri"
+msgstr "Hindi bolnagri"
+
+#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
+msgid "Homophonic"
+msgstr "Homofonisk"
+
+#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
+msgid "Hun"
+msgstr "Hun"
+
+#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
+msgid "Hungary"
+msgstr "Ungern"
+
+#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper är mappat till Win-tangenterna."
+
+#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (alternativ)"
+
+#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
+
+#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+msgid "ISO Alternate"
+msgstr "ISO-alternativ"
+
+#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
+msgid "Iceland"
+msgstr "Island"
+
+#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+msgid "India"
+msgstr "Indien"
+
+#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
+msgid "International (AltGr dead keys)"
+msgstr "Internationell (AltGr med stumma tangenter)"
+
+#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
+msgid "International (with dead keys)"
+msgstr "Internationell (med stumma tangenter)"
+
+#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+msgid "Iran"
+msgstr "Iran"
+
+#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
+msgid "Ireland"
+msgstr "Irland"
+
+#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
+msgid "Irq"
+msgstr "Irk"
+
+#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
+msgid "Israel"
+msgstr "Israel"
+
+#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
+msgid "Italy"
+msgstr "Italien"
+
+#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
+msgid "Japan"
+msgstr "Japan"
+
+#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
+msgid "Japan (PC-98xx Series)"
+msgstr "Japan (PC-98xx-serien)"
+
+#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
+msgid "Japanese 106-key"
+msgstr "Japansk 106-tangenters"
+
+#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
+msgid "Japanese keyboard options"
+msgstr "Tangentbordsalternativ för japanska"
+
+#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
+msgid "Jpn"
+msgstr "Jpn"
+
+# Även kanaresisk (äldre form)
+#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
+msgid "Kana Lock key is locking"
+msgstr "Kana Lock-tangent låser"
+
+# Även kanaresisk (äldre form)
+#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
+msgid "Kashubian"
+msgstr "Kashubian"
+
+#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
+msgid "Kazakh with Russian"
+msgstr "Kazakisk med ryska"
+
+#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
+msgid "Kazakhstan"
+msgstr "Kazakstan"
+
+#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
+msgid "Keypad"
+msgstr "Knappsats"
+
+#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
+msgid "Keypad with unicode additions (arrows and math operators)"
+msgstr "Numeriskt tangentbord med unicode-tillägg (pilar och matematikoperatorer)"
+
+#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
+msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Numeriskt tangentbord med unicode-tillägg (pilar och matematikoperatorer). Matematikoperatorer på standardnivå."
+
+#: ../rules/base.xml.in.h:320 ../rules/evdev.xml.in.h:320
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
+msgid "Khm"
+msgstr "Khm"
+
+#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
+msgid "Kir"
+msgstr "Kir"
+
+#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
+msgid "Komi"
+msgstr "Komi"
+
+#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
+msgid "Korea, Republic of"
+msgstr "Korea, Republiken"
+
+#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
+msgid "Korean 106-key"
+msgstr "Koreansk 106-tangenters"
+
+#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
+msgid "Ktunaxa"
+msgstr "Ktunaxa"
+
+#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+msgid "Kurdish, (F)"
+msgstr "Kurdisk, (F)"
+
+#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+msgid "Kurdish, Arabic-Latin"
+msgstr "Kurdisk, Arabisk-Latin"
+
+#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Kurdisk, Latin Alt-Q"
+
+#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
+msgid "Kurdish, Latin Q"
+msgstr "Kurdisk, Latin Q"
+
+#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
+msgid "Kyrgyzstan"
+msgstr "Kirgizistan"
+
+#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
+msgid "LCtrl+LShift change layout."
+msgstr "Vänster Ctrl + vänster Skift byter layout."
+
+#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
+msgid "LEKP"
+msgstr "LEKP"
+
+#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
+msgid "LEKPa"
+msgstr "LEKPa"
+
+#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop-tangentbord för bärbar Compaq-dator (t.ex. Armada)"
+
+#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Internettangentbord för bärbar Compaq-dator (t.ex. Presario)"
+
+#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Bärbar eMachines m68xx"
+
+#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
+msgid "Latin"
+msgstr "Latin"
+
+#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
+msgid "Latin American"
+msgstr "Latin Amerikansk"
+
+#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
+msgid "Latin Unicode"
+msgstr "Latin Unicode"
+
+#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
+msgid "Latin Unicode qwerty"
+msgstr "Latin Unicode qwerty"
+
+#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
+msgid "Latin qwerty"
+msgstr "Latin qwerty"
+
+#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
+msgid "Latin unicode"
+msgstr "Latin unicode"
+
+#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
+msgid "Latin unicode qwerty"
+msgstr "Latin unicode qwerty"
+
+#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
+msgid "Latin with guillemets"
+msgstr "Latin med gåsögon"
+
+#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
+msgid "Latvia"
+msgstr "Lettland"
+
+#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
+msgid "Lav"
+msgstr "Lav"
+
+#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
+msgid "Layout switching"
+msgstr "Layoutväxling"
+
+#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
+msgid "Left Alt is swapped with left Win-key."
+msgstr "Vänster Alt är mappat till vänster Win-tangent."
+
+#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
+msgid "Left Alt key changes layout."
+msgstr "Vänster Alt-tangent byter layout."
+
+#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
+msgid "Left Alt key switches layout while pressed."
+msgstr "Vänster Alt-tangent byter layout då den trycks ned."
+
+#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
+msgid "Left Ctrl key changes layout."
+msgstr "Vänster Ctrl-tangent byter layout."
+
+#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
+msgid "Left Shift key changes layout."
+msgstr "Vänster Skift-tangent byter layout."
+
+#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
+msgid "Left Win-key changes layout."
+msgstr "Vänster Win-tangent byter layout."
+
+#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
+msgid "Left Win-key is Compose."
+msgstr "Vänster Win-tangent är Compose."
+
+#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
+msgid "Left Win-key switches layout while pressed."
+msgstr "Vänster Win-tangent byter layout då den trycks ned."
+
+#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
+msgid "Left hand"
+msgstr "Vänsterhänt"
+
+#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
+msgid "Left handed Dvorak"
+msgstr "Vänsterhänt Dvorak"
+
+#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+msgid "Legacy"
+msgstr "Äldre"
+
+#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
+msgid "Legacy Wang 724 keypad"
+msgstr "Äldre Wang 724 numeriskt tangentbord"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+msgid "Legacy key with comma"
+msgstr "Äldre tangent med komma"
+
+#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+msgid "Legacy key with dot"
+msgstr "Äldre tangent med punkt"
+
+#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
+msgid "Legacy keypad"
+msgstr "Äldre numeriskt tangentbord"
+
+#: ../rules/base.xml.in.h:369 ../rules/evdev.xml.in.h:369
+msgid "Less-than/Greater-than is Compose."
+msgstr "Mindre än/Större än är Compose."
+
+#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+msgid "Lithuania"
+msgstr "Litauen"
+
+#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (alternativ)"
+
+#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:375 ../rules/evdev.xml.in.h:375
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (alternativ2)"
+
+#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 extratangenter via G15daemon"
+
+#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech Generic Keyboard"
+
+#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Keyboard"
+
+#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internettangentbord"
+
+#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator-tangentbord"
+
+#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite Keyboard"
+
+#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Keyboard"
+
+#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (modell Y-RB6)"
+
+#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
+msgid "MNE"
+msgstr "MNE"
+
+#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
+
+#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
+msgid "Macedonia"
+msgstr "Makedonien"
+
+#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
+msgid "Macintosh Old"
+msgstr "Macintosh gammal"
+
+#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, Sun stumma tangenter"
+
+#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Gör CapsLock till ytterligare en Ctrl-tangent."
+
+#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
+msgid "Malayalam Lalitha"
+msgstr "Malayalam Lalitha"
+
+#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
+msgid "Maldives"
+msgstr "Maldiverna"
+
+#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
+msgid "Maltese keyboard with US layout"
+msgstr "Maltesiskt tangentbord med USA-layout"
+
+#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
+msgid "Maori"
+msgstr "Maori"
+
+#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access-tangentbord"
+
+#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
+msgid "Menu is Compose."
+msgstr "Meny är Compose."
+
+#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
+msgid "Menu key changes layout."
+msgstr "Meny-tangenten byter layout."
+
+#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta är mappat till Win-tangenterna."
+
+#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta är mappat till vänster Win-tangent."
+
+#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, svensk"
+
+#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
+
+#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:428 ../rules/evdev.xml.in.h:428
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office-tangentbord"
+
+#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+msgid "Miscellaneous compatibility options"
+msgstr "Diverse kompatibilitetsalternativ"
+
+#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
+msgid "Mongolia"
+msgstr "Mongoliet"
+
+#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
+msgid "Montenegro"
+msgstr "Montenegro"
+
+#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
+msgid "Morocco"
+msgstr "Marocko"
+
+#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
+msgid "Multilingual"
+msgstr "Flerspråkig"
+
+#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
+msgid "Multilingual, first part"
+msgstr "Flerspråkig, första delen"
+
+#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
+msgid "Multilingual, second part"
+msgstr "Flerspråkig, andra delen"
+
+#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
+msgid "NICOLA-F style Backspace"
+msgstr "Backsteg i NICOLA-F-stil"
+
+#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
+msgid "Neostyle"
+msgstr "Neostyle"
+
+#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
+msgid "Netherlands"
+msgstr "Nederländerna"
+
+#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
+msgid "Nig"
+msgstr "Nig"
+
+#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
+msgid "Northern Saami"
+msgstr "Nordsamisk"
+
+#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Nordsamisk, eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
+msgid "Norway"
+msgstr "Norge"
+
+#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
+msgid "NumLock LED shows alternative layout."
+msgstr "NumLock-lampan visar alternativ layout."
+
+# KONTROLLERA DENNA
+#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
+msgid "Numeric keypad delete key behaviour"
+msgstr "Beteende för Delete-tangent på numeriskt tangentbord"
+
+#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
+msgid "Numeric keypad keys work as with Mac."
+msgstr "Tangenter på det numeriska tangentbordet fungerar som på Mac."
+
+#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
+msgid "Numeric keypad layout selection"
+msgstr "Layoutval för numeriskt tangentbord"
+
+#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
+msgid "OLPC"
+msgstr "OLPC"
+
+#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
+msgid "OLPC Dari"
+msgstr "OLPC Dari"
+
+#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
+msgid "OLPC Pashto"
+msgstr "OLPC Pashto"
+
+#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
+msgid "OLPC Southern Uzbek"
+msgstr "OLPC Södra Uzbekistan"
+
+#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet-tangentbord"
+
+#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+msgid "Ossetian"
+msgstr "Ossetisk"
+
+#: ../rules/base.xml.in.h:469 ../rules/evdev.xml.in.h:469
+msgid "Ossetian, Winkeys"
+msgstr "Ossetisk, Win-tangenter"
+
+#: ../rules/base.xml.in.h:470 ../rules/evdev.xml.in.h:470
+msgid "Ossetian, legacy"
+msgstr "Ossetisk, äldre"
+
+#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+msgid "PC-98xx Series"
+msgstr "PC-98xx-serien"
+
+#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:473 ../rules/evdev.xml.in.h:473
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:474 ../rules/evdev.xml.in.h:474
+msgid "Pashto"
+msgstr "Pashto"
+
+#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
+msgid "Phonetic"
+msgstr "Fonetisk"
+
+#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
+msgid "Poland"
+msgstr "Polen"
+
+#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
+msgid "Polytonic"
+msgstr "Polytonic"
+
+#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+msgid "Portugal"
+msgstr "Portugal"
+
+#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Tryck vänster Alt-tangent för att välja tredjenivå."
+
+#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Tryck vänster Win-tangent för att välja tredjenivå."
+
+#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
+msgid "Press Menu key to choose 3rd level."
+msgstr "Tryck Meny-tangenten för att välja tredjenivå."
+
+#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "Tryck höger Alt-tangent för att välja tredjenivå. Skft+höger Alt-tangent är Multi_Key."
+
+#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Tryck höger Alt-tangent för att välja tredjenivå."
+
+#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Tryck höger Ctrl-tangent för att välja tredjenivå."
+
+#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Tryck höger Win-tangent för att välja tredjenivå."
+
+#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Tryck valfri Alt-tangent för att välja tredjenivå."
+
+#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Tryck valfri Win-tangent för att välja tredjenivå."
+
+#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
+msgid "Pro Keypad"
+msgstr "Pro Keypad"
+
+#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
+msgid "Programmer Dvorak"
+msgstr "Dvorak för programmerare"
+
+#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
+msgid "R-Alt switches layout while pressed."
+msgstr "Höger Alt-tangent byter layout då den trycks ned."
+
+#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
+msgid "Right Alt is Compose."
+msgstr "Höger Alt är Compose."
+
+#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
+msgid "Right Alt key changes layout."
+msgstr "Höger Alt-tangent byter layout."
+
+#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
+msgid "Right Alt key never chooses 3rd level."
+msgstr "Höger Alt-tangent väljer aldrig tredje nivån."
+
+#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
+msgid "Right Ctrl is Compose."
+msgstr "Höger Ctrl är Compose."
+
+#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
+msgid "Right Ctrl key changes layout."
+msgstr "Höger Ctrl-tangent byter layout."
+
+#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "Höger Ctrl-tangent byter layout då den trycks ned."
+
+#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Höger Ctrl-tangent fungerar som höger Alt."
+
+#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
+msgid "Right Shift key changes layout."
+msgstr "Höger Skift-tangent byter layout."
+
+#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
+msgid "Right Win-key changes layout."
+msgstr "Höger Win-tangent byter layout."
+
+#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
+msgid "Right Win-key is Compose."
+msgstr "Höger Win-tangent är Compose."
+
+#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
+msgid "Right Win-key switches layout while pressed."
+msgstr "Höger Win-tangent byter layout då den trycks ned."
+
+#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+msgid "Right hand"
+msgstr "Högerhänt"
+
+#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
+msgid "Right handed Dvorak"
+msgstr "Högerhänt Dvorak"
+
+#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
+msgid "Romania"
+msgstr "Rumänien"
+
+#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
+msgid "Romanian keyboard with German letters"
+msgstr "Rumänskt tangentbord med tyska bokstäver"
+
+#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Rumänskt tangentbord med tyska bokstäver, eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+msgid "Russia"
+msgstr "Ryssland"
+
+#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+msgid "Russian"
+msgstr "Rysk"
+
+#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+msgid "Russian phonetic"
+msgstr "Rysk fonetiskt"
+
+#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+msgid "Russian phonetic Dvorak"
+msgstr "Rysk fonetisk dvorak"
+
+#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Rysk fonetiskt, eliminera stumma tangenter"
+
+#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+msgid "Russian with Kazakh"
+msgstr "Ryska med kazakiska"
+
+#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
+msgid "ScrollLock LED shows alternative layout."
+msgstr "ScrollLock-lampan visar alternativ layout."
+
+#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
+msgid "Serbia"
+msgstr "Serbien"
+
+#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
+msgid "Shift cancels CapsLock."
+msgstr "Skift avbryter CapsLock."
+
+#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "Skift med tangenterna på numeriska tangentbordet fungerar som i MS Windows."
+
+#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
+msgid "Shift+CapsLock changes layout."
+msgstr "Skift+CapsLock-tangenten byter layout."
+
+#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
+msgid "Simple"
+msgstr "Enkel"
+
+#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
+msgid "Slovakia"
+msgstr "Slovakien"
+
+#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
+msgid "Slovenia"
+msgstr "Slovenien"
+
+#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
+msgid "South Africa"
+msgstr "Sydafrika"
+
+#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
+msgid "Southern Uzbek"
+msgstr "Södra Uzbekistan"
+
+#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på fjärde nivån, tunt icke-brytande blankstegstecken på sjätte nivån"
+
+#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift"
+msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på fjärde nivån, tunt icke-brytande blankstegstecken på sjätte nivån (via Ctrl+Skift"
+
+#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på fjärde nivån."
+
+#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
+msgid "Space key outputs non-breakable space character at second level."
+msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på andra nivån."
+
+#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på tredje nivån, ingenting på fjärde nivån."
+
+#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på tredje nivån, tunt icke-brytande blankstegstecken på fjärde nivån"
+
+#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
+msgid "Space key outputs non-breakable space character at third level."
+msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på tredje nivån."
+
+#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
+msgid "Space key outputs usual space at any level."
+msgstr "Blankstegstangenten skriver ut blanksteg på alla nivåer."
+
+#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+msgid "Spain"
+msgstr "Spanien"
+
+#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Specialtangenter (Ctrl+Alt+&lt;tangent&gt;) hanteras i en server."
+
+#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
+msgid "Standard"
+msgstr "Standard"
+
+#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
+msgid "Standard (Cedilla)"
+msgstr "Standard (Cedilj)"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
+msgid "Standard RSTU"
+msgstr "Standard RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:560 ../rules/evdev.xml.in.h:560
+msgid "Standard RSTU on Russian layout"
+msgstr "Standard RSTU på rysk layout"
+
+#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
+msgid "Sun Type 5/6"
+msgstr "Sun Type 5/6"
+
+#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
+msgid "Sun dead keys"
+msgstr "Sun stumma tangenter"
+
+#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
+msgid "Super is mapped to the Win-keys."
+msgstr "Super-tangenten är mappad till Win-tangenterna."
+
+#: ../rules/base.xml.in.h:565 ../rules/evdev.xml.in.h:565
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:567 ../rules/evdev.xml.in.h:567
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
+msgid "Swap Ctrl and CapsLock."
+msgstr "Byt Ctrl och CapsLock."
+
+#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
+msgid "Swap ESC and CapsLock."
+msgstr "Byt ESC och CapsLock."
+
+#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr "Byt tangentkoder för två tangenter när Mac-tangentbord identifieras fel av kärnan."
+
+#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+msgid "Sweden"
+msgstr "Sverige"
+
+#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
+msgid "Switzerland"
+msgstr "Schweiz"
+
+#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+msgid "Syria"
+msgstr "Syrien"
+
+#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+msgid "Syriac"
+msgstr "Syrisk"
+
+#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
+msgid "Syriac phonetic"
+msgstr "Syrisk fonetisk"
+
+#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
+msgid "Tajikistan"
+msgstr "Tajikistan"
+
+#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
+msgid "Tamil"
+msgstr "Tamilsk"
+
+#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
+msgid "Tamil TAB Typewriter"
+msgstr "Tamil TAB Typewriter"
+
+#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamil TSCII Typewriter"
+
+#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
+msgid "Tamil Unicode"
+msgstr "Tamilisk Unicode"
+
+#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
+msgid "Tatar"
+msgstr "Tatar"
+
+#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
+msgid "Telugu"
+msgstr "Telugo"
+
+#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
+msgid "Thailand"
+msgstr "Thailand"
+
+#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
+msgid "Third level choosers"
+msgstr "Tredjenivåsväljare"
+
+#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
+msgid "Tibetan"
+msgstr "Tibetisk"
+
+#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetisk (med ASCII-taltecken)"
+
+#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
+msgid "Tifinagh Alternative"
+msgstr "Tifinagh alternativ"
+
+#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Tifinagh alternativ fonetisk"
+
+#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
+msgid "Tifinagh Extended"
+msgstr "Tifinagh utökad"
+
+#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
+msgid "Tifinagh Extended Phonetic"
+msgstr "Tifinagh utökad fonetisk"
+
+#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
+msgid "Tifinagh Phonetic"
+msgstr "Tifinagh fonetisk"
+
+#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
+msgid "Tilde (~) variant"
+msgstr "Tilde (~) variant"
+
+#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access-tangentbord"
+
+#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
+msgid "Turkey"
+msgstr "Turkiet"
+
+#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
+msgid "Typewriter"
+msgstr "Skrivmaskin"
+
+#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
+msgid "UCW layout (accented letters only)"
+msgstr "UCW-layout (endast bokstäver med accenter)"
+
+#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
+msgid "US keyboard with Bosnian digraphs"
+msgstr "USA-tangentbord med bosniska digrafer"
+
+#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
+msgid "US keyboard with Bosnian letters"
+msgstr "USA-tangentbord med bosniska bokstäver"
+
+#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
+msgid "US keyboard with Croatian digraphs"
+msgstr "USA-tangentbord med kroatiska digrafer"
+
+#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
+msgid "US keyboard with Croatian letters"
+msgstr "USA-tangentbord med kroatiska bokstäver"
+
+#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
+msgid "US keyboard with Estonian letters"
+msgstr "USA-tangentbord med estniska bokstäver"
+
+#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
+msgid "US keyboard with Lithuanian letters"
+msgstr "USA-tangentbord med litauiska bokstäver"
+
+#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
+msgid "US keyboard with Slovenian digraphs"
+msgstr "USA-tangentbord med slovenska digrafer"
+
+#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
+msgid "US keyboard with Slovenian letters"
+msgstr "USA-tangentbord med slovenska bokstäver"
+
+#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
+msgid "Udmurt"
+msgstr "Udmurt"
+
+#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
+msgid "Ukraine"
+msgstr "Ukraina"
+
+#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
+msgid "United Kingdom"
+msgstr "Storbritannien"
+
+#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
+msgid "Use Bosnian digraphs"
+msgstr "Använd bosniska digrafer"
+
+#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
+msgid "Use Croatian digraphs"
+msgstr "Använd kroatiska digrafer"
+
+#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
+msgid "Use Slovenian digraphs"
+msgstr "Använd slovenska digrafer"
+
+#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
+msgid "Use guillemets for quotes"
+msgstr "Använd gåsögon för citattecken"
+
+#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Använd tangentbordslampa för att visa alternativ layout."
+
+#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
+msgid "Using space key to input non-breakable space character"
+msgstr "Använder blankstegstangenten för att mata in icke-brytande blankstegstecken"
+
+#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+#: ../rules/base.xml.in.h:630 ../rules/evdev.xml.in.h:630
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 internettangentbord"
+
+#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Wang 724 numeriskt tangentbord med unicode-tillägg (pilar och matematikoperatorer)"
+
+#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Wang 724 numeriskt tangentbord med unicode-tillägg (pilar och matematikoperatorer). Matematikoperatorer på standardnivå."
+
+#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+msgid "Wang model 724 azerty"
+msgstr "Wang modell 724 azerty"
+
+#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+msgid "Western"
+msgstr "Västlig"
+
+#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
+msgid "Winkeys"
+msgstr "Win-tangenter"
+
+#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
+msgid "With &lt;\\|&gt; key"
+msgstr "Med &lt;\\|&gt;-tangent"
+
+#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
+msgid "With EuroSign on 5"
+msgstr "Med eurotecknet till tangenten 5"
+
+#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+msgid "With guillemets"
+msgstr "Med gåsögon"
+
+#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internettangentbord"
+
+#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+msgid "Yakut"
+msgstr "Jakutiska"
+
+#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
+msgid "Yoruba"
+msgstr "Yoruba"
+
+#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
+msgid "Z and ZHE swapped"
+msgstr "Z och ZHE utbytta"
+
+#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
+msgid "azerty/digits"
+msgstr "azerty/siffror"
+
+#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
+msgid "digits"
+msgstr "siffror"
+
+#: ../rules/base.xml.in.h:650 ../rules/evdev.xml.in.h:650
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "flyttat semikolon och citattecken (föråldrat)"
+
+#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, utökat omvänt snedstreck"
+
+#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
+msgid "qwerty/digits"
+msgstr "qwerty/siffror"
+
+#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
+msgid "qwertz"
+msgstr "qwertz"
+
+#~ msgid "(Legacy) Dvorak"
+#~ msgstr "(Äldre) Dvorak"
+
+#~ msgid "Commabelow"
+#~ msgstr "Commabelow"
+
+#~ msgid "Dnk"
+#~ msgstr "Dnk"
+
+#~ msgid "Kyr"
+#~ msgstr "Kyr"
+
+#~ msgid "Lva"
+#~ msgstr "Lva"
+
+#~ msgid "Standard (Commabelow)"
+#~ msgstr "Standard (Commabelow)"
+
+#~ msgid "\"Typewriter\""
+#~ msgstr "\"Skrivmaskin\""
+
+#~ msgid "Acts as Shift with locking. Shift cancels Caps."
+#~ msgstr "Fungerar som Skift med låsning. Skift \"pausar\" Caps Lock."
+
+#~ msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+#~ msgstr "Fungerar som Skift med låsning. Skift påverkar inte Caps Lock."
+
+#~ msgid "Alt+Control changes group"
+#~ msgstr "Alt+Control byter grupp"
+
+#~ msgid "Alt+Shift changes group"
+#~ msgstr "Alt+Shift byter grupp"
+
+#~ msgid "Belgian"
+#~ msgstr "Belgisk"
+
+#~ msgid "Both Alt keys together change group"
+#~ msgstr "BÃ¥da Alt-tangenterna tillsammans byter grupp"
+
+#~ msgid "Both Ctrl keys together change group"
+#~ msgstr "BÃ¥da Ctrl-tangenterna tillsammans byter grupp"
+
+#~ msgid "Both Shift keys together change group"
+#~ msgstr "BÃ¥da Skift-tangenterna tillsammans byter grupp"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgarisk"
+
+#~ msgid "Canadian"
+#~ msgstr "Kanadensisk"
+
+#~ msgid "Caps Lock is Compose"
+#~ msgstr "Caps Lock är Compose"
+
+#~ msgid "Caps Lock key changes group"
+#~ msgstr "Caps Lock-tangenten byter grupp"
+
+#~ msgid "Caps_Lock LED shows alternative group"
+#~ msgstr "CapsLock-lampan visar alternativ grupp"
+
+#~ msgid "Control Key Position"
+#~ msgstr "Position för Control-tangent"
+
+#~ msgid "Control key at bottom left"
+#~ msgstr "Control-tangenten nere till vänster"
+
+#~ msgid "Control key at left of 'A'"
+#~ msgstr "Control-tangenten till vänster om \"A\""
+
+#~ msgid "Control+Shift changes group"
+#~ msgstr "Control+Skift byter grupp"
+
+#~ msgid "Czech"
+#~ msgstr "Tjeckisk"
+
+#~ msgid "Danish"
+#~ msgstr "Dansk"
+
+#~ msgid "DeuCH"
+#~ msgstr "DeuCH"
+
+#~ msgid "Dvo"
+#~ msgstr "Dvo"
+
+#~ msgid "Finnish"
+#~ msgstr "Finsk"
+
+#~ msgid "FraCH"
+#~ msgstr "FraCH"
+
+#~ msgid "German"
+#~ msgstr "Tysk"
+
+#~ msgid "Group Shift/Lock behavior"
+#~ msgstr "Gruppbeteende för Skift/Lock"
+
+#~ msgid "Hungarian"
+#~ msgstr "Ungersk"
+
+#~ msgid "Italian"
+#~ msgstr "Italiensk"
+
+#~ msgid "Japanese"
+#~ msgstr "Japansk"
+
+#~ msgid "Left Alt key changes group"
+#~ msgstr "Vänster Alt-tangent byter grupp"
+
+#~ msgid "Left Alt key switches group while pressed"
+#~ msgstr "Vänster Alt-tangent byter grupp då den trycks ned"
+
+#~ msgid "Left Ctrl key changes group"
+#~ msgstr "Vänster Ctrl-tangent byter grupp"
+
+#~ msgid "Left Shift key changes group"
+#~ msgstr "Vänster Skift-tangent byter grupp"
+
+#~ msgid "Make CapsLock an additional Control"
+#~ msgstr "Gör CapsLock till ytterligare en Control-tangent"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norsk"
+
+#~ msgid "Num_Lock LED shows alternative group"
+#~ msgstr "Num_Lock-lampan visar alternativ grupp"
+
+#~ msgid "Polish"
+#~ msgstr "Polsk"
+
+#~ msgid "Polish with Polish quotes on key \"1/!\""
+#~ msgstr "Polska med polska citattecken på tangenten \"1/!\""
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugisisk"
+
+#~ msgid "Press Left Alt key to choose 3rd level"
+#~ msgstr "Tryck vänster Alt-tangent för att välja tredjenivå"
+
+#~ msgid "Press Right Alt key to choose 3rd level"
+#~ msgstr "Tryck höger Alt-tangent för att välja tredjenivå"
+
+#~ msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+#~ msgstr "Tryck höger Alt-tangent för att välja tredjenivå. Skift+höger Alt-tangent är Multi_Key"
+
+#~ msgid "Press Right Control to choose 3rd level"
+#~ msgstr "Tryck höger Control-tangent för att välja tredjenivå"
+
+#~ msgid "Press any of Alt keys to choose 3rd level"
+#~ msgstr "Tryck valfri Alt-tangent för att välja tredjenivå"
+
+#~ msgid "Right Alt key changes group"
+#~ msgstr "Höger Alt-tangent byter grupp"
+
+#~ msgid "Right Alt switches group while pressed"
+#~ msgstr "Höger Alt-tangent byter grupp då den trycks ned"
+
+#~ msgid "Right Control key works as Right Alt"
+#~ msgstr "Höger Control-tangent fungerar som höger Alt"
+
+#~ msgid "Right Ctrl key changes group"
+#~ msgstr "Höger Ctrl-tangent byter grupp"
+
+#~ msgid "Right Shift key changes group"
+#~ msgstr "Höger Skift-tangent byter grupp"
+
+#~ msgid "Scroll Lock changes group"
+#~ msgstr "Scroll Lock byter grupp"
+
+#~ msgid "Scroll_Lock LED shows alternative group"
+#~ msgstr "Scroll_Lock-lampan visar alternativ grupp"
+
+#~ msgid "Shift with numpad keys works as in MS Windows"
+#~ msgstr "Skift med tangenterna på numeriska tangentbordet fungerar som i MS Windows"
+
+#~ msgid "Shift+CapsLock changes group"
+#~ msgstr "Skift+CapsLock byter grupp"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovakisk"
+
+#~ msgid "Spanish"
+#~ msgstr "Spansk"
+
+#~ msgid "Sun Type 4"
+#~ msgstr "Sun Type 4"
+
+#~ msgid "Sun Type 5 European"
+#~ msgstr "Sun Type 5 europeisk"
+
+#~ msgid "Sun Type 5 Unix"
+#~ msgstr "Sun Type 5 Unix"
+
+#~ msgid "Sun Type 6"
+#~ msgstr "Sun Type 6"
+
+#~ msgid "Sun Type 6 Unix"
+#~ msgstr "Sun Type 6 Unix"
+
+#~ msgid "Sun Type 6 with Euro key"
+#~ msgstr "Sun Type 6 med eurotangent"
+
+#~ msgid "Swap Control and Caps Lock"
+#~ msgstr "Byt Control och Caps Lock"
+
+#~ msgid "Swedish"
+#~ msgstr "Svensk"
+
+#~ msgid "Swiss French"
+#~ msgstr "Franskschweizisk"
+
+#~ msgid "Swiss German"
+#~ msgstr "Schweizertysk"
+
+#~ msgid "Turkish"
+#~ msgstr "Turkisk"
+
+#~ msgid "Turkish (F)"
+#~ msgstr "Turkisk (F)"
+
+#~ msgid "Turkish Alt-Q Layout"
+#~ msgstr "Turkisk Alt-Q-layout"
+
+#~ msgid "U.S. English"
+#~ msgstr "Engelskamerikansk"
+
+#~ msgid "U.S. English w/ ISO9995-3"
+#~ msgstr "Engelskamerikansk med ISO9995-3"
+
+#~ msgid "Use keyboard LED to show alternative group"
+#~ msgstr "Använd tangentbordslampa för att visa alternativ grupp"
+
+#~ msgid "Uses internal capitalization. Shift cancels Caps."
+#~ msgstr "Använder intern skiftlägesstyrning. Skift \"pausar\" CapsLock."
+
+#~ msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+#~ msgstr "Använder intern skiftlägesstyrning. Skift påverkar inte CapsLock."
+
+#~ msgid "bksl"
+#~ msgstr "bksl"
+
+#~ msgid "type4"
+#~ msgstr "type4"
+
+#~ msgid "Kotoistus"
+#~ msgstr "Kotoistus"
+
+#~ msgid "SCG"
+#~ msgstr "SCG"
+
+#~ msgid "Acer TravelMate 800"
+#~ msgstr "Acer TravelMate 800"
+
+#~ msgid "Dell SK-8125 USB Multimedia Keybard"
+#~ msgstr "Dell SK-8125 USB Multimedia-tangentbord"
+
+#~ msgid "Dell SK-8135 USB Multimedia Keybard"
+#~ msgstr "Dell SK-8135 USB Multimedia-tangentbord"
+
+#~ msgid "Force standard legacy keypad"
+#~ msgstr "Tvinga ursprungligt standard numeriskt tangentbord"
+
+#~ msgid "Adding the nobreakspace keysym to space key"
+#~ msgstr "Lägger till den icke-brytande blankstegstangentsymbolen till blankstegstangenten"
+
+#~ msgid "PowerPC PS/2"
+#~ msgstr "PowerPC PS/2"
+
+#~ msgid "\"Standard\""
+#~ msgstr "\"Standard\""
+
+#~ msgid "Dhivehi"
+#~ msgstr "Dhivehi"
+
+#~ msgid "Div"
+#~ msgstr "Div"
+
+#~ msgid "Logitech Deluxe Access Keyboard"
+#~ msgstr "Logitech Deluxe Access-tangentbord"
+
+#~ msgid "Logitech iTouch keyboard Internet Navigator"
+#~ msgstr "Logitech iTouch-tangentbord Internet Navigator"
+
+#~ msgid "Srp"
+#~ msgstr "Srp"
+
+#~ msgid "Tamil INSCRIPT"
+#~ msgstr "Tamil INSCRIPT"
+
+#~ msgid "US keyboard with Maltian letters"
+#~ msgstr "USA-tangentbord med maltesiska bokstäver"
+
+#~ msgid "si1452"
+#~ msgstr "si1452"
+
+#~ msgid "A Tamil typewrite-style keymap; TAB encoding"
+#~ msgstr "En tamilsk tangentbordstabell i skrivmaskinsstil; TAB-kodning"
+
+#~ msgid "A Tamil typewrite-style keymap; TSCII encoding"
+#~ msgstr "En tamilsk tangentbordstabell i skrivmaskinsstil; TSCII-kodning"
+
+#~ msgid "A Tamil typewrite-style keymap; Unicode encoding"
+#~ msgstr "En tamilsk tangentbordstabell i skrivmaskinsstil; Unicode-kodning"
+
+#~ msgid "Arb"
+#~ msgstr "Arb"
+
+#~ msgid "Ben"
+#~ msgstr "Ben"
+
+#~ msgid "Bosnian"
+#~ msgstr "Bosnisk"
+
+#~ msgid "Burmese"
+#~ msgstr "Burmesisk"
+
+#~ msgid "CloGaelach Laptop"
+#~ msgstr "CloGaelach-laptop"
+
+#~ msgid "Czech (qwerty)"
+#~ msgstr "Tjeckisk (qwerty)"
+
+#~ msgid "Dutch"
+#~ msgstr "Nederländsk"
+
+#~ msgid "French Canadian"
+#~ msgstr "Franskkanadensisk"
+
+#~ msgid "Georgian (latin)"
+#~ msgstr "Georgisk (latin)"
+
+#~ msgid "Georgian (russian)"
+#~ msgstr "Georgisk (rysk)"
+
+#~ msgid "Grc"
+#~ msgstr "Grc"
+
+#~ msgid "Hin"
+#~ msgstr "Hin"
+
+#~ msgid "Hindi"
+#~ msgstr "Hindisk"
+
+#~ msgid "Hungarian (qwerty)"
+#~ msgstr "Ungersk (qwerty)"
+
+#~ msgid "INSCRIPT layout"
+#~ msgstr "INSCRIPT-layout"
+
+#~ msgid "IS434 laptop"
+#~ msgstr "IS434-laptop"
+
+#~ msgid "Iku"
+#~ msgstr "Iku"
+
+#~ msgid "Irish"
+#~ msgstr "Irländsk"
+
+#~ msgid "Lithuanian azerty standard"
+#~ msgstr "Litauisk azerty-standard"
+
+#~ msgid "Lithuanian qwerty \"numeric\""
+#~ msgstr "Litauisk qwerty \"numerisk\""
+
+#~ msgid "Northern Saami (Finland)"
+#~ msgstr "Nordsamisk (Finland)"
+
+#~ msgid "Northern Saami (Norway)"
+#~ msgstr "Nordsamisk (Norge)"
+
+#~ msgid "Northern Saami (Sweden)"
+#~ msgstr "Nordsamisk (Sverige)"
+
+#~ msgid "Ogh"
+#~ msgstr "Ogh"
+
+#~ msgid "Ori"
+#~ msgstr "Ori"
+
+#~ msgid "PC104"
+#~ msgstr "PC104"
+
+#~ msgid "Polish (qwertz)"
+#~ msgstr "Polsk (qwertz)"
+
+#~ msgid "Sapmi"
+#~ msgstr "Sapmi"
+
+#~ msgid "Scg"
+#~ msgstr "Scg"
+
+#~ msgid "Slovak (qwerty)"
+#~ msgstr "Slovakisk (qwerty)"
+
+#~ msgid "Sv"
+#~ msgstr "Sv"
+
+#~ msgid "Tel"
+#~ msgstr "Tel"
+
+#~ msgid "Thai (Kedmanee)"
+#~ msgstr "Thailändsk (Kedmanee)"
+
+#~ msgid "Tml"
+#~ msgstr "Tml"
+
+#~ msgid "U.S. English w/ dead keys"
+#~ msgstr "Engelskamerikansk med stumma tangenter"
+
+#~ msgid "US"
+#~ msgstr "USA"
+
+#~ msgid "Yug"
+#~ msgstr "Yug"
+
+#~ msgid "Yugoslavian"
+#~ msgstr "Jugoslavisk"
+
+#~ msgid "abnt2"
+#~ msgstr "abnt2"
+
+#~ msgid "sefi"
+#~ msgstr "sefi"
+
+#~ msgid "uni/101/qwerty/comma"
+#~ msgstr "uni/101/qwerty/komma"
+
+#~ msgid "uni/101/qwerty/dot"
+#~ msgstr "uni/101/qwerty/punkt"
+
+#~ msgid "uni/101/qwertz/comma"
+#~ msgstr "uni/101/qwertz/komma"
+
+#~ msgid "uni/101/qwertz/dot"
+#~ msgstr "uni/101/qwertz/punkt"
+
+#~ msgid "uni/102/qwerty/comma"
+#~ msgstr "uni/102/qwerty/komma"
+
+#~ msgid "uni/102/qwerty/dot"
+#~ msgstr "uni/102/qwerty/punkt"
+
+#~ msgid "uni/102/qwertz/comma"
+#~ msgstr "uni/102/qwertz/komma"
+
+#~ msgid "uni/102/qwertz/dot"
+#~ msgstr "uni/102/qwertz/punkt"
+
+#~ msgid "Brazilian (ABNT2)"
+#~ msgstr "Brasiliansk (ABNT2)"
+
+#~ msgid "Caps Lock key behavior"
+#~ msgstr "Beteende för Caps Lock-tangenten"
+
+#~ msgid "Caps Lock LED shows alternative group"
+#~ msgstr "Caps Lock-lampan visar alternativ grupp"
+
+#~ msgid "Logitech"
+#~ msgstr "Logitech"
+
+#~ msgid "Microsoft"
+#~ msgstr "Microsoft"
+
+#~ msgid "Miscellaneous options"
+#~ msgstr "Diverse alternativ"
+
+#~ msgid "Win-keys"
+#~ msgstr "Win-tangenter"
+
+#~ msgid "Utility"
+#~ msgstr "Verktyg"
+
+#~ msgid "_About..."
+#~ msgstr "_Om..."
+
+#~ msgid "_Groups"
+#~ msgstr "_Grupper"
+
+#~ msgid "_Help"
+#~ msgstr "_Hjälp"
+
+#~ msgid "_Plugins..."
+#~ msgstr "_Insticksmoduler..."
+
+#~ msgid "_Properties..."
+#~ msgstr "_Egenskaper..."
+
+#~ msgid "Keyboard switcher (%s)"
+#~ msgstr "Tangentbordsväxlare (%s)"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Christian Rose\n"
+#~ "Skicka synpunkter på översättningen till sv@li.org"
+
+#~ msgid "XKB initialization error"
+#~ msgstr "XKB-initieringsfel"
+
+#~ msgid "Error loading XKB configuration registry"
+#~ msgstr "Fel vid inläsning av XKB-konfigurationsregistret"
+
+#~ msgid ""
+#~ "Make the layout accessible from the applet popup menu ONLY.\n"
+#~ "No way to switch to this layout using the keyboard."
+#~ msgstr ""
+#~ "Gör layouten tillgänglig ENDAST från panelpopupmenyn.\n"
+#~ "Ingen möjlighet att byta denna layout genom användning av tangentbordet."
+
+#~ msgid "Exclude from keyboard switching"
+#~ msgstr "Exkludera från tangentbordsväxling"
+
+#~ msgid "not used"
+#~ msgstr "används inte"
+
+#~ msgid "Activate more plugins"
+#~ msgstr "Aktivera fler insticksmoduler"
+
+#~ msgid "Add plugin"
+#~ msgstr "Lägg till insticksmodul"
+
+#~ msgid "Close the dialog"
+#~ msgstr "Stäng dialogfönstret"
+
+#~ msgid "Configure the selected plugin"
+#~ msgstr "Konfigurera den markerade insticksmodulen"
+
+#~ msgid "Deactivate selected plugin"
+#~ msgstr "Inaktivera den markerade insticksmodulen"
+
+#~ msgid "Decrease the plugin priority"
+#~ msgstr "Minska insticksmodulprioriteten"
+
+#~ msgid "Increase the plugin priority"
+#~ msgstr "Öka insticksmodulprioriteten"
+
+#~ msgid "The list of active plugins"
+#~ msgstr "Listan med aktiva insticksmoduler"
+
+#~ msgid "_Active plugins"
+#~ msgstr "_Aktiva insticksmoduler"
+
+#~ msgid "_Available plugins:"
+#~ msgstr "_Tillgängliga insticksmoduler:"
+
+#~ msgid "Choose the default group (for newly created windows)."
+#~ msgstr "Välj standardgrupp (för nyligen skapade fönster)."
+
+#~ msgid "Keep separate group for each application window."
+#~ 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."
+
+#~ msgid "Save/restore _indicators with group"
+#~ msgstr "Spara/återställ _indikatorer med grupp"
+
+#~ msgid "Separate _group for each window"
+#~ msgstr "Separat _grupp för varje fönster"
+
+#~ msgid "Show national flags as indicators of corresponding layouts"
+#~ msgstr "Visa nationsflaggor som indikatorer för motsvarande layout"
+
+#~ msgid "Use _flags as indicators"
+#~ msgstr "Använd _flaggor som indikatorer"
+
+#~ msgid "_Default group:"
+#~ msgstr "_Standardgrupp:"
+
+#~ msgid "_Default group"
+#~ msgstr "_Standardgrupp"
+
+#~ msgid "Apply XKB configuration and quit"
+#~ msgstr "Verkställ XKB-konfiguration och avsluta"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "Postscript preview component is not available"
+#~ msgstr "Postscript-förhandsvisningskomponent är inte tillgänglig"
+
+#~ msgid "Keyboard layout preview"
+#~ msgstr "Förhandsvisning av tangentbordslayout"
+
+#~ msgid "Configure keyboard layouts"
+#~ msgstr "Konfigurera tangentbordslayouter"
+
+#~ msgid "Keyboard layouts"
+#~ msgstr "Tangentbordslayouter"
+
+#~ msgid "Choose the layout."
+#~ 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."
+
+#~ msgid "Choose the model of the keyboard (brand, number of keys, etc.)."
+#~ msgstr "Välj modellen på tangentbordet (märke, antal tangenter, osv.)."
+
+#~ msgid "Clear."
+#~ msgstr "Töm."
+
+#~ msgid "Extra"
+#~ msgstr "Extra"
+
+#~ msgid "Keyboard _model:"
+#~ msgstr "Tangentbords_modell:"
+
+#~ msgid "Keyboard layouts' settings: "
+#~ msgstr "Inställningar för tangentbordslayouter: "
+
+#~ msgid "Options 1"
+#~ msgstr "Alternativ 1"
+
+#~ msgid "Options 2"
+#~ msgstr "Alternativ 2"
+
+#~ msgid "Show _advanced parameters"
+#~ 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)."
+
+#~ 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."
+
+#~ msgid "Use global configuration set in XF86Config."
+#~ msgstr "Använd global konfiguration som är angiven i XF86Config."
+
+#~ msgid "_Custom"
+#~ msgstr "_Anpassad"
+
+#~ msgid "_Global Preconfigured"
+#~ msgstr "_Global förkonfigurerad"
+
+#~ msgid "_Layouts:"
+#~ msgstr "_Layouter:"
+
+#~ msgid "_Preview"
+#~ msgstr "_Förhandsgranska"
+
+#~ msgid "_Switch shortcut"
+#~ msgstr "_Växlingsgenväg"
+
+#~ msgid "Default XKB setting"
+#~ msgstr "XKB-standardinställning"
+
+#~ msgid "Right Control"
+#~ msgstr "Höger ctrl"
+
+#~ msgid "Left Control"
+#~ msgstr "Vänster ctrl"
+
+#~ msgid "Right Shift"
+#~ msgstr "Höger skift"
+
+#~ msgid "Left Shift"
+#~ msgstr "Vänster skift"
+
+#~ msgid "Grave"
+#~ msgstr "Allvarlig"
+
+#~ msgid "Beep on group switch"
+#~ msgstr "Pip vid gruppbyte"
+
+#~ msgid "Debug level"
+#~ msgstr "Felsökningsnivå"
+
+#~ msgid "Default group, assigned on window creation"
+#~ msgstr "Standardgrupp som tilldelas vid fönsterskapande"
+
+#~ msgid "Keep and manage separate group per window"
+#~ msgstr "Behåll och hantera separata grupper per fönster"
+
+#~ msgid "Save/restore indicators together with layout groups"
+#~ msgstr "Spara/återställ indikatorer tillsammans med layoutgrupper"
+
+#~ msgid "Secondary groups"
+#~ msgstr "Sekundära grupper"
+
+#~ msgid "Show flags in the applet"
+#~ msgstr "Visa flaggor i panelprogrammet"
+
+#~ msgid "Show flags in the applet to indicate the current layout"
+#~ msgstr "Visa flaggor i panelprogrammet för att indikera aktuell layout"
+
+#~ 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 "The id of active switchcut"
+#~ msgstr "Id för den aktiva genvägen"
+
+#~ msgid "XKB keyboard layout"
+#~ msgstr "XKB-tangentbordslayout"
+
+#~ msgid "XKB keyboard model"
+#~ msgstr "XKB-tangentbordsmodell"
+
+#~ msgid "XKB options"
+#~ msgstr "XKB-alternativ"
+
+#~ msgid "XKB settings should be overridden"
+#~ msgstr "XKB-inställningar ska åsidosättas"
+
+#~ msgid "[us]"
+#~ msgstr "[se]"
+
+#~ msgid "Choose the color"
+#~ msgstr "Välj färg"
+
+#~ msgid "Highlighter"
+#~ msgstr "Färgmarkör"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Highlighter plugin properties"
+#~ msgstr "Egenskaper för färgmarkörsinsticksmodul"
+
+#~ msgid "_Background color"
+#~ msgstr "_Bakgrundsfärg"
+
+#~ msgid "_Text color"
+#~ msgstr "_Textfärg"
+
+#~ msgid "Keyboard events"
+#~ msgstr "Tangentbordshändelser"
+
+#~ msgid "Switching to group 2"
+#~ msgstr "Växlar till grupp 2"
+
+#~ msgid "Switching to group 3"
+#~ msgstr "Växlar till grupp 3"
+
+#~ msgid "Switching to group 4"
+#~ msgstr "Växlar till grupp 4"
+
+#~ msgid "Sound plugin"
+#~ msgstr "Ljudinsticksmodul"
+
+#~ msgid "Test plugin"
+#~ msgstr "Testinsticksmodul"
+
+#~ msgid "Choose color"
+#~ msgstr "Välj färg"
+
+#~ msgid "Background color"
+#~ msgstr "Bakgrundsfärg"
+
+#~ msgid "Text color"
+#~ msgstr "Textfärg"
+
+#~ msgid "_Available plugins"
+#~ msgstr "_Tillgängliga insticksmoduler"
+
+#~ msgid "Plugins"
+#~ msgstr "Insticksmoduler"
+
+#~ msgid "Plugin"
+#~ msgstr "Insticksmodul"
+
+#~ msgid "Enable _beep"
+#~ msgstr "Aktivera _pip"
+
+#~ msgid "Use the system beep to indicate the switch."
+#~ msgstr "Använd systempipet för indikation av bytet."
+
+#~ msgid "Secondary"
+#~ msgstr "Sekundär"
+
+#~ msgid "Use _flags"
+#~ msgstr "Använd _flaggor"
+
+#~ msgid "Use flags as indicators"
+#~ msgstr "Använd flaggor som indikatorer"
+
+#~ msgid "Use flags"
+#~ msgstr "Använd flaggor"
+
+#~ msgid "Keyboard switcher"
+#~ msgstr "Tangentbordsväxlare"
+
+#~ msgid "Keyboard Switcher"
+#~ msgstr "Tangentbordsväxlare"
+
+#~ msgid "Configure keyboard layout"
+#~ msgstr "Konfigurera tangentbordslayout"
+
+#~ msgid "Keyboard layout"
+#~ msgstr "Tangentbordslayout"
+
+#~ msgid "Keyboard layout settings: "
+#~ msgstr "Inställningar för tangentbordslayouter: "
+
+#~ msgid "General XKB Properties"
+#~ msgstr "Allmänna XKB-genskaper"
+
+#~ msgid "XKB Properties"
+#~ msgstr "XKB-egenskaper"
+
+#~ msgid "XKB settings: "
+#~ msgstr "XKB-inställningar: "
+
+#~ msgid "Preview"
+#~ msgstr "Förhandsgranska"
+
+#~ msgid "To _default"
+#~ msgstr "Till _standard"
+
+#~ msgid "To _fit"
+#~ msgstr "SÃ¥ att det _passar"
+
+#~ msgid "Update the preview. Can take some time."
+#~ msgstr "Uppdatera förhandsgranskningen. Kan ta lite tid."
+
+#~ msgid "Zoom"
+#~ msgstr "Zooma"
+
+#~ msgid "Zoom in."
+#~ msgstr "Zooma in."
+
+#~ msgid "Zoom out."
+#~ msgstr "Zooma ut."
+
+#~ msgid "Zoom to default."
+#~ msgstr "Zooma till standard."
+
+#~ msgid "Zoom to fit."
+#~ msgstr "Zooma så att det passar."
+
+#~ msgid "_Out"
+#~ msgstr "_Ut"
+
+#~ msgid "_Update preview"
+#~ msgstr "_Uppdatera förghandsgranskning"
+
+#~ msgid "About..."
+#~ msgstr "Om..."
+
+#~ msgid "Left Control - Right Control"
+#~ msgstr "Vänster ctrl - höger ctrl"
+
+#~ msgid "Left Shift - Right Shift"
+#~ msgstr "Vänster skift - höger skift"
+
+#~ msgid "Alt - Left Control"
+#~ msgstr "Alt - vänster ctrl"
+
+#~ msgid "Alt - Right Control"
+#~ msgstr "Alt - höger ctrl"
+
+#~ msgid "Alt - Left Shift"
+#~ msgstr "Alt - vänster skift"
+
+#~ msgid "Alt - Right Shift"
+#~ msgstr "Alt - höger skift"
+
+#~ msgid "Control - Right Shift"
+#~ msgstr "Ctrl - höger skift"
+
+#~ msgid "None"
+#~ msgstr "Ingen"
+
+#~ msgid "User defined:"
+#~ msgstr "Användardefinierad:"
+
+#~ msgid "_Layouts"
+#~ msgstr "_Layouter"
+
+#~ msgid "DLEVEL"
+#~ msgstr "FNIVÃ…"
+
+#~ msgid "H_ome page..."
+#~ msgstr "H_emsida..."
+
+#~ msgid "Clear the setting"
+#~ msgstr "Töm inställningen"
+
+#~ msgid "Use _custom XKB settings"
+#~ msgstr "Använd _anpassade XKB-inställningar"
+
+#~ msgid "Enable Beep"
+#~ msgstr "Aktivera pip"
+
+#~ msgid "Layout:"
+#~ msgstr "Layout:"
diff --git a/xorg-server/xkbdata.src/po/tr.po b/xorg-server/xkbdata.src/po/tr.po
new file mode 100644
index 000000000..8f68328b8
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/tr.po
@@ -0,0 +1,2595 @@
+# Turkish translations for xkeyboard-config.
+# Copyright (C) 2007 Free Software Foundation, Inc.
+#
+# Nilgün Belma Bugüner <nilgun@buguner.name.tr>, 2003, ..., 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.0-pre1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-06-28 15:21+0100\n"
+"PO-Revision-Date: 2007-07-09 10:09+0300\n"
+"Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
+"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "F Klavye"
+
+#: ../rules/base.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(Eski) DiÄŸer"
+
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Eski) Diğer, Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Eski) Diğer, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:5
+msgid "(Legacy) Dvorak"
+msgstr "(Kadim) Dvorak"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/104 key Compatible"
+msgstr "101/104 tuÅŸ Uyumlu"
+
+#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/virgül/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/virgül/Ölü tuşları normal yapar"
+
+#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/nokta/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/nokta/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/virgül/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/virgül/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/nokta/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/nokta/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/virgül/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/virgül/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/nokta/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/nokta/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/virgül/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/virgül/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/nokta/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/nokta/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:23
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:24
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:25
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:26
+msgid "ACPI Standard"
+msgstr "ACPI Standardı"
+
+#: ../rules/base.xml.in.h:27
+msgid "AZERTY Tskapo"
+msgstr "AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:28
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:29
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:30
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:31
+msgid "Acer TravelMate 800"
+msgstr "Acer TravelMate 800"
+
+#: ../rules/base.xml.in.h:32
+msgid "Add the EuroSign to the 2 key."
+msgstr "2 tuşuna € sembolünü ekler"
+
+#: ../rules/base.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "5 tuşuna € sembolünü ekler"
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "E tuşuna € sembolünü ekler"
+
+#: ../rules/base.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "Menü tuşuna standart işlevini ekler."
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Belli tuşlara € sembolünün eklenmesi"
+
+#: ../rules/base.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38
+msgid "Afg"
+msgstr "Afg"
+
+#: ../rules/base.xml.in.h:39
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+#: ../rules/base.xml.in.h:40
+msgid "Akan"
+msgstr "Akan"
+
+#: ../rules/base.xml.in.h:41
+msgid "Alb"
+msgstr "Arn"
+
+#: ../rules/base.xml.in.h:42
+msgid "Albania"
+msgstr "Arnavutluk"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt ve Meta, Alt tuşlarındadır."
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt, sağdaki Pencere tuşu ile Süper ise Menü tuşu ile eşleştirilir."
+
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Alt+CapsLock yerleÅŸimi deÄŸiÅŸtirir."
+
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+CtrlyerleÅŸimi deÄŸiÅŸtirir."
+
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Alt+Shift yerleÅŸimi deÄŸiÅŸtirir."
+
+#: ../rules/base.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Yazılımcı klavyesi (Q)"
+
+#: ../rules/base.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Alt/Pencere tuşu davranışı"
+
+#: ../rules/base.xml.in.h:50
+msgid "Alternative"
+msgstr "DiÄŸer"
+
+#: ../rules/base.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "DiÄŸer DoÄŸu"
+
+#: ../rules/base.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "DiÄŸer Fonetik"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "Uluslararası Q klavle (nam-ı diğer us_intl)"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "Diğer, Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "Diğer, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "DiÄŸer, sadece latin-9"
+
+#: ../rules/base.xml.in.h:57
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:58
+msgid "Andorra"
+msgstr "Andora"
+
+#: ../rules/base.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "Tek tırnaklı (')"
+
+#: ../rules/base.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Apple Dizüstü"
+
+#: ../rules/base.xml.in.h:62
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:63
+msgid "Arabic"
+msgstr "Arapça"
+
+#: ../rules/base.xml.in.h:64
+msgid "Arm"
+msgstr "Erm"
+
+#: ../rules/base.xml.in.h:65
+msgid "Armenia"
+msgstr "Ermenistan"
+
+#: ../rules/base.xml.in.h:66
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:67
+msgid "Azerbaijan"
+msgstr "Azerbaycan"
+
+#: ../rules/base.xml.in.h:68
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet Keyboard"
+
+#: ../rules/base.xml.in.h:69
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:70
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Çokluortam"
+
+#: ../rules/base.xml.in.h:71
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:72
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:73
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:74
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:75
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:76
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:77
+msgid "Bangladesh"
+msgstr "BangladeÅŸ"
+
+#: ../rules/base.xml.in.h:78 ../rules/sun.xml.in.h:22
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:79
+msgid "Belarus"
+msgstr "Belarus"
+
+#: ../rules/base.xml.in.h:80
+msgid "Belgium"
+msgstr "Belçika"
+
+#: ../rules/base.xml.in.h:81
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:82
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:83
+msgid "Bengali"
+msgstr "Bengalce"
+
+#: ../rules/base.xml.in.h:84
+msgid "Bengali Probhat"
+msgstr "Bengali Probhat"
+
+#: ../rules/base.xml.in.h:85
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonomik, Dvorak yolu"
+
+#: ../rules/base.xml.in.h:86
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonomik, Dvorak yolu, sadece latin-9"
+
+#: ../rules/base.xml.in.h:87 ../rules/sun.xml.in.h:24
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:88
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bhutan"
+msgstr "Butan"
+
+#: ../rules/base.xml.in.h:90
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Dini Ä°branice (Tiro)"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:92
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:93
+msgid "Bosnia and Herzegovina"
+msgstr "Bosna Hersek"
+
+#: ../rules/base.xml.in.h:94
+msgid "Both Alt keys together change layout."
+msgstr "Alt tuşları birlikte yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:95
+msgid "Both Ctrl keys together change layout."
+msgstr "Ctrl tuşları birlikte yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:96
+msgid "Both Shift keys together change layout."
+msgstr "Shift tuşları birlikte yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:97
+msgid "Both Win-keys switch layout while pressed."
+msgstr "Pencere tuşları birlikte yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:98
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:99
+msgid "Braille"
+msgstr "Üç noktalı"
+
+#: ../rules/base.xml.in.h:100
+msgid "Brazil"
+msgstr "Brezilya"
+
+#: ../rules/base.xml.in.h:101
+msgid "Brazilian ABNT2"
+msgstr "Brazilya dili ABNT2"
+
+#: ../rules/base.xml.in.h:102
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:103
+msgid "Brother Internet Keyboard"
+msgstr "Brother Genel AÄŸ Klavyesi"
+
+#: ../rules/base.xml.in.h:104
+msgid "Buckwalter"
+msgstr "Bükvalter"
+
+#: ../rules/base.xml.in.h:105
+msgid "Bulgaria"
+msgstr "Bulgaristan"
+
+#: ../rules/base.xml.in.h:106
+msgid "Cambodia"
+msgstr "Kamboçya"
+
+#: ../rules/base.xml.in.h:107 ../rules/sun.xml.in.h:29
+msgid "Can"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:108
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rules/base.xml.in.h:109
+msgid "Caps Lock is Compose."
+msgstr "CapsLock tuÅŸu karakter birleÅŸimi yapar."
+
+#: ../rules/base.xml.in.h:110
+msgid "CapsLock LED shows alternative layout."
+msgstr "Caps Lock LED'i diğer yerleşimi gösterir."
+
+#: ../rules/base.xml.in.h:111
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu ise Caps Lock tuşunu \"bekletir\"."
+
+#: ../rules/base.xml.in.h:112
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu Caps Lock davranışını etkilemez."
+
+#: ../rules/base.xml.in.h:113
+msgid "CapsLock just locks the Shift modifier."
+msgstr "Caps Lock sadece kilitlemeli Shift tuşu gibi çalışır."
+
+#: ../rules/base.xml.in.h:114 ../rules/sun.xml.in.h:33
+msgid "CapsLock key behavior"
+msgstr "CapsLock tuşunun davranışı"
+
+#: ../rules/base.xml.in.h:115
+msgid "CapsLock key changes layout."
+msgstr "Caps Lock tuÅŸu yerleÅŸimi deÄŸiÅŸtirir"
+
+#: ../rules/base.xml.in.h:116
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "Caps Lock tuşu Shift davranışını ters çevirir; bundan alfabetik olmayan tuşlar da etkilenir."
+
+#: ../rules/base.xml.in.h:117
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "Caps Lock tuşu büyük/küçük harf geçişi yapar."
+
+#: ../rules/base.xml.in.h:118
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "CapsLock dahili dönüşümü kullanılır, Shift tuşu Caps Lock tuşunu \"bekletir\"."
+
+#: ../rules/base.xml.in.h:119
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "CapsLock dahili dönüşümü kullanır. Shift tuşu Caps Lock davranışını etkilemez."
+
+#: ../rules/base.xml.in.h:120
+msgid "Catalan variant with middle-dot L"
+msgstr "Ortası noktalı L'li Katalan yerleşimi"
+
+#: ../rules/base.xml.in.h:121
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:122
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:123
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (diğer seçenek)"
+
+#: ../rules/base.xml.in.h:124
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:125
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:126
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:127
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Genel AÄŸ Klavyesi"
+
+#: ../rules/base.xml.in.h:128
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:129
+msgid "Chuvash"
+msgstr "Çuvaş"
+
+#: ../rules/base.xml.in.h:130
+msgid "Chuvash Latin"
+msgstr "Çuvaş Latin"
+
+#: ../rules/base.xml.in.h:131
+msgid "Classic Dvorak"
+msgstr "Klasik Dvorak"
+
+#: ../rules/base.xml.in.h:132
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:133
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Kolay EriÅŸim Klavyesi"
+
+#: ../rules/base.xml.in.h:134
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Genel AÄŸ Klavyesi (13 tuÅŸlu)"
+
+#: ../rules/base.xml.in.h:135
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Genel AÄŸ Klavyesi (18 tuÅŸlu)"
+
+#: ../rules/base.xml.in.h:136
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Genel AÄŸ Klavyesi (7 tuÅŸlu)"
+
+#: ../rules/base.xml.in.h:137
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Klavyesi"
+
+#: ../rules/base.xml.in.h:138
+msgid "Compose key position"
+msgstr "Karakter oluÅŸturma (compose) tuÅŸu konumu"
+
+#: ../rules/base.xml.in.h:139
+msgid "Congo, Democratic Republic of the"
+msgstr "Kongo Demokratik Cumhuriyeti"
+
+#: ../rules/base.xml.in.h:140
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "Ctrl, Win tuşlarına eşlenir."
+
+#: ../rules/base.xml.in.h:141
+msgid "Croatia"
+msgstr "Hırvatistan"
+
+#: ../rules/base.xml.in.h:142
+msgid "Ctrl key at bottom left"
+msgstr "Sol alttaki Ctrl tuÅŸu"
+
+#: ../rules/base.xml.in.h:143
+msgid "Ctrl key at left of 'A'"
+msgstr "'A'nın solundaki Ctrl Tuşu"
+
+#: ../rules/base.xml.in.h:144
+msgid "Ctrl key position"
+msgstr "Ctrl tuÅŸunun yeri"
+
+#: ../rules/base.xml.in.h:145
+msgid "Ctrl+Shift change layout."
+msgstr "Ctrl+Shift tuşları yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:146
+msgid "Cyrillic"
+msgstr "Kril"
+
+#: ../rules/base.xml.in.h:147 ../rules/sun.xml.in.h:39
+msgid "Cze"
+msgstr "Çek"
+
+#: ../rules/base.xml.in.h:148
+msgid "Czechia"
+msgstr "Çek Cumhuriyeti"
+
+#: ../rules/base.xml.in.h:149
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:150
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:151 ../rules/sun.xml.in.h:42
+msgid "Dead acute"
+msgstr "Ölü acute (´)"
+
+#: ../rules/base.xml.in.h:152 ../rules/sun.xml.in.h:43
+msgid "Dead grave acute"
+msgstr "Ölü grave acute (`)"
+
+#: ../rules/base.xml.in.h:153
+msgid "Default numeric keypad keys."
+msgstr "Öntanımlı tuştakımı tuşları."
+
+#: ../rules/base.xml.in.h:154
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:155
+msgid "Dell 101-key PC"
+msgstr "Dell 101 tuÅŸlu PC"
+
+#: ../rules/base.xml.in.h:156
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dizüstü/defter Dell Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:157
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Dizüstü/defter Precision M series"
+
+#: ../rules/base.xml.in.h:158
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude serisi Dizüstü"
+
+#: ../rules/base.xml.in.h:159
+msgid "Dell SK-8125 USB Multimedia Keybard"
+msgstr "Dell SK-8125 USB Çokluortam Klavyesi"
+
+#: ../rules/base.xml.in.h:160
+msgid "Dell SK-8135 USB Multimedia Keybard"
+msgstr "Dell SK-8135 USB Çokluortam Klavyesi"
+
+#: ../rules/base.xml.in.h:161
+msgid "Dell USB Multimedia Keybard"
+msgstr "Dell USB Çokluortam Klavyesi"
+
+#: ../rules/base.xml.in.h:162
+msgid "Denmark"
+msgstr "Danimarka"
+
+#: ../rules/base.xml.in.h:163 ../rules/sun.xml.in.h:44
+msgid "Deu"
+msgstr "Alm"
+
+#: ../rules/base.xml.in.h:164
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Kablosuz Masaüstü Klavyesi"
+
+#: ../rules/base.xml.in.h:165
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 serileri"
+
+#: ../rules/base.xml.in.h:166 ../rules/sun.xml.in.h:46
+msgid "Dnk"
+msgstr "Dnk"
+
+#: ../rules/base.xml.in.h:167 ../rules/sun.xml.in.h:48
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:168
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak, \"1/!\" tuşunda Lehçe tırnaklar"
+
+#: ../rules/base.xml.in.h:169
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, çift tırnak tuşunda Lehçe tırnaklar"
+
+#: ../rules/base.xml.in.h:170
+msgid "Eastern"
+msgstr "DoÄŸu"
+
+#: ../rules/base.xml.in.h:171 ../rules/sun.xml.in.h:49
+msgid "Eliminate dead keys"
+msgstr "Ölü tuşları normal yapar"
+
+#: ../rules/base.xml.in.h:172
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:173
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:174
+msgid "Ergonomic"
+msgstr "Ergonomik"
+
+#: ../rules/base.xml.in.h:175 ../rules/sun.xml.in.h:50
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:176
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:177
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:178
+msgid "Estonia"
+msgstr "Estonya"
+
+#: ../rules/base.xml.in.h:179
+msgid "Eth"
+msgstr "Ety"
+
+#: ../rules/base.xml.in.h:180
+msgid "Ethiopia"
+msgstr "Etyopya"
+
+#: ../rules/base.xml.in.h:181
+msgid "Evdev-managed keyboard"
+msgstr "Evdev yönetimli klavye"
+
+#: ../rules/base.xml.in.h:182
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:183
+msgid "Ewe"
+msgstr "Eve"
+
+#: ../rules/base.xml.in.h:184
+msgid "Extended"
+msgstr "GeliÅŸmiÅŸ"
+
+#: ../rules/base.xml.in.h:185
+msgid "Extended Backslash"
+msgstr "GeliÅŸmiÅŸ Gerisilme"
+
+#: ../rules/base.xml.in.h:186
+msgid "F-letter (F) variant"
+msgstr "F harfli (F) türü"
+
+#: ../rules/base.xml.in.h:187
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:188
+msgid "Faroe Islands"
+msgstr "Faroe Adaları"
+
+#: ../rules/base.xml.in.h:189 ../rules/sun.xml.in.h:51
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:190
+msgid "Finland"
+msgstr "Finlandiya"
+
+#: ../rules/base.xml.in.h:191
+msgid "Force standard legacy keypad"
+msgstr "Standart kadim tuştakımını etkin kılar"
+
+#: ../rules/base.xml.in.h:192 ../rules/sun.xml.in.h:53
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:193
+msgid "France"
+msgstr "Fransa"
+
+#: ../rules/base.xml.in.h:194 ../rules/sun.xml.in.h:55
+msgid "French"
+msgstr "Fransızca"
+
+#: ../rules/base.xml.in.h:195
+msgid "French (Macintosh)"
+msgstr "Fransız (Makintoş)"
+
+#: ../rules/base.xml.in.h:196 ../rules/sun.xml.in.h:56
+msgid "French (legacy)"
+msgstr "Fransızca (eski)"
+
+#: ../rules/base.xml.in.h:197
+msgid "French Dvorak"
+msgstr "Fransızca Dvorak"
+
+#: ../rules/base.xml.in.h:198
+msgid "French, Sun dead keys"
+msgstr "Fransızca, Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:199
+msgid "French, eliminate dead keys"
+msgstr "Fransızca, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:200
+msgid "Fula"
+msgstr "Fula"
+
+#: ../rules/base.xml.in.h:201
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:202
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:203
+msgid "Generic 101-key PC"
+msgstr "Soysal 101 tuÅŸlu PC"
+
+#: ../rules/base.xml.in.h:204
+msgid "Generic 102-key (Intl) PC"
+msgstr "Soysal 102 tuşlu (Uluslararası) PC"
+
+#: ../rules/base.xml.in.h:205
+msgid "Generic 104-key PC"
+msgstr "Soysal 104 tuÅŸlu PC"
+
+#: ../rules/base.xml.in.h:206
+msgid "Generic 105-key (Intl) PC"
+msgstr "Soysal 105 tuşlu (uluslararası) PC"
+
+#: ../rules/base.xml.in.h:207
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:208
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:209
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:210
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:211
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:212
+msgid "Georgia"
+msgstr "Gürcistan"
+
+#: ../rules/base.xml.in.h:213
+msgid "German (Macintosh)"
+msgstr "Alman (MakintoÅŸ)"
+
+#: ../rules/base.xml.in.h:214
+msgid "German, Sun dead keys"
+msgstr "Almanca, Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:215
+msgid "German, eliminate dead keys"
+msgstr "Almanca, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:216
+msgid "Germany"
+msgstr "Almanya"
+
+#: ../rules/base.xml.in.h:217
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:218
+msgid "Ghana"
+msgstr "Gana"
+
+#: ../rules/base.xml.in.h:219
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:220
+msgid "Greece"
+msgstr "Yunanistan"
+
+#: ../rules/base.xml.in.h:221
+msgid "Gujarati"
+msgstr "Batı Hint dili"
+
+#: ../rules/base.xml.in.h:222
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../rules/base.xml.in.h:223
+msgid "Gyration"
+msgstr "Çekimsel"
+
+#: ../rules/base.xml.in.h:224
+msgid "Hausa"
+msgstr "Havza"
+
+#: ../rules/base.xml.in.h:225
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Genel AÄŸ Klavyesi"
+
+#: ../rules/base.xml.in.h:226
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:227
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:228
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:229
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:230
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:231
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:232
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:233
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Çokluortam Klavyesi"
+
+#: ../rules/base.xml.in.h:234
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Genel AÄŸ Klavyesi"
+
+#: ../rules/base.xml.in.h:235
+msgid "Hindi Bolnagri"
+msgstr "Hindi Bolnagri"
+
+#: ../rules/base.xml.in.h:236
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:237
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:238 ../rules/sun.xml.in.h:59
+msgid "Hun"
+msgstr "Mcr"
+
+#: ../rules/base.xml.in.h:239
+msgid "Hungary"
+msgstr "Macaristan"
+
+#: ../rules/base.xml.in.h:240
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper, Pencere tuşlarına eşlenir."
+
+#: ../rules/base.xml.in.h:241
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:242
+msgid "IBM Rapid Access"
+msgstr "IBM Hızlı Erişim"
+
+#: ../rules/base.xml.in.h:243
+msgid "IBM Rapid Access II"
+msgstr "IBM Hızlı Erişim II"
+
+#: ../rules/base.xml.in.h:244
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Hızlı Erişim II (diğer seçenek)"
+
+#: ../rules/base.xml.in.h:245
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:246
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:247 ../rules/sun.xml.in.h:61
+msgid "ISO Alternate"
+msgstr "ISO diÄŸer"
+
+#: ../rules/base.xml.in.h:248
+msgid "Iceland"
+msgstr "Ä°zlanda"
+
+#: ../rules/base.xml.in.h:249
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:250
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:251
+msgid "India"
+msgstr "Hindistan"
+
+#: ../rules/base.xml.in.h:252 ../rules/sun.xml.in.h:62
+msgid "International (with dead keys)"
+msgstr "Uluslararası (ölü tuşlarla)"
+
+#: ../rules/base.xml.in.h:253
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: ../rules/base.xml.in.h:254
+msgid "Iran"
+msgstr "Ä°ran"
+
+#: ../rules/base.xml.in.h:255
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../rules/base.xml.in.h:256
+msgid "Ireland"
+msgstr "Ä°rlanda"
+
+#: ../rules/base.xml.in.h:257
+msgid "Irl"
+msgstr "Ä°rl"
+
+#: ../rules/base.xml.in.h:258
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:259
+msgid "Irq"
+msgstr "Irk"
+
+#: ../rules/base.xml.in.h:260
+msgid "Isl"
+msgstr "Izl"
+
+#: ../rules/base.xml.in.h:261
+msgid "Isr"
+msgstr "Ä°br"
+
+#: ../rules/base.xml.in.h:262
+msgid "Israel"
+msgstr "Ä°srail"
+
+#: ../rules/base.xml.in.h:263 ../rules/sun.xml.in.h:63
+msgid "Ita"
+msgstr "Ä°ta"
+
+#: ../rules/base.xml.in.h:264
+msgid "Italy"
+msgstr "Ä°talya"
+
+#: ../rules/base.xml.in.h:265
+msgid "Japan"
+msgstr "Japonya"
+
+#: ../rules/base.xml.in.h:266
+msgid "Japan (PC-98xx Series)"
+msgstr "Japon (PC-98xx Series)"
+
+#: ../rules/base.xml.in.h:267
+msgid "Japanese 106-key"
+msgstr "Japonca 106 tuÅŸlu"
+
+#: ../rules/base.xml.in.h:268
+msgid "Japanese keyboard options"
+msgstr "Japonca klavye seçenekleri"
+
+#: ../rules/base.xml.in.h:269 ../rules/sun.xml.in.h:66
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:270
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:271
+msgid "Kana Lock key is locking"
+msgstr "Kana Lock tuÅŸu kilitler"
+
+#: ../rules/base.xml.in.h:272
+msgid "Kannada"
+msgstr "Güney Hint dili"
+
+#: ../rules/base.xml.in.h:273
+msgid "Kashubian"
+msgstr "Kaşubyalı"
+
+#: ../rules/base.xml.in.h:274
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:275
+msgid "Kazakh with Russian"
+msgstr "Kazak (rus)"
+
+#: ../rules/base.xml.in.h:276
+msgid "Kazakhstan"
+msgstr "Kazakistan"
+
+#: ../rules/base.xml.in.h:277
+msgid "Keypad"
+msgstr "Tuştakımı"
+
+#: ../rules/base.xml.in.h:278
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:279
+msgid "Khm"
+msgstr "Kım"
+
+#: ../rules/base.xml.in.h:280
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:281
+msgid "Korea, Republic of"
+msgstr "Kore Cumhuriyeti"
+
+#: ../rules/base.xml.in.h:282
+msgid "Korean 106-key"
+msgstr "Korece 106 tuÅŸlu"
+
+#: ../rules/base.xml.in.h:283
+msgid "Kotoistus"
+msgstr "Kotüstus"
+
+#: ../rules/base.xml.in.h:284
+msgid "Kurdish, (F)"
+msgstr "Kürtçe (Türkçe F klavye)"
+
+#: ../rules/base.xml.in.h:285
+msgid "Kurdish, Arabic-Latin"
+msgstr "Kürtçe (Arapça-Latin)"
+
+#: ../rules/base.xml.in.h:286
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Kürtçe (Türkçe Alt-Q klavye)"
+
+#: ../rules/base.xml.in.h:287
+msgid "Kurdish, Latin Q"
+msgstr "Kürtçe (Türkçe Q klavye)"
+
+#: ../rules/base.xml.in.h:288
+msgid "Kyr"
+msgstr "Kır"
+
+#: ../rules/base.xml.in.h:289
+msgid "Kyrgyzstan"
+msgstr "Kırgızistan"
+
+#: ../rules/base.xml.in.h:290
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:291
+msgid "LCtrl+LShift change layout."
+msgstr "Ctrl+Shift tuşları yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:292
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:293
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:294
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Dizüstü/defter Compaq (örn. Armada) Dizüstü Klavyesi"
+
+#: ../rules/base.xml.in.h:295
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Dizüstü/defter Compaq (örn. Presario) Genel Ağ Klavyesi"
+
+#: ../rules/base.xml.in.h:296
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Dizüstü/defter eMachines m68xx"
+
+#: ../rules/base.xml.in.h:297
+msgid "Latin"
+msgstr "Latin"
+
+#: ../rules/base.xml.in.h:298
+msgid "Latin American"
+msgstr "Latin Amerikanca"
+
+#: ../rules/base.xml.in.h:299
+msgid "Latin Unicode"
+msgstr "Latin Unicode"
+
+#: ../rules/base.xml.in.h:300
+msgid "Latin Unicode qwerty"
+msgstr "Latin Unicode qwerty"
+
+#: ../rules/base.xml.in.h:301
+msgid "Latin qwerty"
+msgstr "Latin qwerty"
+
+#: ../rules/base.xml.in.h:302
+msgid "Latin with guillemets"
+msgstr "Açılı ayraçlarla Latin"
+
+#: ../rules/base.xml.in.h:303
+msgid "Latvia"
+msgstr "Letonya"
+
+#: ../rules/base.xml.in.h:304
+msgid "Layout switching"
+msgstr "YerleÅŸim deÄŸiÅŸtirme "
+
+#: ../rules/base.xml.in.h:305
+msgid "Left Alt is swapped with left Win-key."
+msgstr "Soydaki Alt tuÅŸu ile soldaki Pencere tuÅŸu yerdeÄŸiÅŸtirir."
+
+#: ../rules/base.xml.in.h:306
+msgid "Left Alt key changes layout."
+msgstr "Soldaki Alt tuÅŸu yerleÅŸimi deÄŸiÅŸtirir."
+
+#: ../rules/base.xml.in.h:307
+msgid "Left Alt key switches layout while pressed."
+msgstr "Soldaki Alt tuşu basılıyken diğer yerleşimi etkin olur."
+
+#: ../rules/base.xml.in.h:308
+msgid "Left Ctrl key changes layout."
+msgstr "Soldaki Ctrl tuÅŸu yerleÅŸimi deÄŸiÅŸtirir."
+
+#: ../rules/base.xml.in.h:309
+msgid "Left Shift key changes layout."
+msgstr "Soldaki Shift tuÅŸu yerleÅŸimi deÄŸiÅŸtirir."
+
+#: ../rules/base.xml.in.h:310
+msgid "Left Win-key changes layout."
+msgstr "Soldaki Pencere tuÅŸu yerleÅŸimi deÄŸiÅŸtirir."
+
+#: ../rules/base.xml.in.h:311
+msgid "Left Win-key is Compose."
+msgstr "Soldaki Pencere tuÅŸu karakter birleÅŸimi yapar."
+
+#: ../rules/base.xml.in.h:312
+msgid "Left Win-key switches layout while pressed."
+msgstr "Soldaki Win tuşu basılıyken diğer yerleşim etkin olur."
+
+#: ../rules/base.xml.in.h:313
+msgid "Left hand"
+msgstr "Solak"
+
+#: ../rules/base.xml.in.h:314
+msgid "Left handed Dvorak"
+msgstr "Solak Dvorak"
+
+#: ../rules/base.xml.in.h:315
+msgid "Lithuania"
+msgstr "Litvanya"
+
+#: ../rules/base.xml.in.h:316
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:317
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Kablosuz Masaüstü"
+
+#: ../rules/base.xml.in.h:318
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Kablosuz Masaüstü LX-300"
+
+#: ../rules/base.xml.in.h:319
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Kablosuz Masaüstü Tarayıcı"
+
+#: ../rules/base.xml.in.h:320
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Kablosuz Masaüstü Optik"
+
+#: ../rules/base.xml.in.h:321
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Kablosuz Masaüstü Pro"
+
+#: ../rules/base.xml.in.h:322
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Kablosuz Masaüstü Pro (diğer seçenek)"
+
+#: ../rules/base.xml.in.h:323
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Kablosuz Masaüstü Pro (diğer 2. seçenek)"
+
+#: ../rules/base.xml.in.h:324
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Kablosuz Masaüstü iTouch"
+
+#: ../rules/base.xml.in.h:325
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Kablosuz Özgür/Masaüstü Tarayıcı"
+
+#: ../rules/base.xml.in.h:326
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15, G15daemon üzerinden ek tuşlu"
+
+#: ../rules/base.xml.in.h:327
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Genel AÄŸ Klavyesi"
+
+#: ../rules/base.xml.in.h:328
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Genel Ağ Tarayıcı Klavyesi"
+
+#: ../rules/base.xml.in.h:329
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:330
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech Access Klavye"
+
+#: ../rules/base.xml.in.h:331
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:332
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Kablosuz Klavyesi (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:333
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Genel Ağ Tarayıcı Klavyesi SE"
+
+#: ../rules/base.xml.in.h:334
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Genel Ağ Tarayıcı Klavyesi SE (USB)"
+
+#: ../rules/base.xml.in.h:335
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:336
+msgid "Lva"
+msgstr "Lva"
+
+#: ../rules/base.xml.in.h:337
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:338
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:339
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Uluslararası)"
+
+#: ../rules/base.xml.in.h:340
+msgid "Macedonia"
+msgstr "Makedonya"
+
+#: ../rules/base.xml.in.h:341
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:342
+msgid "Macintosh Old"
+msgstr "Eski Macintosh"
+
+#: ../rules/base.xml.in.h:343
+msgid "Macintosh, Sun dead keys"
+msgstr "Makintoş, Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:344
+msgid "Macintosh, eliminate dead keys"
+msgstr "Makintoş, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:345
+msgid "Make CapsLock an additional Ctrl."
+msgstr "CapsLock tuÅŸunu ek bir Ctrl tuÅŸu yapar."
+
+#: ../rules/base.xml.in.h:346
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:347
+msgid "Malayalam"
+msgstr "Malayalam dili"
+
+#: ../rules/base.xml.in.h:348
+msgid "Maldives"
+msgstr "Maldivler"
+
+#: ../rules/base.xml.in.h:349
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:350
+msgid "Maltese keyboard with US layout"
+msgstr "Ameriken yerleşimli Maltız klavyesi"
+
+#: ../rules/base.xml.in.h:351
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:352
+msgid "Maori"
+msgstr "Mayorka"
+
+#: ../rules/base.xml.in.h:353
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:354
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ EriÅŸim Klavyesi"
+
+#: ../rules/base.xml.in.h:355
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:356
+msgid "Menu is Compose."
+msgstr "Menü tuşu karakter birleşimi yapar."
+
+#: ../rules/base.xml.in.h:357
+msgid "Menu key changes layout."
+msgstr "Menü tuşu yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:358
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta, Win tuşları ile eşleştirilir."
+
+#: ../rules/base.xml.in.h:359
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta, soldaki Win tuÅŸu ile eÅŸleÅŸtirilir."
+
+#: ../rules/base.xml.in.h:360
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Genel AÄŸ Klavyesi"
+
+#: ../rules/base.xml.in.h:361
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Genel Ağ Klavyesi Pro, İsveçce"
+
+#: ../rules/base.xml.in.h:362
+msgid "Microsoft Natural"
+msgstr "Microsoft Basit"
+
+#: ../rules/base.xml.in.h:363
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Basit Klavye Pro / Microsoft Genel AÄŸ Klavyesi Pro"
+
+#: ../rules/base.xml.in.h:364
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Basit Klavye Pro OEM"
+
+#: ../rules/base.xml.in.h:365
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:366
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Ofis Klavyesi"
+
+#: ../rules/base.xml.in.h:367
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:368 ../rules/sun.xml.in.h:72
+msgid "Miscellaneous compatibility options"
+msgstr "Çeşitli uyumluluk seçenekleri"
+
+#: ../rules/base.xml.in.h:369
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:370
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:371
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:372
+msgid "Mng"
+msgstr "MoÄŸ"
+
+#: ../rules/base.xml.in.h:373
+msgid "Mongolia"
+msgstr "MoÄŸolistan"
+
+#: ../rules/base.xml.in.h:374
+msgid "Morocco"
+msgstr "Fas"
+
+#: ../rules/base.xml.in.h:375 ../rules/sun.xml.in.h:73
+msgid "Multilingual"
+msgstr "Çokdilli"
+
+#: ../rules/base.xml.in.h:376
+msgid "Multilingual, first part"
+msgstr "Çokdilli, ilk bölüm"
+
+#: ../rules/base.xml.in.h:377 ../rules/sun.xml.in.h:74
+msgid "Multilingual, second part"
+msgstr "Çokdilli, ikinci bölüm"
+
+#: ../rules/base.xml.in.h:378
+msgid "Myanmar"
+msgstr "Miyanmar"
+
+#: ../rules/base.xml.in.h:379
+msgid "NICOLA-F style Backspace"
+msgstr "NICOLA-F tarzı Gerisilme"
+
+#: ../rules/base.xml.in.h:380
+msgid "Neostyle"
+msgstr "Yenitarz"
+
+#: ../rules/base.xml.in.h:381
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:382
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../rules/base.xml.in.h:383
+msgid "Netherlands"
+msgstr "Hollanda"
+
+#: ../rules/base.xml.in.h:384
+msgid "Nig"
+msgstr "Nij"
+
+#: ../rules/base.xml.in.h:385
+msgid "Nigeria"
+msgstr "Nijerya"
+
+#: ../rules/base.xml.in.h:386
+msgid "Nld"
+msgstr "Hol"
+
+#: ../rules/base.xml.in.h:387 ../rules/sun.xml.in.h:75
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:388
+msgid "Northern Saami"
+msgstr "Kuzey Sami"
+
+#: ../rules/base.xml.in.h:389
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Kuzey Sami, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:390
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:391
+msgid "Norway"
+msgstr "Norveç"
+
+#: ../rules/base.xml.in.h:392
+msgid "NumLock LED shows alternative layout."
+msgstr "Num_Lock LED'i diğer yerleşimi gösterir."
+
+#: ../rules/base.xml.in.h:393
+msgid "Numeric keypad keys work as with Mac."
+msgstr "Tuştakımı Mac gibi çalışır."
+
+#: ../rules/base.xml.in.h:394
+msgid "Numeric keypad layout selection"
+msgstr "Sayısal tuştakımı yerleşimi seçimi"
+
+#: ../rules/base.xml.in.h:395
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:396
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:397
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:398
+msgid "Oriya"
+msgstr "Orissa dili"
+
+#: ../rules/base.xml.in.h:399
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/Genel AÄŸ Klavyesi"
+
+#: ../rules/base.xml.in.h:400
+msgid "Ossetian"
+msgstr "Osetya"
+
+#: ../rules/base.xml.in.h:401
+msgid "Ossetian, Winkeys"
+msgstr "Osetya, Pencere tuşları"
+
+#: ../rules/base.xml.in.h:402
+msgid "PC-98xx Series"
+msgstr "PC-98xx Serisi"
+
+#: ../rules/base.xml.in.h:403
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:404
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:405
+msgid "Pashto"
+msgstr "PaÅŸto"
+
+#: ../rules/base.xml.in.h:406
+msgid "Pattachote"
+msgstr "Pataküte"
+
+#: ../rules/base.xml.in.h:407 ../rules/sun.xml.in.h:78
+msgid "Phonetic"
+msgstr "Fonetik"
+
+#: ../rules/base.xml.in.h:408 ../rules/sun.xml.in.h:79
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:409
+msgid "Poland"
+msgstr "Polonya"
+
+#: ../rules/base.xml.in.h:410
+msgid "Polytonic"
+msgstr "Politonik"
+
+#: ../rules/base.xml.in.h:411
+msgid "Portugal"
+msgstr "Portekiz"
+
+#: ../rules/base.xml.in.h:412
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "3. seviyeyi seçmek için soldaki Alt tuşuna basın."
+
+#: ../rules/base.xml.in.h:413
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "3. seviyeyi seçmek için soldaki Win tuşuna basın."
+
+#: ../rules/base.xml.in.h:414
+msgid "Press Menu key to choose 3rd level."
+msgstr "3. seviyeyi seçmek için Menü tuşuna basın."
+
+#: ../rules/base.xml.in.h:415
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın, Sağdaki Alt tuşuyla birlikte Shift tuşu AltGr gibi davranır."
+
+#: ../rules/base.xml.in.h:416
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın."
+
+#: ../rules/base.xml.in.h:417
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "3. seviyeyi seçmek için sağdaki Ctrl tuşuna basın."
+
+#: ../rules/base.xml.in.h:418
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "3. seviyeyi seçmek için sağdaki Win tuşuna basın."
+
+#: ../rules/base.xml.in.h:419
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "3. seviyeyi seçmek için Alt tuşlarından birine basın."
+
+#: ../rules/base.xml.in.h:420
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "3. seviyeyi seçmek için Win tuşlarından birine basın."
+
+#: ../rules/base.xml.in.h:421
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:422
+msgid "Pro Keypad"
+msgstr "Pro Klavye"
+
+#: ../rules/base.xml.in.h:423
+msgid "Probhat"
+msgstr "Probat"
+
+#: ../rules/base.xml.in.h:424
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:425 ../rules/sun.xml.in.h:88
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:426
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:427
+msgid "R-Alt switches layout while pressed."
+msgstr "Sağdaki Alt tuşu basılıyken diğer yerleşim etkin olur."
+
+#: ../rules/base.xml.in.h:428
+msgid "Right Alt is Compose."
+msgstr "SaÄŸdaki Alt tuÅŸu karakter birleÅŸimi yapar."
+
+#: ../rules/base.xml.in.h:429
+msgid "Right Alt key changes layout."
+msgstr "SaÄŸdaki Alt tuÅŸu yerleÅŸimi deÄŸiÅŸtirir."
+
+#: ../rules/base.xml.in.h:430 ../rules/sun.xml.in.h:90
+msgid "Right Alt key never chooses 3rd level."
+msgstr "Sağdaki Alt tuşu 3. seviyeyi asla seçmez."
+
+#: ../rules/base.xml.in.h:431
+msgid "Right Ctrl is Compose."
+msgstr "SaÄŸdaki Ctrl tuÅŸu karakter birleÅŸimi yapar."
+
+#: ../rules/base.xml.in.h:432
+msgid "Right Ctrl key changes layout."
+msgstr "SaÄŸdaki Ctrl tuÅŸu yerleÅŸimi deÄŸiÅŸtirir."
+
+#: ../rules/base.xml.in.h:433
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "Sağdaki Ctrl tuşu basılıyken diğer yerleşim etkin olur."
+
+#: ../rules/base.xml.in.h:434
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Sağdaki Ctrl tuşu sağdaki Alt tuşu gibi çalışır."
+
+#: ../rules/base.xml.in.h:435
+msgid "Right Shift key changes layout."
+msgstr "SaÄŸdaki Shift tuÅŸu yerleÅŸimi deÄŸiÅŸtirir."
+
+#: ../rules/base.xml.in.h:436
+msgid "Right Win-key changes layout."
+msgstr "SaÄŸdaki Win tuÅŸu yerleÅŸimi deÄŸiÅŸtirir."
+
+#: ../rules/base.xml.in.h:437
+msgid "Right Win-key is Compose."
+msgstr "SaÄŸdaki Win tuÅŸu karakter birleÅŸimi yapar."
+
+#: ../rules/base.xml.in.h:438
+msgid "Right Win-key switches layout while pressed."
+msgstr "Sağdaki Win tuşu basılıyken diğer yerleşim etkin olur."
+
+#: ../rules/base.xml.in.h:439
+msgid "Right hand"
+msgstr "SaÄŸ el"
+
+#: ../rules/base.xml.in.h:440
+msgid "Right handed Dvorak"
+msgstr "SaÄŸ elle Dvorak"
+
+#: ../rules/base.xml.in.h:441
+msgid "Romania"
+msgstr "Romenya"
+
+#: ../rules/base.xml.in.h:442
+msgid "Romanian keyboard with German letters"
+msgstr "Alman harfleriyle Romanya klavyesi"
+
+#: ../rules/base.xml.in.h:443
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Alman harfleriyle Romanya klavyesi, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:444
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:445 ../rules/sun.xml.in.h:95
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:446
+msgid "Russia"
+msgstr "Rusya"
+
+#: ../rules/base.xml.in.h:447 ../rules/sun.xml.in.h:96
+msgid "Russian"
+msgstr "Rusça"
+
+#: ../rules/base.xml.in.h:448
+msgid "Russian phonetic"
+msgstr "Rusça fonetik"
+
+#: ../rules/base.xml.in.h:449
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Rusça fonetik, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:450
+msgid "Russian with Kazakh"
+msgstr "Rusça (kazak)"
+
+#: ../rules/base.xml.in.h:451
+msgid "SCG"
+msgstr "SCG"
+
+#: ../rules/base.xml.in.h:452
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Çokluortam Kablosuz Klavyesi"
+
+#: ../rules/base.xml.in.h:453
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:454
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:455
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:456
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:457
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomik 2500"
+
+#: ../rules/base.xml.in.h:458
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:459
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:460
+msgid "ScrollLock LED shows alternative layout."
+msgstr "Scroll_Lock LED'i diğer yerleşimi gösterir."
+
+#: ../rules/base.xml.in.h:461
+msgid "Serbia and Montenegro"
+msgstr "Sırbistan ve Karadağ"
+
+#: ../rules/base.xml.in.h:462
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "Sayısal tuştakımı Shift ile  MS Windows'daki gibi çalışır."
+
+#: ../rules/base.xml.in.h:463
+msgid "Shift+CapsLock changes layout."
+msgstr "Shift+CapsLock tuşları yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:464
+msgid "Slovakia"
+msgstr "Slovakya"
+
+#: ../rules/base.xml.in.h:465
+msgid "Slovenia"
+msgstr "Slovenya"
+
+#: ../rules/base.xml.in.h:466
+msgid "South Africa"
+msgstr "Güney Afrika"
+
+#: ../rules/base.xml.in.h:467
+msgid "Southern Uzbek"
+msgstr "Güney Özbekistan"
+
+#: ../rules/base.xml.in.h:468
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Boşluk tuşu nobreakspace'i dördüncü seviyede çıktılar, altıncı seviyede incesini basar"
+
+#: ../rules/base.xml.in.h:469
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr "Boşluk tuşu nobreakspace'i dördüncü seviyede çıktılar."
+
+#: ../rules/base.xml.in.h:470
+msgid "Space key outputs non-breakable space character at second level."
+msgstr "Boşluk tuşu nobreakspace'i ikinci seviyede çıktılar."
+
+#: ../rules/base.xml.in.h:471
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr "Boşluk tuşu nobreakspace'i dördüncü seviyede çıktılar, üçüncü işlevsizdir."
+
+#: ../rules/base.xml.in.h:472
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Boşluk tuşu üçüncü seviyede nobreakspace basar, dördüncü seviyede incesini basar"
+
+#: ../rules/base.xml.in.h:473
+msgid "Space key outputs non-breakable space character at third level."
+msgstr "Boşluk tuşu nobreakspace'i üçüncü seviyede çıktılar."
+
+#: ../rules/base.xml.in.h:474
+msgid "Space key outputs usual space at any level."
+msgstr "BoÅŸluk tuÅŸu her seviyede boÅŸluk basar (nobreakspace basmaz)."
+
+#: ../rules/base.xml.in.h:475
+msgid "Spain"
+msgstr "Ä°spanya"
+
+#: ../rules/base.xml.in.h:476 ../rules/sun.xml.in.h:103
+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;)"
+
+#: ../rules/base.xml.in.h:477
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:478
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../rules/base.xml.in.h:479 ../rules/sun.xml.in.h:104
+msgid "Standard"
+msgstr "Standart"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:481
+msgid "Standard RSTU"
+msgstr "Standart RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:483
+msgid "Standard RSTU on Russian layout"
+msgstr "Rusça yerleşimde standart RSTU"
+
+#: ../rules/base.xml.in.h:484 ../rules/sun.xml.in.h:112
+msgid "Sun dead keys"
+msgstr "Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:485
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:486
+msgid "Super is mapped to the Win-keys."
+msgstr "Super, Pencere tuşlarına eşlenir."
+
+#: ../rules/base.xml.in.h:487
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:488 ../rules/sun.xml.in.h:113
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:489
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:490
+msgid "Swap Ctrl and CapsLock."
+msgstr "Ctrl ile Caps Lock yer deÄŸiÅŸtirir."
+
+#: ../rules/base.xml.in.h:491
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr "Makintoş klavyeler çekirdek tarafından algılanamadığında iki seviyeli tuş kodlarına geçilir."
+
+#: ../rules/base.xml.in.h:492 ../rules/sun.xml.in.h:115
+msgid "Swe"
+msgstr "Ä°sve"
+
+#: ../rules/base.xml.in.h:493
+msgid "Sweden"
+msgstr "İsveç"
+
+#: ../rules/base.xml.in.h:494
+msgid "Switzerland"
+msgstr "İsviçre"
+
+#: ../rules/base.xml.in.h:495
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:496
+msgid "Syr"
+msgstr "Sur"
+
+#: ../rules/base.xml.in.h:497
+msgid "Syria"
+msgstr "Suriye"
+
+#: ../rules/base.xml.in.h:498
+msgid "Syriac"
+msgstr "Suriye"
+
+#: ../rules/base.xml.in.h:499
+msgid "Syriac phonetic"
+msgstr "Suriye fonetik"
+
+#: ../rules/base.xml.in.h:500
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:501
+msgid "Tajikistan"
+msgstr "Tacikistan"
+
+#: ../rules/base.xml.in.h:502
+msgid "Tamil"
+msgstr "Tamil dili"
+
+#: ../rules/base.xml.in.h:503
+msgid "Tamil TAB Typewriter"
+msgstr "Tamil TAB Daktilo"
+
+#: ../rules/base.xml.in.h:504
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamil TSCII Daktilo"
+
+#: ../rules/base.xml.in.h:505
+msgid "Tamil Unicode"
+msgstr "Tamil Unicode"
+
+#: ../rules/base.xml.in.h:506
+msgid "Tatar"
+msgstr "Tatar"
+
+#: ../rules/base.xml.in.h:507
+msgid "Telugu"
+msgstr "Telugu dili"
+
+#: ../rules/base.xml.in.h:508
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:509
+msgid "Thailand"
+msgstr "Tayland"
+
+#: ../rules/base.xml.in.h:510 ../rules/sun.xml.in.h:119
+msgid "Third level choosers"
+msgstr "3. seviye seçiciler"
+
+#: ../rules/base.xml.in.h:511
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#: ../rules/base.xml.in.h:512
+msgid "Tifinagh Alternative"
+msgstr "Tifinagh DiÄŸer"
+
+#: ../rules/base.xml.in.h:513
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Tifinagh DiÄŸer Fonetik"
+
+#: ../rules/base.xml.in.h:514
+msgid "Tifinagh Extended"
+msgstr "Tifinagh GeliÅŸkin"
+
+#: ../rules/base.xml.in.h:515
+msgid "Tifinagh Extended Phonetic"
+msgstr "Tifinagh GeliÅŸmiÅŸ Fonetik"
+
+#: ../rules/base.xml.in.h:516
+msgid "Tifinagh Phonetic"
+msgstr "Tifinagh Fonetik"
+
+#: ../rules/base.xml.in.h:517
+msgid "Tilde (~) variant"
+msgstr "Tilde (~) tuÅŸlu"
+
+#: ../rules/base.xml.in.h:518
+msgid "Tjk"
+msgstr "Tck"
+
+#: ../rules/base.xml.in.h:519
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:520
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust DoÄŸrudan EriÅŸimli Klavye"
+
+#: ../rules/base.xml.in.h:521
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Kablosuz Klasik Klavye"
+
+#: ../rules/base.xml.in.h:522 ../rules/sun.xml.in.h:120
+msgid "Tur"
+msgstr "Trk"
+
+#: ../rules/base.xml.in.h:523
+msgid "Turkey"
+msgstr "Türkiye"
+
+#: ../rules/base.xml.in.h:524
+msgid "Typewriter"
+msgstr "Daktilo"
+
+#: ../rules/base.xml.in.h:525 ../rules/sun.xml.in.h:124
+msgid "U.S. English"
+msgstr "Amerikan ingilizcesi"
+
+#: ../rules/base.xml.in.h:526
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Bosna ikil harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:527
+msgid "US keyboard with Bosnian letters"
+msgstr "Bosna harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:528
+msgid "US keyboard with Croatian digraphs"
+msgstr "Hırvat ikil harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:529
+msgid "US keyboard with Croatian letters"
+msgstr "Hırvat harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:530
+msgid "US keyboard with Lithuanian letters"
+msgstr "Litvanya harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:531
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Sloven ikil harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:532
+msgid "US keyboard with Slovenian letters"
+msgstr "Sloven harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:533 ../rules/sun.xml.in.h:126
+msgid "USA"
+msgstr "ABD"
+
+#: ../rules/base.xml.in.h:534
+msgid "Udmurt"
+msgstr "Udmurt"
+
+#: ../rules/base.xml.in.h:535
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:536
+msgid "Ukraine"
+msgstr "Ukrayna"
+
+#: ../rules/base.xml.in.h:537
+msgid "UnicodeExpert"
+msgstr "Unicode Uzman"
+
+#: ../rules/base.xml.in.h:538 ../rules/sun.xml.in.h:127
+msgid "United Kingdom"
+msgstr "Ä°ngiltere"
+
+#: ../rules/base.xml.in.h:539
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../rules/base.xml.in.h:540
+msgid "Use Bosnian digraphs"
+msgstr "Bosna ikil harflerini kullanır"
+
+#: ../rules/base.xml.in.h:541
+msgid "Use Croatian digraphs"
+msgstr "Hırvat ikil harflerini kullanır"
+
+#: ../rules/base.xml.in.h:542
+msgid "Use Slovenian digraphs"
+msgstr "Sloven ikil harflerini kullanır"
+
+#: ../rules/base.xml.in.h:543
+msgid "Use guillemets for quotes"
+msgstr "Tırnakların yerine açılı ayraçlar kullanılır"
+
+#: ../rules/base.xml.in.h:544
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Diğer yerleşimi göstermek için klavye LED'i kullanılır."
+
+#: ../rules/base.xml.in.h:545
+msgid "Use keypad with unicode additions (arrows and math operators)"
+msgstr "Tuştakımı Unicode eklentileri ile kullanılır (ok ve aritmetik tuşları)"
+
+#: ../rules/base.xml.in.h:546
+msgid "Using space key to input non-breakable space character"
+msgstr "nobreakspace'i yazmak için boşluk tuşu kullanımı"
+
+#: ../rules/base.xml.in.h:547
+msgid "Uzb"
+msgstr "Özb"
+
+#: ../rules/base.xml.in.h:548
+msgid "Uzbekistan"
+msgstr "Özbekistan"
+
+#: ../rules/base.xml.in.h:549
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../rules/base.xml.in.h:550
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:551
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:552
+msgid "Western"
+msgstr "Batı"
+
+#: ../rules/base.xml.in.h:553
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:554
+msgid "Winkeys"
+msgstr "Win tuşları"
+
+#: ../rules/base.xml.in.h:555
+msgid "With &lt;\\|&gt; key"
+msgstr "&lt;\\|&gt; tuÅŸuyla"
+
+#: ../rules/base.xml.in.h:556
+msgid "With EuroSign on 5"
+msgstr "€ sembolü ile 5 tuşu"
+
+#: ../rules/base.xml.in.h:557
+msgid "With guillemets"
+msgstr "Açılı ayraçlarla"
+
+#: ../rules/base.xml.in.h:558
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Genel AÄŸ Klavyesi"
+
+#: ../rules/base.xml.in.h:559
+msgid "Yoruba"
+msgstr "Yoruba"
+
+#: ../rules/base.xml.in.h:560
+msgid "Z and ZHE swapped"
+msgstr "Z ile ZHE yer deÄŸiÅŸtirir"
+
+#: ../rules/base.xml.in.h:561
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:562
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:563
+msgid "azerty/digits"
+msgstr "azerty/rakamlar"
+
+#: ../rules/base.xml.in.h:564
+msgid "digits"
+msgstr "rakamlar"
+
+#: ../rules/base.xml.in.h:565
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "noktalı virgül ve çift tırnak kalkar (atıl)"
+
+#: ../rules/base.xml.in.h:566
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:567 ../rules/sun.xml.in.h:132
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:568
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, galiÅŸmiÅŸ Gerisilme"
+
+#: ../rules/base.xml.in.h:569
+msgid "qwerty/digits"
+msgstr "qwerty/rakamlar"
+
+#: ../rules/base.xml.in.h:570
+msgid "qwertz"
+msgstr "qwertz"
+
+#: ../rules/sun.xml.in.h:1
+msgid "\"Typewriter\""
+msgstr "\"Daktilo\""
+
+#: ../rules/sun.xml.in.h:17
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu ise Caps Lock tuşunu keser."
+
+#: ../rules/sun.xml.in.h:18
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu Caps Lock'u kesmez"
+
+#: ../rules/sun.xml.in.h:19
+msgid "Alt+Control changes group"
+msgstr "Alt+Ctrl grubu deÄŸiÅŸtirir."
+
+#: ../rules/sun.xml.in.h:20
+msgid "Alt+Shift changes group"
+msgstr "Alt+Shift  grubu deÄŸiÅŸtirir."
+
+#: ../rules/sun.xml.in.h:21
+msgid "Basic"
+msgstr "Temel"
+
+#: ../rules/sun.xml.in.h:23
+msgid "Belgian"
+msgstr "Belçikaca"
+
+#: ../rules/sun.xml.in.h:25
+msgid "Both Alt keys together change group"
+msgstr "Alt tuşları birlikte grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:26
+msgid "Both Ctrl keys together change group"
+msgstr "Ctrl tuşları birlikte grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:27
+msgid "Both Shift keys together change group"
+msgstr "Shift tuşları birlikte grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:28
+msgid "Bulgarian"
+msgstr "Bulgarca"
+
+#: ../rules/sun.xml.in.h:30
+msgid "Canadian"
+msgstr "Kanadaca"
+
+#: ../rules/sun.xml.in.h:31
+msgid "Caps Lock is Compose"
+msgstr "CapsLock tuÅŸu karakter birleÅŸimi yapar"
+
+#: ../rules/sun.xml.in.h:32
+msgid "Caps Lock key changes group"
+msgstr "Caps Lock tuÅŸu grubu deÄŸiÅŸtirir"
+
+#: ../rules/sun.xml.in.h:34
+msgid "Caps_Lock LED shows alternative group"
+msgstr "Caps Lock LED'i diğer grubu gösterir"
+
+#: ../rules/sun.xml.in.h:35
+msgid "Control Key Position"
+msgstr "Ctrl tuÅŸunun yeri"
+
+#: ../rules/sun.xml.in.h:36
+msgid "Control key at bottom left"
+msgstr "Sol alttaki Ctrl tuÅŸu"
+
+#: ../rules/sun.xml.in.h:37
+msgid "Control key at left of 'A'"
+msgstr "'A'nın solundaki Ctrl Tuşu"
+
+#: ../rules/sun.xml.in.h:38
+msgid "Control+Shift changes group"
+msgstr "Ctrl+Shift tuşları grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:40
+msgid "Czech"
+msgstr "Çekçe"
+
+#: ../rules/sun.xml.in.h:41
+msgid "Danish"
+msgstr "Danca"
+
+#: ../rules/sun.xml.in.h:45
+msgid "DeuCH"
+msgstr "DeuCH"
+
+#: ../rules/sun.xml.in.h:47
+msgid "Dvo"
+msgstr "Dvo"
+
+#: ../rules/sun.xml.in.h:52
+msgid "Finnish"
+msgstr "Fince"
+
+#: ../rules/sun.xml.in.h:54
+msgid "FraCH"
+msgstr "FraCH"
+
+#: ../rules/sun.xml.in.h:57
+msgid "German"
+msgstr "Almanca"
+
+#: ../rules/sun.xml.in.h:58
+msgid "Group Shift/Lock behavior"
+msgstr "Shift/Lock Grubu davranışı"
+
+#: ../rules/sun.xml.in.h:60
+msgid "Hungarian"
+msgstr "Macarca"
+
+#: ../rules/sun.xml.in.h:64
+msgid "Italian"
+msgstr "Ä°talyanca"
+
+#: ../rules/sun.xml.in.h:65
+msgid "Japanese"
+msgstr "Japonca"
+
+#: ../rules/sun.xml.in.h:67
+msgid "Left Alt key changes group"
+msgstr "Soldaki Alt tuÅŸu grubu deÄŸiÅŸtirir"
+
+#: ../rules/sun.xml.in.h:68
+msgid "Left Alt key switches group while pressed"
+msgstr "Soldaki Alt tuşu basılıyken diğer grup etkin olur"
+
+#: ../rules/sun.xml.in.h:69
+msgid "Left Ctrl key changes group"
+msgstr "Soldaki Ctrl tuÅŸu grubu deÄŸiÅŸtirir"
+
+#: ../rules/sun.xml.in.h:70
+msgid "Left Shift key changes group"
+msgstr "Soldaki Shift tuÅŸu grubu deÄŸiÅŸtirir"
+
+#: ../rules/sun.xml.in.h:71
+msgid "Make CapsLock an additional Control"
+msgstr "CapsLock tuÅŸunu ek bir Ctrl tuÅŸu yapar"
+
+#: ../rules/sun.xml.in.h:76
+msgid "Norwegian"
+msgstr "Norveçce"
+
+#: ../rules/sun.xml.in.h:77
+msgid "Num_Lock LED shows alternative group"
+msgstr "Num_Lock LED'i diğer grubu gösterir"
+
+#: ../rules/sun.xml.in.h:80
+msgid "Polish"
+msgstr "Polonez"
+
+#: ../rules/sun.xml.in.h:81
+msgid "Polish with Polish quotes on key \"1/!\""
+msgstr "Lehçe, \"1/!\" tuşunda Lehçe tırnaklar"
+
+#: ../rules/sun.xml.in.h:82
+msgid "Portuguese"
+msgstr "Portekizce"
+
+#: ../rules/sun.xml.in.h:83
+msgid "Press Left Alt key to choose 3rd level"
+msgstr "3. seviyeyi seçmek için soldaki Alt tuşuna basın"
+
+#: ../rules/sun.xml.in.h:84
+msgid "Press Right Alt key to choose 3rd level"
+msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın"
+
+#: ../rules/sun.xml.in.h:85
+msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın, Sağdaki Alt tuşuyla birlikte Shift tuşu AltGr gibi davranır"
+
+#: ../rules/sun.xml.in.h:86
+msgid "Press Right Control to choose 3rd level"
+msgstr "3. seviyeyi seçmek için sağdaki Ctrl tuşuna basın"
+
+#: ../rules/sun.xml.in.h:87
+msgid "Press any of Alt keys to choose 3rd level"
+msgstr "3. seviyeyi seçmek için Alt tuşlarından birine basın"
+
+#: ../rules/sun.xml.in.h:89
+msgid "Right Alt key changes group"
+msgstr "SaÄŸdaki Alt tuÅŸu grubu deÄŸiÅŸtirir"
+
+#: ../rules/sun.xml.in.h:91
+msgid "Right Alt switches group while pressed"
+msgstr "Sağdaki Alt tuşu basılıyken diğer grup etkin olur"
+
+#: ../rules/sun.xml.in.h:92
+msgid "Right Control key works as Right Alt"
+msgstr "Sağdaki Ctrl tuşu sağdaki Alt tuşu gibi çalışır"
+
+#: ../rules/sun.xml.in.h:93
+msgid "Right Ctrl key changes group"
+msgstr "SaÄŸdaki Ctrl tuÅŸu grubu deÄŸiÅŸtirir"
+
+#: ../rules/sun.xml.in.h:94
+msgid "Right Shift key changes group"
+msgstr "SaÄŸdaki Shift tuÅŸu grubu deÄŸiÅŸtirir"
+
+#: ../rules/sun.xml.in.h:97
+msgid "Scroll Lock changes group"
+msgstr "Scroll Lock grubu deÄŸiÅŸtirir"
+
+#: ../rules/sun.xml.in.h:98
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "Scroll_Lock LED'i diğer grubu gösterir"
+
+#: ../rules/sun.xml.in.h:99
+msgid "Shift with numpad keys works as in MS Windows"
+msgstr "Sayısal tuştakımı Shift ile  MS Windows'daki gibi çalışır"
+
+#: ../rules/sun.xml.in.h:100
+msgid "Shift+CapsLock changes group"
+msgstr "Shift+CapsLock tuşları grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:101
+msgid "Slovak"
+msgstr "Slovakça"
+
+#: ../rules/sun.xml.in.h:102
+msgid "Spanish"
+msgstr "Ä°spanyolca"
+
+#: ../rules/sun.xml.in.h:105
+msgid "Sun Type 4"
+msgstr "Sun 4. tür"
+
+#: ../rules/sun.xml.in.h:106
+msgid "Sun Type 5"
+msgstr "Sun 5. Tür"
+
+#: ../rules/sun.xml.in.h:107
+msgid "Sun Type 5 European"
+msgstr "Sun 5. tür Avrupa"
+
+#: ../rules/sun.xml.in.h:108
+msgid "Sun Type 5 Unix"
+msgstr "Sun 5. tür, Unix"
+
+#: ../rules/sun.xml.in.h:109
+msgid "Sun Type 6"
+msgstr "Sun 6. tür"
+
+#: ../rules/sun.xml.in.h:110
+msgid "Sun Type 6 Unix"
+msgstr "Sun 6. tür, Unix"
+
+#: ../rules/sun.xml.in.h:111
+msgid "Sun Type 6 with Euro key"
+msgstr "Sun 6. Tür, € tuşlu"
+
+#: ../rules/sun.xml.in.h:114
+msgid "Swap Control and Caps Lock"
+msgstr "Ctrl ile Caps Lock yer deÄŸiÅŸtirir"
+
+#: ../rules/sun.xml.in.h:116
+msgid "Swedish"
+msgstr "İsveçce"
+
+#: ../rules/sun.xml.in.h:117
+msgid "Swiss French"
+msgstr "İsviçre Fransızcası"
+
+#: ../rules/sun.xml.in.h:118
+msgid "Swiss German"
+msgstr "İsviçre Almancası"
+
+#: ../rules/sun.xml.in.h:121
+msgid "Turkish"
+msgstr "Türkçe Q Klavye"
+
+#: ../rules/sun.xml.in.h:122
+msgid "Turkish (F)"
+msgstr "Türkçe F klavye"
+
+#: ../rules/sun.xml.in.h:123
+msgid "Turkish Alt-Q Layout"
+msgstr "Türkçe Alt-Q (yazılımcılar ve dizüstü) klavye"
+
+#: ../rules/sun.xml.in.h:125
+msgid "U.S. English w/ ISO9995-3"
+msgstr "Amerikan ingilizcesi (ISO9995-3 ile)"
+
+#: ../rules/sun.xml.in.h:128
+msgid "Use keyboard LED to show alternative group"
+msgstr "Diğer grubu göstermek içim klavye LED'i kullanılır"
+
+#: ../rules/sun.xml.in.h:129
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr "CapsLock dahili dönüşümü kullanılır, Shift tuşu Caps Lock tuşunu keser."
+
+#: ../rules/sun.xml.in.h:130
+msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+msgstr "CapsLock dahili dönüşümü kullanır. Shift tuşu Caps Lock'u kesmez."
+
+#: ../rules/sun.xml.in.h:131
+msgid "bksl"
+msgstr "bksl"
+
+#: ../rules/sun.xml.in.h:133
+msgid "type4"
+msgstr "4. tür"
diff --git a/xorg-server/xkbdata.src/po/uk.po b/xorg-server/xkbdata.src/po/uk.po
new file mode 100644
index 000000000..2c655a2dc
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/uk.po
@@ -0,0 +1,2630 @@
+# translation of xkeyboard-config-1.4-pre1.po to Ukrainian
+# Ukrainian translation to xkeyboard-config
+# Copyright (C) 2002, 2007, 2008 Free Software Foundation, Inc.
+# Sergey V. Udaltsov <svu@users.sourceforge.net>
+#
+# This file is distributed under the same license as the xkeyboard-config package.
+# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
+# Andriy Rysin <arysin@bcsii.com>, 2007, 2008.
+# Andriy Rysin <arysin@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config-1.4-pre1\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2008-09-15 23:52+0100\n"
+"PO-Revision-Date: 2008-09-16 18:57-0400\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
+"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../rules/base.xml.in.h:1 ../rules/evdev.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2 ../rules/evdev.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(За�таріла) �льтернативна"
+
+#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(За�таріла) �льтернативна, Sun dead keys"
+
+#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(За�таріла) �льтернативна, вимкнути �ліпі клавіші"
+
+#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
+msgid "101/104 key Compatible"
+msgstr "Сумі�на з 101/104 клавішною"
+
+#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/comma/Сліпі клавіші"
+
+#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/comma/Вимкнути �ліпі клавіші"
+
+#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/dot/Сліпі клавіші"
+
+#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/dot/Вимкнути �ліпі клавіші"
+
+#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/comma/Сліпі клавіші"
+
+#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/comma/Вимкнути �ліпі клавіші"
+
+#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/dot/Сліпі клавіші"
+
+#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/dot/Вимкнути �ліпі клавіші"
+
+#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/comma/Сліпі клавіші"
+
+#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/comma/Вимкнути �ліпі клавіші"
+
+#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/dot/Сліпі клавіші"
+
+#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/dot/Вимкнути �ліпі клавіші"
+
+#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/comma/Сліпі клавіші"
+
+#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/comma/Вимкнути �ліпі клавіші"
+
+#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/dot/Сліпі клавіші"
+
+#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/dot/Вимкнути �ліпі клавіші"
+
+#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:23 ../rules/evdev.xml.in.h:23
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
+msgid "ACPI Standard"
+msgstr "Стандартна ACPI"
+
+#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
+msgid "ATM/phone-style hexadecimal keypad"
+msgstr "ATM/phone-style hexadecimal keypad"
+
+#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
+msgid "Acer Laptop"
+msgstr "Acer Laptop"
+
+#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
+msgid "Add the EuroSign to the 2 key."
+msgstr "Призначити знак євро на клавішу 2."
+
+#: ../rules/base.xml.in.h:32 ../rules/evdev.xml.in.h:32
+msgid "Add the EuroSign to the 4 key."
+msgstr "Додати знак євро на клавішу 4."
+
+#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "Призначити знак євро на клавішу 5."
+
+#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "Призначити знак євро на клавішу E."
+
+#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "�адає клавіші Menu типову функцію."
+
+#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Призначити знак євро певним клавішам"
+
+#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38 ../rules/evdev.xml.in.h:38
+msgid "Afg"
+msgstr "�фг"
+
+#: ../rules/base.xml.in.h:39 ../rules/evdev.xml.in.h:39
+msgid "Afghanistan"
+msgstr "�фгані�тан"
+
+#: ../rules/base.xml.in.h:40 ../rules/evdev.xml.in.h:40
+msgid "Akan"
+msgstr "�кан"
+
+#: ../rules/base.xml.in.h:41 ../rules/evdev.xml.in.h:41
+msgid "Alb"
+msgstr "�лб"
+
+#: ../rules/base.xml.in.h:42 ../rules/evdev.xml.in.h:42
+msgid "Albania"
+msgstr "�лбані�"
+
+#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt та Meta на клавішах Alt."
+
+#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Клавіша Alt призначена правій клавіші Win а Super клавіші Menu."
+
+#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Alt+CapsLock змінюють розкладку."
+
+#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+Ctrl змінюють розкладку."
+
+#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Alt+Shift змінюють розкладку."
+
+#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Поведінка клавіш Alt/Win"
+
+#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
+msgid "Alternative"
+msgstr "�льтернативна"
+
+#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "�льтернативна �хідна"
+
+#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "�льтернативна фонетична"
+
+#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "�льтернативна інтернаціональна (колишн� us_intl)"
+
+#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "�льтернативна, Sun dead keys"
+
+#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "�льтернативна, вимикати �ліпі клавіші"
+
+#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "�льтернативна, лише latin-9"
+
+#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
+msgid "And"
+msgstr "�нд"
+
+#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
+msgid "Andorra"
+msgstr "�ндорра"
+
+#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "Варіант з апо�трофом (')"
+
+#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Apple Laptop"
+
+#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+msgid "Ara"
+msgstr "�раб"
+
+#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
+msgid "Arabic"
+msgstr "�раб�ька"
+
+#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
+msgid "Arm"
+msgstr "Вірм"
+
+#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
+msgid "Armenia"
+msgstr "Вірмені�"
+
+#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "��труій�ький варіант, де H та L з нижньою крапкою"
+
+#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
+msgid "Asus Laptop"
+msgstr "Asus Laptop"
+
+#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
+msgid "Aze"
+msgstr "�зер"
+
+#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
+msgid "Azerbaijan"
+msgstr "�зербайджан"
+
+#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 бездротова Інтернет-клавіатура"
+
+#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF мультимедійна"
+
+#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
+
+#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
+msgid "Baltic+"
+msgstr "Балтій�ька+"
+
+#: ../rules/base.xml.in.h:80 ../rules/evdev.xml.in.h:80
+msgid "Ban"
+msgstr "Банг"
+
+#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
+msgid "Bangladesh"
+msgstr "Бангладе�ька"
+
+#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
+msgid "Bel"
+msgstr "Бельг"
+
+#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
+msgid "Belarus"
+msgstr "Білору�ька"
+
+#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
+msgid "Belgium"
+msgstr "Бельгі�"
+
+#: ../rules/base.xml.in.h:85 ../rules/evdev.xml.in.h:85
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
+msgid "Bengali"
+msgstr "Бенгаль�ька"
+
+#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
+msgid "Bengali Probhat"
+msgstr "Бенгаль�ька (Probhat)"
+
+#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ергономічна, Дворак"
+
+#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ергономічна, Дворак, лише latin-9"
+
+#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+msgid "Bgr"
+msgstr "Болг"
+
+#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+msgid "Bhu"
+msgstr "Бут"
+
+#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
+msgid "Bhutan"
+msgstr "Бутан�ька"
+
+#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Біблей�ька єврей�ька (Tiro)"
+
+#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
+msgid "Bih"
+msgstr "Бо�н"
+
+#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
+msgid "Blr"
+msgstr "Біл"
+
+#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
+msgid "Bosnia and Herzegovina"
+msgstr "Бо�ні� та Герцеговина"
+
+#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
+msgid "Both Alt keys together change layout."
+msgstr "Обидві клавіші Alt разом змінюють розкладку."
+
+#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
+msgid "Both Ctrl keys together change layout."
+msgstr "Обидві клавіші Ctrl разом змінюють розкладку."
+
+#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
+msgid "Both Shift keys together change layout."
+msgstr "Обидві клавіші Shift разом змінюють розкладку."
+
+#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
+msgid "Both Win-keys switch layout while pressed."
+msgstr "Обидві клавіші Win перемикають групу на ча� нати�канн�."
+
+#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
+msgid "Bra"
+msgstr "Браз"
+
+#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
+msgid "Braille"
+msgstr "Брайл�"
+
+#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+msgid "Brazil"
+msgstr "Бразиль�ька"
+
+#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
+msgid "Brazilian ABNT2"
+msgstr "Бразиль�ька ABTN2"
+
+#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+msgid "Brl"
+msgstr "Брйл"
+
+#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
+msgid "Bulgaria"
+msgstr "Болгарі�"
+
+#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
+msgid "Cambodia"
+msgstr "Камбоджа"
+
+#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+msgid "Can"
+msgstr "Кан"
+
+#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
+msgid "Canada"
+msgstr "Канада"
+
+#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
+msgid "Caps Lock is Compose."
+msgstr "Caps Lock відповідає клавіші Compose."
+
+#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
+msgid "CapsLock LED shows alternative layout."
+msgstr "Індикатор Caps Lock показує альтернативну групу."
+
+#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "CapsLock діє �к Shift з блокуванн�м. Shift \"призупин�є\" CapsLock."
+
+#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "CapsLock діє �к Shift з блокуванн�м. Shift не впливає на CapsLock."
+
+#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
+msgid "CapsLock just locks the Shift modifier."
+msgstr "CapsLock про�то фік�ує модифікатор Shift"
+
+#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
+msgid "CapsLock key behavior"
+msgstr "Клавіша CapsLock"
+
+#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
+msgid "CapsLock key changes layout."
+msgstr "Клавіша CapsLock змінює розкладку."
+
+#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
+msgid "CapsLock switch to first layout, Shift+CapsLock switch to last layout."
+msgstr "CapsLock перемикає на першу розкладку, Shift+CapsLock — на о�танню."
+
+#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "CapsLock перемикає Shift та впливає на у�і �имволи."
+
+#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "CapsLock перемикає регі�тр алфавітних �имволів."
+
+#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "CapsLock викори�товує внутрішнє збільшенн� літер. Shift \"призупин�є\" CapsLock."
+
+#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "CapsLock викори�товує внутрішнє збільшенн� літер. Shift не впливає на CapsLock."
+
+#: ../rules/base.xml.in.h:126 ../rules/evdev.xml.in.h:126
+msgid "Catalan variant with middle-dot L"
+msgstr "Каталон�ький варіант з L із �ередньою точкою"
+
+#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
+msgid "Cedilla"
+msgstr "Седиль"
+
+#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+msgid "Che"
+msgstr "Шве"
+
+#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+msgid "Cherokee"
+msgstr "Cherokee"
+
+#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (альтернативний варіант)"
+
+#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
+msgid "Chicony Internet Keyboard"
+msgstr "Інтернет-клавіатура Chicony"
+
+#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
+msgid "China"
+msgstr "Китай�ька"
+
+#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+msgid "Chuvash"
+msgstr "Чува�ька"
+
+#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
+msgid "Chuvash Latin"
+msgstr "Чува�ька латин�ька"
+
+#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
+msgid "Classic"
+msgstr "Кла�ична"
+
+#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
+msgid "Classic Dvorak"
+msgstr "Кла�ична Дворак"
+
+#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 клавіш)"
+
+#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 клавіш)"
+
+#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 клавіш)"
+
+#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
+msgid "Compose key position"
+msgstr "Розташуванн� клавіші Compose"
+
+#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
+msgid "Congo, Democratic Republic of the"
+msgstr "Конго"
+
+#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "Control призначено на Win-клавіші (та звичайні клавіші Ctrl)."
+
+#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
+msgid "Croatia"
+msgstr "Хорват�ька"
+
+#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
+msgid "Ctrl key at bottom left"
+msgstr "Клавіша Ctrl внизу ліворуч"
+
+#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
+msgid "Ctrl key at left of 'A'"
+msgstr "Клавіша Ctrl ліворуч від 'A'"
+
+#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
+msgid "Ctrl key position"
+msgstr "Розташуванн� клавіші Ctrl"
+
+#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
+msgid "Ctrl+Shift change layout."
+msgstr "Ctrl+Shift змінюють розкладку."
+
+#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
+msgid "Cyrillic"
+msgstr "Кирилічна"
+
+#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
+msgid "Cyrillic with guillemets"
+msgstr "Кирилічна з кутовими лапками"
+
+#: ../rules/base.xml.in.h:161 ../rules/evdev.xml.in.h:161
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Кирилічна, Z та ZHE помін�ні мі�ц�ми"
+
+#: ../rules/base.xml.in.h:162 ../rules/evdev.xml.in.h:162
+msgid "Cze"
+msgstr "Че�"
+
+#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
+msgid "Czechia"
+msgstr "Чехі�"
+
+#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
+msgid "Dan"
+msgstr "Дан"
+
+#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
+msgid "Dead acute"
+msgstr "Dead acute"
+
+#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
+msgid "Dead grave acute"
+msgstr "Dead grave acute"
+
+#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
+msgid "Default numeric keypad keys."
+msgstr "Типові клавіші цифрової клавіатури."
+
+#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
+msgid "Dell 101-key PC"
+msgstr "Dell 101-клавішна дл� ПК"
+
+#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell, ноутбуки Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell, ноутбуки Precision M"
+
+#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
+msgid "Dell Latitude series laptop"
+msgstr "Dell, ноутбук Latitude"
+
+#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
+msgid "Denmark"
+msgstr "Дані�"
+
+#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
+msgid "Deu"
+msgstr "�ім"
+
+#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
+msgid "Diamond 9801 / 9802 series"
+msgstr "Моделі Diamond 9801/9802"
+
+#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+msgid "Dvorak"
+msgstr "Дворак"
+
+#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+msgid "Dvorak (UK Punctuation)"
+msgstr "Dvorak (UK інтернаціональна)"
+
+#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+msgid "Dvorak international"
+msgstr "Dvorak (інтернаціональна)"
+
+#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Дворак, поль�ькі лапки на клавіші \"1/!\""
+
+#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Дворак, поль�ькі лапки на знаку лапки"
+
+#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
+msgid "Eastern"
+msgstr "Східна"
+
+#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
+msgid "Eliminate dead keys"
+msgstr "Вилучити �ліпі клавіші"
+
+#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
+msgid "Epo"
+msgstr "Епо"
+
+#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
+msgid "Ergonomic"
+msgstr "Ергономічна"
+
+#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
+msgid "Esp"
+msgstr "І�п"
+
+#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
+msgid "Esperanto"
+msgstr "Е�перанто"
+
+#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+msgid "Est"
+msgstr "Е�т"
+
+#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
+msgid "Estonia"
+msgstr "Е�тон�ька"
+
+#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
+msgid "Eth"
+msgstr "Ефі"
+
+#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+msgid "Ethiopia"
+msgstr "Ефіоп�ька"
+
+#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
+msgid "Evdev-managed keyboard"
+msgstr "Клавіатура, керована Evdev"
+
+#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
+msgid "Extended"
+msgstr "Розширена"
+
+#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
+msgid "Extended Backslash"
+msgstr "Розширена Backslash"
+
+#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
+msgid "F-letter (F) variant"
+msgstr "Варіант з літерою F"
+
+#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
+msgid "Fao"
+msgstr "Фарер"
+
+#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
+msgid "Faroe Islands"
+msgstr "Фарер�ькі о-ви"
+
+#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
+msgid "Fin"
+msgstr "Фін"
+
+#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
+msgid "Finland"
+msgstr "Фінл�нді�"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
+msgid "Four-level key with abstract separators"
+msgstr "Клавіша четвертого рівн� з аб�трактним розділювачем "
+
+#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
+msgid "Four-level key with comma"
+msgstr "Клавіша четвертого рівн� з комою"
+
+#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
+msgid "Four-level key with dot"
+msgstr "Клавіша четвертого рівн� з крапкою"
+
+#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+msgid "Four-level key with momayyez"
+msgstr "Клавіша четвертого рівн� з momayyez"
+
+#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
+msgid "Fra"
+msgstr "Фра"
+
+#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
+msgid "France"
+msgstr "Франці�"
+
+#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
+msgid "French"
+msgstr "Французька"
+
+#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
+msgid "French (Macintosh)"
+msgstr "Французька (Macintosh)"
+
+#: ../rules/base.xml.in.h:219 ../rules/evdev.xml.in.h:219
+msgid "French (legacy)"
+msgstr "Французька (за�таріла)"
+
+#: ../rules/base.xml.in.h:220 ../rules/evdev.xml.in.h:220
+msgid "French Dvorak"
+msgstr "Французький Дворак"
+
+#: ../rules/base.xml.in.h:221 ../rules/evdev.xml.in.h:221
+msgid "French, Sun dead keys"
+msgstr "Французька, Sun зі �ліпими клавішами"
+
+#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
+msgid "French, eliminate dead keys"
+msgstr "Французька, вимкнути �ліпі клавіші"
+
+#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
+msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
+msgstr "Fujitsu-Siemens Computers AMILO A1667G laptop"
+
+#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
+msgid "Fula"
+msgstr "Фула"
+
+#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
+msgid "GBr"
+msgstr "Брит"
+
+#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
+msgid "Ga"
+msgstr "Га"
+
+#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
+msgid "Generic 101-key PC"
+msgstr "Звичайна 101-клавішна дл� ПК"
+
+#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
+msgid "Generic 102-key (Intl) PC"
+msgstr "Звичайна 102-клавішна дл� ПК"
+
+#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
+msgid "Generic 104-key PC"
+msgstr "Звичайна 104-клавішна дл� ПК"
+
+#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
+msgid "Generic 105-key (Intl) PC"
+msgstr "Звичайна 105-клавішна дл� ПК"
+
+#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-21e"
+
+#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
+msgid "Geo"
+msgstr "Груз"
+
+#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
+msgid "Georgia"
+msgstr "Грузі�"
+
+#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
+msgid "Georgian"
+msgstr "Грузин�ька"
+
+#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
+msgid "Georgian AZERTY Tskapo"
+msgstr "Грузин�ька AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
+msgid "German (Macintosh)"
+msgstr "�імецька (Macintosh)"
+
+#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
+msgid "German, Sun dead keys"
+msgstr "�імецька Sun зі �ліпими клавішами"
+
+#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
+msgid "German, eliminate dead keys"
+msgstr "�імецька, вимкнути �ліпі клавіші"
+
+#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
+msgid "Germany"
+msgstr "�імеччина"
+
+#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
+msgid "Gha"
+msgstr "Ган"
+
+#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
+msgid "Ghana"
+msgstr "Гана"
+
+#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
+msgid "Gre"
+msgstr "Гре"
+
+#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
+msgid "Greece"
+msgstr "Греці�"
+
+#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
+msgid "Group toggle on multiply/divide key"
+msgstr "Перемикати групу на клавішах «помножити/ділити»"
+
+#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
+msgid "Gui"
+msgstr "Гві"
+
+#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
+msgid "Guinea"
+msgstr "Гвіне�"
+
+#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
+msgid "Gujarati"
+msgstr "Гуджараті"
+
+#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
+msgid "Gurmukhi"
+msgstr "Гурмухі"
+
+#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
+msgid "Gurmukhi Jhelum"
+msgstr "Гурмухі Джелум"
+
+#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking Keyboard"
+
+#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking Keyboard дл� Mac"
+
+#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
+msgid "Hausa"
+msgstr "Hausa"
+
+#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
+msgid "Hewlett-Packard Internet Keyboard 5181"
+msgstr "Hewlett-Packard Internet Keyboard 5181"
+
+#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
+msgid "Hewlett-Packard Internet Keyboard 5185"
+msgstr "Hewlett-Packard Internet Keyboard 5185"
+
+#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
+msgid "Hindi Bolnagri"
+msgstr "Хінді Болнагрі"
+
+#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
+msgid "Homophonic"
+msgstr "Гомофонний"
+
+#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
+msgid "Hrv"
+msgstr "Хорв"
+
+#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
+msgid "Hun"
+msgstr "Уго"
+
+#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
+msgid "Hungary"
+msgstr "Угорщина"
+
+#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper відповідає клавішам Win"
+
+#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (альтернативний варіант)"
+
+#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
+
+#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+msgid "ISO Alternate"
+msgstr "Додаткова ISO"
+
+#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
+msgid "Iceland"
+msgstr "І�ланді�"
+
+#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
+msgid "Ind"
+msgstr "Інд"
+
+#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+msgid "India"
+msgstr "Інді�"
+
+#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
+msgid "International (AltGr dead keys)"
+msgstr "Інтернаціональна (зі �ліпими клавішами AltGr)"
+
+#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
+msgid "International (with dead keys)"
+msgstr "Інтернаціональна (зі �ліпими клавішами)"
+
+#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+msgid "Inuktitut"
+msgstr "Інуктітут"
+
+#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+msgid "Iran"
+msgstr "Іран"
+
+#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
+msgid "Iraq"
+msgstr "Ірак"
+
+#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
+msgid "Ireland"
+msgstr "Ірланді�"
+
+#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
+msgid "Irl"
+msgstr "Ірл"
+
+#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+msgid "Irn"
+msgstr "Ірн"
+
+#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
+msgid "Irq"
+msgstr "Ірк"
+
+#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
+msgid "Isl"
+msgstr "І�л"
+
+#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
+msgid "Isr"
+msgstr "Івр"
+
+#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
+msgid "Israel"
+msgstr "Ізраїль"
+
+#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
+msgid "Ita"
+msgstr "Іта"
+
+#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
+msgid "Italy"
+msgstr "Італі�"
+
+#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
+msgid "Japan"
+msgstr "Японі�"
+
+#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
+msgid "Japan (PC-98xx Series)"
+msgstr "Япон�ька (родина PC-98xx)"
+
+#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
+msgid "Japanese 106-key"
+msgstr "Япон�ька 106-клавішна"
+
+#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
+msgid "Japanese keyboard options"
+msgstr "Параметри �пон�ької клавіатури"
+
+#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
+msgid "Jpn"
+msgstr "Япо"
+
+#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
+msgid "Kana"
+msgstr "Кана"
+
+#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
+msgid "Kana Lock key is locking"
+msgstr "Клавіша Kana Lock фік�уєть��"
+
+#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
+msgid "Kannada"
+msgstr "Канад�ька"
+
+#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
+msgid "Kashubian"
+msgstr "Кашуб�ька"
+
+#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
+msgid "Kaz"
+msgstr "Каз"
+
+#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
+msgid "Kazakh with Russian"
+msgstr "Казах�ька з ро�ій�ькими"
+
+#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
+msgid "Kazakhstan"
+msgstr "Казах�тан"
+
+#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
+msgid "Keypad"
+msgstr "Цифрова клавіатура"
+
+#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
+msgid "Keypad with unicode additions (arrows and math operators)"
+msgstr "Цифрова клавіатура з доповненн�ми Unicode (�трілки та математичні оператори)"
+
+#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
+msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Цифрова клавіатура з доповненн�ми Unicode (�трілки та математичні оператори). Математичні оператори на типовому рівні."
+
+#: ../rules/base.xml.in.h:320 ../rules/evdev.xml.in.h:320
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
+msgid "Khm"
+msgstr "Khm"
+
+#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
+msgid "Kir"
+msgstr "Кир"
+
+#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
+msgid "Komi"
+msgstr "Комі"
+
+#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
+msgid "Kor"
+msgstr "Кор"
+
+#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
+msgid "Korea, Republic of"
+msgstr "Коре�, ре�публіка"
+
+#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
+msgid "Korean 106-key"
+msgstr "Корей�ька 106-клавішна"
+
+#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
+msgid "Ktunaxa"
+msgstr "Ktunaxa"
+
+#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+msgid "Kurdish, (F)"
+msgstr "Курд�ька, (F)"
+
+#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+msgid "Kurdish, Arabic-Latin"
+msgstr "Курд�ька, араб�ько-латин�ька"
+
+#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Курд�ька, Latin Alt-Q"
+
+#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
+msgid "Kurdish, Latin Q"
+msgstr "Курд�ька, Latin Q"
+
+#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
+msgid "Kyrgyzstan"
+msgstr "Киргиз�тан"
+
+#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
+msgid "LAm"
+msgstr "Лат�м"
+
+#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
+msgid "LCtrl+LShift change layout."
+msgstr "Ліві Ctrl+Shift змінюють розкладку."
+
+#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
+msgid "LEKP"
+msgstr "LEKP"
+
+#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
+msgid "LEKPa"
+msgstr "LEKPa"
+
+#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
+msgid "Lao"
+msgstr "Лао"
+
+#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
+msgid "Laos"
+msgstr "Лао�"
+
+#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Клавіатура дл� ноутбуків Compaq (напр., Armada)"
+
+#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Інтернет-клавіатура дл� ноутбуків Compaq (напр., Presario)"
+
+#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "�оутбуки eMachines m68xx"
+
+#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
+msgid "Latin"
+msgstr "Латин�ька"
+
+#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
+msgid "Latin American"
+msgstr "Латиноамерикан�ька"
+
+#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
+msgid "Latin Unicode"
+msgstr "Латин�ька Unicode"
+
+#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
+msgid "Latin Unicode qwerty"
+msgstr "Латин�ька Unicode (qwerty)"
+
+#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
+msgid "Latin qwerty"
+msgstr "Латин�ька (qwerty)"
+
+#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
+msgid "Latin unicode"
+msgstr "Латин�ька Unicode"
+
+#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
+msgid "Latin unicode qwerty"
+msgstr "Латин�ька Unicode (qwerty)"
+
+#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
+msgid "Latin with guillemets"
+msgstr "Латин�ька з кутовими лапками"
+
+#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
+msgid "Latvia"
+msgstr "Латві�"
+
+#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
+msgid "Lav"
+msgstr "Лат"
+
+#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
+msgid "Layout switching"
+msgstr "Перемиканн� розкладок"
+
+#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
+msgid "Left Alt is swapped with left Win-key."
+msgstr "Ліва Alt мін�єть�� з лівою клавішею Win"
+
+#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
+msgid "Left Alt key changes layout."
+msgstr "Ліва клавіша Alt змінює розкладку."
+
+#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
+msgid "Left Alt key switches layout while pressed."
+msgstr "Ліва клавіша Alt перемикає розкладку при нати�канні."
+
+#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
+msgid "Left Ctrl key changes layout."
+msgstr "Ліва клавіша Ctrl змінює розкладку."
+
+#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
+msgid "Left Shift key changes layout."
+msgstr "Ліва клавіша Shift змінює розкладку."
+
+#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
+msgid "Left Win-key changes layout."
+msgstr "Ліва клавіша Win змінює розкладку."
+
+#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
+msgid "Left Win-key is Compose."
+msgstr "Ліва клавіша Win відповідає клавіші Compose."
+
+#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
+msgid "Left Win-key switches layout while pressed."
+msgstr "Ліва клавіша Win перемикає розкладку на ча� нати�канн�."
+
+#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
+msgid "Left hand"
+msgstr "Дл� лівші"
+
+#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
+msgid "Left handed Dvorak"
+msgstr "Дворак дл� лівші"
+
+#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+msgid "Legacy"
+msgstr "За�таріла"
+
+#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
+msgid "Legacy Wang 724 keypad"
+msgstr "За�таріла цифрова клавіатура Wang 724"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+msgid "Legacy key with comma"
+msgstr "За�таріла клавіша з комою"
+
+#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+msgid "Legacy key with dot"
+msgstr "За�таріла клавіша з крапкою"
+
+#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
+msgid "Legacy keypad"
+msgstr "За�таріла цифрова клавіатура"
+
+#: ../rules/base.xml.in.h:369 ../rules/evdev.xml.in.h:369
+msgid "Less-than/Greater-than is Compose."
+msgstr "Клавіші «менше/більше» є композитними."
+
+#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+msgid "Lithuania"
+msgstr "Литов�ька"
+
+#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (альтернативний варіант)"
+
+#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:375 ../rules/evdev.xml.in.h:375
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (альтернативний варіант 2)"
+
+#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 з додатковими клавішами через G15daemon"
+
+#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech Generic Keyboard"
+
+#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Keyboard"
+
+#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite Keyboard"
+
+#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Keyboard"
+
+#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (модель Y-RB6)"
+
+#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
+msgid "Ltu"
+msgstr "Лит"
+
+#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
+msgid "MNE"
+msgstr "MNE"
+
+#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
+
+#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
+msgid "Macedonia"
+msgstr "Македон�ька"
+
+#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
+msgid "Macintosh Old"
+msgstr "Старий Macintosh"
+
+#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, Sun зі �ліпими клавішами"
+
+#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, вимкнути �ліпі клавіші"
+
+#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Caps Lock �к додаткова клавіша Ctrl."
+
+#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
+msgid "Mal"
+msgstr "Мальд"
+
+#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
+msgid "Malayalam"
+msgstr "Малай�ька"
+
+#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
+msgid "Malayalam Lalitha"
+msgstr "Малай�ька Лаліта"
+
+#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
+msgid "Maldives"
+msgstr "Мальдиви"
+
+#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
+msgid "Malta"
+msgstr "Мальта"
+
+#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
+msgid "Maltese keyboard with US layout"
+msgstr "Мальтій�ька клавіатура з розкладкою СШ�"
+
+#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
+msgid "Mao"
+msgstr "Мао"
+
+#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
+msgid "Maori"
+msgstr "Маорі"
+
+#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
+msgid "Menu is Compose."
+msgstr "Клавіша Menu відповідає клавіші Compose"
+
+#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
+msgid "Menu key changes layout."
+msgstr "Клавіша Menu змінює розкладку."
+
+#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
+msgid "Meta is mapped to the Win-keys."
+msgstr "Клавіша Meta відповідає клавішам Win"
+
+#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
+msgid "Meta is mapped to the left Win-key."
+msgstr "Клавіша Meta відповідає лівій клавіші Win"
+
+#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, швед�ька"
+
+#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
+
+#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:428 ../rules/evdev.xml.in.h:428
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+msgid "Miscellaneous compatibility options"
+msgstr "Різні параметри �умі�но�ті"
+
+#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+msgid "Mkd"
+msgstr "Мкд"
+
+#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+msgid "Mlt"
+msgstr "Мальт"
+
+#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+msgid "Mmr"
+msgstr "М'�нм"
+
+#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
+msgid "Mng"
+msgstr "Монг"
+
+#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
+msgid "Mongolia"
+msgstr "Монголі�"
+
+#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
+msgid "Montenegro"
+msgstr "Чорногорі�"
+
+#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
+msgid "Morocco"
+msgstr "Мароккан�ька"
+
+#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
+msgid "Multilingual"
+msgstr "Багатомовна"
+
+#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
+msgid "Multilingual, first part"
+msgstr "Багатомовна, перша ча�тина"
+
+#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
+msgid "Multilingual, second part"
+msgstr "Багатомовна, друга ча�тина"
+
+#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+msgid "Myanmar"
+msgstr "М'�нма"
+
+#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
+msgid "NICOLA-F style Backspace"
+msgstr "NICOLA-F style Backspace"
+
+#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
+msgid "Neostyle"
+msgstr "Neostyle"
+
+#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
+msgid "Nep"
+msgstr "�еп"
+
+#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
+msgid "Nepal"
+msgstr "�епал"
+
+#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
+msgid "Netherlands"
+msgstr "�ідерланд�ька"
+
+#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
+msgid "Nig"
+msgstr "�іг"
+
+#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
+msgid "Nigeria"
+msgstr "�ігері�"
+
+#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
+msgid "Nld"
+msgstr "Флам"
+
+#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
+msgid "Nor"
+msgstr "�ор"
+
+#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
+msgid "Northern Saami"
+msgstr "Північне Саамі"
+
+#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Північне Саамі, вилучити �ліпі клавіші (dead keys)"
+
+#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
+msgid "Norway"
+msgstr "�орвегі�"
+
+#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
+msgid "NumLock LED shows alternative layout."
+msgstr "Індикатор NumLock показує альтернативну розкладку."
+
+#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
+msgid "Numeric keypad delete key behaviour"
+msgstr "Вибір поведінки клавіші del на цифровій клавіатурі"
+
+#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
+msgid "Numeric keypad keys work as with Mac."
+msgstr "Цифрова клавіатура працює �к у Mac."
+
+#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
+msgid "Numeric keypad layout selection"
+msgstr "Вибір розкладки цифрової клавіатури"
+
+#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
+msgid "OLPC"
+msgstr "OLPC"
+
+#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
+msgid "OLPC Dari"
+msgstr "OLPC Дарі"
+
+#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
+msgid "OLPC Pashto"
+msgstr "OLPC Пушту"
+
+#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
+msgid "OLPC Southern Uzbek"
+msgstr "OLPC південноузбецька"
+
+#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
+msgid "Ogham"
+msgstr "Огхам (давньоірланд�ька)"
+
+#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
+msgid "Oriya"
+msgstr "Орі�"
+
+#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet keyboard"
+
+#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+msgid "Ossetian"
+msgstr "О�етин�ька"
+
+#: ../rules/base.xml.in.h:469 ../rules/evdev.xml.in.h:469
+msgid "Ossetian, Winkeys"
+msgstr "О�етин�ька, Winkeys"
+
+#: ../rules/base.xml.in.h:470 ../rules/evdev.xml.in.h:470
+msgid "Ossetian, legacy"
+msgstr "О�етин�ька, за�таріла"
+
+#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+msgid "PC-98xx Series"
+msgstr "Моделі PC-98xx"
+
+#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+msgid "Pak"
+msgstr "Пак"
+
+#: ../rules/base.xml.in.h:473 ../rules/evdev.xml.in.h:473
+msgid "Pakistan"
+msgstr "Паки�тан"
+
+#: ../rules/base.xml.in.h:474 ../rules/evdev.xml.in.h:474
+msgid "Pashto"
+msgstr "Пушту"
+
+#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
+msgid "Pattachote"
+msgstr "Тай�ька (Паттачот)"
+
+#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
+msgid "Phonetic"
+msgstr "Фонетична"
+
+#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
+msgid "Pol"
+msgstr "Пол"
+
+#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
+msgid "Poland"
+msgstr "Польща"
+
+#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
+msgid "Polytonic"
+msgstr "Поліфонічна"
+
+#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+msgid "Portugal"
+msgstr "Португалі�"
+
+#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Вибір 3-го рівн� нати�ненн�м лівої клавіші Alt."
+
+#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Вибір 3-го рівн� нати�ненн�м лівої клавіші Win."
+
+#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
+msgid "Press Menu key to choose 3rd level."
+msgstr "Вибір 3-го рівн� нати�ненн�м клавіші Menu."
+
+#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "Вибір 3-го рівн� нати�ненн�м правої клавіші Alt, Shift+права клавіша Alt діє �к Multi_Key."
+
+#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Вибір 3-го рівн� нати�ненн�м правої клавіші Alt."
+
+#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Вибір 3-го рівн� нати�ненн�м правої клавіші Ctrl."
+
+#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Вибір 3-го рівн� нати�ненн�м правої клавіші Win."
+
+#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Вибір 3-го рівн� нати�ненн�м довільної клавіші Alt."
+
+#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Вибір 3-го рівн� нати�ненн�м довільної клавіші Win."
+
+#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
+msgid "Pro Keypad"
+msgstr "Pro Keypad"
+
+#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
+msgid "Programmer Dvorak"
+msgstr "Програмі�т�ький Дворак"
+
+#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+msgid "Prt"
+msgstr "Порт"
+
+#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
+msgid "R-Alt switches layout while pressed."
+msgstr "Права клавіша Alt перемикає розкладку на ча� нати�ненн�."
+
+#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
+msgid "Right Alt is Compose."
+msgstr "Права клавіша Alt відповідає Compose."
+
+#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
+msgid "Right Alt key changes layout."
+msgstr "Права клавіша Alt змінює розкладку."
+
+#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
+msgid "Right Alt key never chooses 3rd level."
+msgstr "Права клавіша Alt ніколи не обирає 3-й рівень."
+
+#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
+msgid "Right Ctrl is Compose."
+msgstr "Права клавіша Ctrl Compose."
+
+#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
+msgid "Right Ctrl key changes layout."
+msgstr "Права клавіша Ctrl змінює розкладку."
+
+#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "Права клавіша Ctrl перемикає розкладку на ча� нати�канн�."
+
+#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Права клавіша Ctrl функціонує �к права клавіша Alt."
+
+#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
+msgid "Right Shift key changes layout."
+msgstr "Права клавіша Shift змінює розкладку."
+
+#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
+msgid "Right Win-key changes layout."
+msgstr "Права клавіша Win змінює розкладку."
+
+#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
+msgid "Right Win-key is Compose."
+msgstr "Права клавіша Win відповідає клавіші Compose."
+
+#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
+msgid "Right Win-key switches layout while pressed."
+msgstr "Права клавіша Win перемикає розкладку на ча� нати�канн�."
+
+#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+msgid "Right hand"
+msgstr "Дл� правші"
+
+#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
+msgid "Right handed Dvorak"
+msgstr "Дворак дл� правші"
+
+#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
+msgid "Romania"
+msgstr "Румуні�"
+
+#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
+msgid "Romanian keyboard with German letters"
+msgstr "Румун�ька клавіатура  з німецькими літерами"
+
+#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Румун�ька клавіатура  з німецькими літерами, вимкнути �ліпі клавіші"
+
+#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+msgid "Rou"
+msgstr "Рум"
+
+#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+msgid "Rus"
+msgstr "Ро�"
+
+#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+msgid "Russia"
+msgstr "Ро�і�"
+
+#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+msgid "Russian"
+msgstr "Ро�ій�ька"
+
+#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+msgid "Russian phonetic"
+msgstr "Ро�ій�ька (фонетична)"
+
+#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+msgid "Russian phonetic Dvorak"
+msgstr "Ро�ій�ький фонетичний Dvorak"
+
+#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Ро�ій�ька фонетична, вилучити �ліпі клавіші"
+
+#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+msgid "Russian with Kazakh"
+msgstr "Ро�ій�ька з казах�ькою"
+
+#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
+msgid "ScrollLock LED shows alternative layout."
+msgstr "Індикатор ScrollLock показує альтернативну розкладку."
+
+#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
+msgid "Serbia"
+msgstr "Сербі�"
+
+#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
+msgid "Shift cancels CapsLock."
+msgstr "Shift �ка�овує Caps Lock."
+
+#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "Shift з цифровою клавіатурою працює �к у Microsoft Windows."
+
+#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
+msgid "Shift+CapsLock changes layout."
+msgstr "Shift+CapsLock змінюють розкладку."
+
+#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
+msgid "Simple"
+msgstr "Про�та"
+
+#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
+msgid "Slovakia"
+msgstr "Словаччина"
+
+#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
+msgid "Slovenia"
+msgstr "Словені�"
+
+#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
+msgid "South Africa"
+msgstr "Південна �фрика"
+
+#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
+msgid "Southern Uzbek"
+msgstr "Південний Узбеки�тан"
+
+#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Клавіша пробіл видає нерозривний пробіл на 4-му рівні, вузький нерозривний пробіл на 6-му рівні"
+
+#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift"
+msgstr "Клавіша пробіл видає нерозривний пробіл на 4-му рівні, вузький нерозривний пробіл на 6-му рівні (через Ctrl+Shift)"
+
+#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr "Клавіша пробіл на 4-му рівні видає �имвол нерозривного пробілу."
+
+#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
+msgid "Space key outputs non-breakable space character at second level."
+msgstr "Клавіша пробіл на другому рівні видає �имвол нерозривного пробілу."
+
+#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr "Клавіша пробіл на третьому рівні видає �имвол нерозривного пробілу, на четвертому не дає нічого."
+
+#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Клавіша пробіл видає нерозривний пробіл на 3-му рівні, вузький нерозривний пробіл на 4-му рівні"
+
+#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
+msgid "Space key outputs non-breakable space character at third level."
+msgstr "Клавіша пробіл на третьому рівні видає �имвол нерозривного пробілу."
+
+#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
+msgid "Space key outputs usual space at any level."
+msgstr "Клавіша пробіл на будь-�кому рівні видає звичайний �имвол пробілу."
+
+#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+msgid "Spain"
+msgstr "І�пані�"
+
+#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Сліпі клавіші (Ctrl+Alt+&lt;key&gt;) обробл�ють�� на �ервері."
+
+#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+msgid "SrL"
+msgstr "ШріЛ"
+
+#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
+msgid "Sri Lanka"
+msgstr "Шрі-Ланка"
+
+#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
+msgid "Standard"
+msgstr "Стандартна"
+
+#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
+msgid "Standard (Cedilla)"
+msgstr "Стандартна (Седиль)"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
+msgid "Standard RSTU"
+msgstr "Стандартна RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:560 ../rules/evdev.xml.in.h:560
+msgid "Standard RSTU on Russian layout"
+msgstr "Стандартна RSTU на ро�ій�ькій розкладці"
+
+#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
+msgid "Sun Type 5/6"
+msgstr "Sun Type 5/6"
+
+#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
+msgid "Sun dead keys"
+msgstr "Sun dead keys"
+
+#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
+msgid "Super is mapped to the Win-keys."
+msgstr "Клавіша Super відповідає клавішам Win."
+
+#: ../rules/base.xml.in.h:565 ../rules/evdev.xml.in.h:565
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
+msgid "Svk"
+msgstr "Словац"
+
+#: ../rules/base.xml.in.h:567 ../rules/evdev.xml.in.h:567
+msgid "Svn"
+msgstr "Слвн"
+
+#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
+msgid "Swap Ctrl and CapsLock."
+msgstr "Помін�ти мі�ц�ми клавіші Control та Caps Lock."
+
+#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
+msgid "Swap ESC and CapsLock."
+msgstr "Помін�ти мі�ц�ми клавіші ESC та Caps Lock."
+
+#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr "Мін�ти мі�ц�ми дві клавіші, коли Mac-клавіатури неправильно визначають�� �дром."
+
+#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
+msgid "Swe"
+msgstr "Швед"
+
+#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+msgid "Sweden"
+msgstr "Швеці�"
+
+#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
+msgid "Switzerland"
+msgstr "Швейцарі�"
+
+#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (планшетний ПК)"
+
+#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
+msgid "Syr"
+msgstr "Сир"
+
+#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+msgid "Syria"
+msgstr "Сирі�"
+
+#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+msgid "Syriac"
+msgstr "Сирій�ька"
+
+#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
+msgid "Syriac phonetic"
+msgstr "Сирій�ька фонетична"
+
+#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
+msgid "Tajikistan"
+msgstr "Таджики�тан"
+
+#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
+msgid "Tamil"
+msgstr "Таміль�ька"
+
+#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
+msgid "Tamil TAB Typewriter"
+msgstr "Таміль�ька TAB (Машинопи�на)"
+
+#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
+msgid "Tamil TSCII Typewriter"
+msgstr "Таміль�ька TSCII (Машинопи�на)"
+
+#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
+msgid "Tamil Unicode"
+msgstr "Таміль�ька Unicode"
+
+#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
+msgid "Tatar"
+msgstr "Татар�ька"
+
+#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
+msgid "Telugu"
+msgstr "Телугу"
+
+#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
+msgid "Tha"
+msgstr "Тай"
+
+#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
+msgid "Thailand"
+msgstr "Таїланд"
+
+#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
+msgid "Third level choosers"
+msgstr "Вибір 3-го рівн�"
+
+#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
+msgid "Tibetan"
+msgstr "Тибет�ька"
+
+#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Тибет�ька (з ASCII чи�лами)"
+
+#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+msgid "Tifinagh"
+msgstr "Тифіна"
+
+#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
+msgid "Tifinagh Alternative"
+msgstr "Тифіна альтернативна"
+
+#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Тифіна альтернативна фонетична"
+
+#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
+msgid "Tifinagh Extended"
+msgstr "Тифіна розширена"
+
+#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
+msgid "Tifinagh Extended Phonetic"
+msgstr "Тифіна розширена фонетична"
+
+#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
+msgid "Tifinagh Phonetic"
+msgstr "Тифіна фонетична"
+
+#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
+msgid "Tilde (~) variant"
+msgstr "Варіант з тильдою (~)"
+
+#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
+msgid "Tjk"
+msgstr "Тдж"
+
+#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
+msgid "Tur"
+msgstr "Тур"
+
+#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
+msgid "Turkey"
+msgstr "Туреччина"
+
+#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
+msgid "Typewriter"
+msgstr "Машинопи�на"
+
+#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
+msgid "UCW layout (accented letters only)"
+msgstr "UCW-розкладка (лише літери з акцентами)"
+
+#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Клавіатура СШ� з бо�ній�ькими диграфами"
+
+#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
+msgid "US keyboard with Bosnian letters"
+msgstr "Клавіатура СШ� з бо�ній�ькими літерами"
+
+#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
+msgid "US keyboard with Croatian digraphs"
+msgstr "Клавіатура СШ� з хорват�ькими диграфами"
+
+#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
+msgid "US keyboard with Croatian letters"
+msgstr "Клавіатура СШ� з хорват�ькими літерами"
+
+#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
+msgid "US keyboard with Estonian letters"
+msgstr "Клавіатура СШ� з е�тон�ькими літерами"
+
+#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
+msgid "US keyboard with Lithuanian letters"
+msgstr "Клавіатура СШ� з литов�ькими буквами"
+
+#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Клавіатура СШ� із �ловен�ькими диграфами"
+
+#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
+msgid "US keyboard with Slovenian letters"
+msgstr "Клавіатура СШ� із �ловен�ькими буквами"
+
+#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+msgid "USA"
+msgstr "СШ�"
+
+#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
+msgid "Udmurt"
+msgstr "Удмурт�ька"
+
+#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
+msgid "Ukr"
+msgstr "Укр"
+
+#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
+msgid "Ukraine"
+msgstr "Україна"
+
+#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
+msgid "United Kingdom"
+msgstr "�нглій�ька (Великобритані�)"
+
+#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
+msgid "Urdu"
+msgstr "Урду"
+
+#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
+msgid "Use Bosnian digraphs"
+msgstr "З бо�ній�ькими диграфами"
+
+#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
+msgid "Use Croatian digraphs"
+msgstr "З хорват�ькими диграфами"
+
+#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
+msgid "Use Slovenian digraphs"
+msgstr "Зі �ловен�ькими диграфами"
+
+#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
+msgid "Use guillemets for quotes"
+msgstr "Кутові лапки у �ко�ті лапок"
+
+#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Викори�товувати клавіатурні індикатори дл� індикації альтернативних розкладок."
+
+#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
+msgid "Using space key to input non-breakable space character"
+msgstr "Клавіша пробіл генерує �имвол нерозривного пробілу"
+
+#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+msgid "Uzb"
+msgstr "Узб"
+
+#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+msgid "Uzbekistan"
+msgstr "Узбеки�тан"
+
+#: ../rules/base.xml.in.h:630 ../rules/evdev.xml.in.h:630
+msgid "Vietnam"
+msgstr "В'єтнам"
+
+#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
+msgid "Vnm"
+msgstr "В'єт"
+
+#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Клавіатура Wang 724 з доповненн�ми Unicode (�трілки та математичні оператори)"
+
+#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Клавіатура Wang 724 з доповненн�ми Unicode (�трілки та математичні оператори). Математичні операції на типовому рівні."
+
+#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+msgid "Western"
+msgstr "Західна"
+
+#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
+msgid "Winkeys"
+msgstr "Розкладка Windows"
+
+#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
+msgid "With &lt;\\|&gt; key"
+msgstr "З клавішею &lt;\\|&gt;"
+
+#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
+msgid "With EuroSign on 5"
+msgstr "Призначити знак євро на клавішу 5"
+
+#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+msgid "With guillemets"
+msgstr "З кутовими лапками"
+
+#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+msgid "Yakut"
+msgstr "Якут�ька"
+
+#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
+msgid "Yoruba"
+msgstr "Йоруба"
+
+#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
+msgid "Z and ZHE swapped"
+msgstr "Z та ZHE помін�ні мі�ц�ми"
+
+#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
+msgid "Zar"
+msgstr "Зар"
+
+#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
+msgid "azerty/digits"
+msgstr "azerty/цифри"
+
+#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
+msgid "digits"
+msgstr "цифри"
+
+#: ../rules/base.xml.in.h:650 ../rules/evdev.xml.in.h:650
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "по�унута крапка з комою та лапки (за�таріло)"
+
+#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, розширений Backslash"
+
+#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
+msgid "qwerty/digits"
+msgstr "qwerty/цифри"
+
+#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
+msgid "qwertz"
+msgstr "qwertz"
+
+#~ msgid "(Legacy) Dvorak"
+#~ msgstr "(За�таріла) Дворак"
diff --git a/xorg-server/xkbdata.src/po/vi.po b/xorg-server/xkbdata.src/po/vi.po
new file mode 100644
index 000000000..64f851e24
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/vi.po
@@ -0,0 +1,2630 @@
+# Vietnamese translation for X Keyboard Config.
+# Copyright © 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+# Phan Vinh Thinh <teppi82@gmail.com>, 2005.
+# Clytie Siddall <clytie@riverland.net.au>, 2007-2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.4-pre1\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2008-09-15 23:52+0100\n"
+"PO-Revision-Date: 2008-09-21 21:38+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.7b3\n"
+
+#: ../rules/base.xml.in.h:1 ../rules/evdev.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2 ../rules/evdev.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(Thừa tự) Tương đương"
+
+#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Thừa tự) Tương đương, phím chết Sun"
+
+#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Thừa tự) Tương đương, phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
+msgid "101/104 key Compatible"
+msgstr "Tương thích với kiểu 101/104 phím"
+
+#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/dấu phẩy/Phím chết"
+
+#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/dấu phẩy/Phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/dấu chấm/Phím chết"
+
+#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/dấu chấm/Phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/dấu phẩy/Phím chết"
+
+#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/dấu phẩy/Phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/dấu chấm/Phím chết"
+
+#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/dấu chấm/Phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/dấu phẩy/Phím chết"
+
+#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/dấu phẩy/Phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/dấu chấm/Phím chết"
+
+#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/dấu chấm/Phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/dấu phẩy/Phím chết"
+
+#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/dấu phẩy/Phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/dấu chấm/Phím chết"
+
+#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/dấu chấm/Phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:23 ../rules/evdev.xml.in.h:23
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "Không dây �ể bàn RFKB-23 A4Tech"
+
+#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
+msgid "ACPI Standard"
+msgstr "ACPI Tiêu chuẩn"
+
+#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
+msgid "ATM/phone-style hexadecimal keypad"
+msgstr "Vùng phím thập lục kiểu điện thoại/ATM"
+
+#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
+msgid "Acer Laptop"
+msgstr "Xách tay Acer"
+
+#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
+msgid "Add the EuroSign to the 2 key."
+msgstr "Thêm ký hiệu đồng Euro vào phím 2."
+
+#: ../rules/base.xml.in.h:32 ../rules/evdev.xml.in.h:32
+msgid "Add the EuroSign to the 4 key."
+msgstr "Thêm ký hiệu đồng Euro vào phím 4."
+
+#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "Thêm ký hiệu đồng Euro vào phím 5."
+
+#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "Thêm ký hiệu đồng Euro vào phím E."
+
+#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "Thêm tính năng cơ bản vào phím Menu."
+
+#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Thêm ký hiệu đồng Euro vào các phím chắc chắn"
+
+#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Nâng cao Scorpius KI"
+
+#: ../rules/base.xml.in.h:38 ../rules/evdev.xml.in.h:38
+msgid "Afg"
+msgstr "Afg"
+
+#: ../rules/base.xml.in.h:39 ../rules/evdev.xml.in.h:39
+msgid "Afghanistan"
+msgstr "A Phú Hãn"
+
+#: ../rules/base.xml.in.h:40 ../rules/evdev.xml.in.h:40
+msgid "Akan"
+msgstr "Akan"
+
+#: ../rules/base.xml.in.h:41 ../rules/evdev.xml.in.h:41
+msgid "Alb"
+msgstr "Alb"
+
+#: ../rules/base.xml.in.h:42 ../rules/evdev.xml.in.h:42
+msgid "Albania"
+msgstr "Al-ba-ni-a"
+
+#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt và Meta trên phím các Alt"
+
+#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "�nh xạ Alt sang phím Win bên phải và Super sang Menu."
+
+#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Alt+CapsLock thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+Ctrl thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Alt+Shift thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Các làm việc của Alt/Win"
+
+#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
+msgid "Alternative"
+msgstr "TÆ°Æ¡ng Ä‘Æ°Æ¡ng"
+
+#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "�ông tương đương"
+
+#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "Ngữ âm tương đương"
+
+#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "Quốc tế tương đương (cũ us_intl)"
+
+#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "Tương đương, phím chết Sun"
+
+#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "Tương đương, phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "Tương đương, chỉ Latin-9"
+
+# Literal: don't translate/Nghĩa chữ : đừng dịch
+#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
+msgid "Andorra"
+msgstr "An-Ä‘oa-ra"
+
+#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "Phương án hô ngữ (')"
+
+# Name: don't translate/Tên: đừng dịch
+#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Xách tay Apple"
+
+#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
+msgid "Arabic"
+msgstr "Ả Rập"
+
+#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
+msgid "Armenia"
+msgstr "�c-mê-ni"
+
+#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "Biến thế Ax-tu-ri có H chấm dưới và L chấm dưới"
+
+#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
+msgid "Asus Laptop"
+msgstr "Xách tay Asus"
+
+#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
+msgid "Azerbaijan"
+msgstr "A-xơ-bai-gian"
+
+#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Bàn phím không dây Internet Azona RF2300"
+
+#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Phim nhạc"
+
+#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
+
+#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
+msgid "Baltic+"
+msgstr "Ban-tích+"
+
+#: ../rules/base.xml.in.h:80 ../rules/evdev.xml.in.h:80
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
+msgid "Bangladesh"
+msgstr "Băng-la-đexợ"
+
+#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
+msgid "Belarus"
+msgstr "Bê-la-rút"
+
+#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
+msgid "Belgium"
+msgstr "Bỉ"
+
+#: ../rules/base.xml.in.h:85 ../rules/evdev.xml.in.h:85
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
+msgid "Bengali"
+msgstr "Ben-ga-li"
+
+#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
+msgid "Bengali Probhat"
+msgstr "Ben-ga-li Probhat"
+
+#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, tối ưu nhân tố, cách Dvorak"
+
+#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, tối ưu nhân tố, cách Dvorak, chỉ Latin-9"
+
+#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
+msgid "Bhutan"
+msgstr "Bhu-tan"
+
+#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Do Thái kinh thánh (Tiro)"
+
+#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
+msgid "Bosnia and Herzegovina"
+msgstr "Bô-xni-a và Héc-xê-gô-vi-na"
+
+#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
+msgid "Both Alt keys together change layout."
+msgstr "Nhấn đồng th�i hai phím Alt thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
+msgid "Both Ctrl keys together change layout."
+msgstr "Nhấn đồng th�i hai phím Ctrl thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
+msgid "Both Shift keys together change layout."
+msgstr "Nhấn đồng th�i hai phím Shift thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
+msgid "Both Win-keys switch layout while pressed."
+msgstr "Cả hai phím Win chuyển ngôn ngữ nhập khi nhấn."
+
+#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
+msgid "Braille"
+msgstr "Chữ nổi"
+
+#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+msgid "Brazil"
+msgstr "Bra-xin"
+
+#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
+msgid "Brazilian ABNT2"
+msgstr "ABNT2 của Bra-xin"
+
+#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
+msgid "Brother Internet Keyboard"
+msgstr "Bàn phím Internet Brother"
+
+#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
+msgid "Bulgaria"
+msgstr "Bun-ga-ri"
+
+#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
+msgid "Cambodia"
+msgstr "Căm Bốt"
+
+#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
+msgid "Canada"
+msgstr "Ca-na-da"
+
+#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
+msgid "Caps Lock is Compose."
+msgstr "Caps Lock là Soạn thảo."
+
+#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
+msgid "CapsLock LED shows alternative layout."
+msgstr "�èn CapsLock cho biết ngôn ngữ nhập tương đương."
+
+#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "CapsLock hoạt động như Shift với việc khóa. Shift « tạm dừng » CapsLock."
+
+#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "CapsLock hoạt động như Shift với việc khóa. Shift không có tác động CapsLock."
+
+#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
+msgid "CapsLock just locks the Shift modifier."
+msgstr "CapsLock khóa tính năng của Shift."
+
+#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
+msgid "CapsLock key behavior"
+msgstr "�ặc điểm của phím CapsLock"
+
+#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
+msgid "CapsLock key changes layout."
+msgstr "CapsLock thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
+msgid "CapsLock switch to first layout, Shift+CapsLock switch to last layout."
+msgstr "CapsLock chuyển đổi sang bố trí đầu tiên, Shift+CapsLock chuyển đổi sang bố trí cuối cùng."
+
+#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "CapsLock bật tắt Shift vì thế m�i phím đ�u bị ảnh hưởng."
+
+#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "CapsLock bật tắt viết hoa thông thư�ng của các ký tự chữ cái."
+
+#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "CapsLock sử dụng viết hoa nội bộ. Shift « tạm dừng » CapsLock."
+
+#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "CapsLock sử dụng viết hoa nội bộ. Shift không có tác động CapsLock."
+
+#: ../rules/base.xml.in.h:126 ../rules/evdev.xml.in.h:126
+msgid "Catalan variant with middle-dot L"
+msgstr "Biến thể Ca-ta-lan có chữ L chấm giữa"
+
+# Tên bố trí bàn phím ?
+#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
+msgid "Cedilla"
+msgstr "Cedilla"
+
+#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+msgid "Cherokee"
+msgstr "Che-rô-khi"
+
+#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (luân phiên tùy ch�n)"
+
+#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd Cái Nối USB"
+
+#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
+msgid "Chicony Internet Keyboard"
+msgstr "Bàn phím Internet Chicony"
+
+#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
+msgid "China"
+msgstr "Trung Quốc"
+
+#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+msgid "Chuvash"
+msgstr "Chu-vasợ"
+
+#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
+msgid "Chuvash Latin"
+msgstr "Chu-vasợ La-tinh"
+
+#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
+msgid "Classic"
+msgstr "Kinh điển"
+
+#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
+msgid "Classic Dvorak"
+msgstr "Dvorak kinh điển"
+
+#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
+msgid "Compaq Easy Access Keyboard"
+msgstr "Bàn phím Truy cập Dễ dàng của Compaq"
+
+#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Bàn phím Internet Compaq (13 phím)"
+
+#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Bàn phím Internet Compaq (18 phím)"
+
+#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Bàn phím Internet Compaq (7 phím)"
+
+#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
+msgid "Compaq iPaq Keyboard"
+msgstr "Bàn phím iPaq Compaq"
+
+#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
+msgid "Compose key position"
+msgstr "Vị trí phím Soạn thảo"
+
+#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
+msgid "Congo, Democratic Republic of the"
+msgstr "Cộng Hoà Dân Chủ Công-gô"
+
+#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "Control được ánh xạ tới các phím Win (và các phím Ctrl thư�ng dùng)"
+
+#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
+msgid "Croatia"
+msgstr "Cợ-rô-a-ti-a"
+
+#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
+msgid "Ctrl key at bottom left"
+msgstr "Phím Ctrl ở phía dưới bên trái"
+
+#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
+msgid "Ctrl key at left of 'A'"
+msgstr "Phím Ctrl ở bên trái của 'A'"
+
+#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
+msgid "Ctrl key position"
+msgstr "Vị trí phím Ctrl"
+
+#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
+msgid "Ctrl+Shift change layout."
+msgstr "Control+Shift thay đổi ngôn ngữ nhập vào."
+
+#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
+msgid "Cyrillic"
+msgstr "Ki-rin"
+
+#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
+msgid "Cyrillic with guillemets"
+msgstr "Ki-rin với « chim uria »"
+
+#: ../rules/base.xml.in.h:161 ../rules/evdev.xml.in.h:161
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Ki-rin, đổi chỗ Z và ZHE"
+
+#: ../rules/base.xml.in.h:162 ../rules/evdev.xml.in.h:162
+msgid "Cze"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
+msgid "Czechia"
+msgstr "Séc"
+
+#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
+msgid "Dan"
+msgstr "Dan"
+
+#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
+msgid "Dead acute"
+msgstr "Chết sắc"
+
+#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
+msgid "Dead grave acute"
+msgstr "Chết huy�n sắc"
+
+#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
+msgid "Default numeric keypad keys."
+msgstr "Các phím vùng số mặc định."
+
+#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
+msgid "Dell 101-key PC"
+msgstr "Dell PC 101 phím"
+
+#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Xách tay Dell Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Xách tay Dell dãy Precision M"
+
+#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
+msgid "Dell Latitude series laptop"
+msgstr "Xách tay Dell dãy Latitude"
+
+#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Bàn phím đa phương tiện USB Dell"
+
+#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
+msgid "Denmark"
+msgstr "�an Mạch"
+
+#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
+msgid "Deu"
+msgstr "Deu"
+
+#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Bàn phím Không dây Dexxa cho Desktop"
+
+#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
+msgid "Diamond 9801 / 9802 series"
+msgstr "Sê ri Diamond 9801 / 9802"
+
+#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+msgid "Dvorak (UK Punctuation)"
+msgstr "Dvorak (dấu chấm câu Quốc Anh)"
+
+#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+msgid "Dvorak international"
+msgstr "Dvorak quốc tế"
+
+#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak, dấu ngoặc Polish trên phím \"1/!\""
+
+#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, dấu ngoặc Polish trên phím đánh dấu ngoặc"
+
+#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
+msgid "Eastern"
+msgstr "�ông"
+
+#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
+msgid "Eliminate dead keys"
+msgstr "Phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
+msgid "Ergonomic"
+msgstr "Tối ưu nhân tố"
+
+#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
+msgid "Esperanto"
+msgstr "Ét-pe-ran-tô"
+
+#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
+msgid "Estonia"
+msgstr "Ex-tô-ni-a"
+
+#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
+msgid "Eth"
+msgstr "Eth"
+
+#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+msgid "Ethiopia"
+msgstr "Ê-ti-ô-pi"
+
+#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
+msgid "Evdev-managed keyboard"
+msgstr "Bàn phím quản lý bằng Evdev"
+
+#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
+msgid "Extended"
+msgstr "Mở rộng"
+
+#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
+msgid "Extended Backslash"
+msgstr "Gạch chéo ngược Mở rộng"
+
+#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
+msgid "F-letter (F) variant"
+msgstr "Phương án chữ cái F (F)"
+
+#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
+msgid "Faroe Islands"
+msgstr "Quần �ảo Pha-rô"
+
+#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
+msgid "Finland"
+msgstr "Phần Lan"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
+msgid "Four-level key with abstract separators"
+msgstr "Phím bốn bậc có bộ phân cách ảo"
+
+#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
+msgid "Four-level key with comma"
+msgstr "Phím bốn bậc có dấu phẩy"
+
+#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
+msgid "Four-level key with dot"
+msgstr "Phím bốn bậc có chấm"
+
+#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+msgid "Four-level key with momayyez"
+msgstr "Phím bốn bậc có momayyez"
+
+#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
+msgid "France"
+msgstr "Pháp"
+
+#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
+msgid "French"
+msgstr "Pháp"
+
+#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
+msgid "French (Macintosh)"
+msgstr "Pháp (Macintosh)"
+
+#: ../rules/base.xml.in.h:219 ../rules/evdev.xml.in.h:219
+msgid "French (legacy)"
+msgstr "Pháp (di sản)"
+
+#: ../rules/base.xml.in.h:220 ../rules/evdev.xml.in.h:220
+msgid "French Dvorak"
+msgstr "Pháp Dvorak"
+
+#: ../rules/base.xml.in.h:221 ../rules/evdev.xml.in.h:221
+msgid "French, Sun dead keys"
+msgstr "Pháp, phím chết Sun"
+
+#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
+msgid "French, eliminate dead keys"
+msgstr "Pháp, phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
+msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
+msgstr "Máy tính xách tay AMILO A1667G Fujitsu-Siemens"
+
+#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
+msgid "Fula"
+msgstr "Fula"
+
+#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
+msgid "Generic 101-key PC"
+msgstr "PC chung 101 phím"
+
+#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
+msgid "Generic 102-key (Intl) PC"
+msgstr "PC chung 102 phím (Intl)"
+
+#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
+msgid "Generic 104-key PC"
+msgstr "PC chung 104 phím"
+
+#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
+msgid "Generic 105-key (Intl) PC"
+msgstr "PC chung 105 phím (Intl)"
+
+# Name: don't translate/Tên: đừng dịch
+#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Tiện lợi KB-16M / Bàn phím Genius MM KWD-910"
+
+#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+# Name: don't translate/Tên: đừng dịch
+#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
+msgid "Georgia"
+msgstr "Gi-oa-gi-a"
+
+#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
+msgid "Georgian"
+msgstr "Gi-oa-gi-a"
+
+#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
+msgid "Georgian AZERTY Tskapo"
+msgstr "Gi-oa-gi-a AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
+msgid "German (Macintosh)"
+msgstr "�ức (Macintosh)"
+
+#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
+msgid "German, Sun dead keys"
+msgstr "�ức, phím chết Sun"
+
+#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
+msgid "German, eliminate dead keys"
+msgstr "�ức, phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
+msgid "Germany"
+msgstr "�ức"
+
+#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
+msgid "Ghana"
+msgstr "Gha-na"
+
+#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
+msgid "Greece"
+msgstr "Hy Lạp"
+
+#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
+msgid "Group toggle on multiply/divide key"
+msgstr "Bật/tắt bó với phím nhân/chia"
+
+#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
+msgid "Gui"
+msgstr "Gui"
+
+#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
+msgid "Guinea"
+msgstr "Ghi-nê"
+
+#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
+msgid "Gujarati"
+msgstr "Gu-gia-ra-ti"
+
+#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
+msgid "Gurmukhi"
+msgstr "Gổ-mu-khi"
+
+#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
+msgid "Gurmukhi Jhelum"
+msgstr "Gổ-mu-khi Jhelum"
+
+#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
+msgid "Gyration"
+msgstr "Sự chuyển hồi"
+
+#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
+msgid "Happy Hacking Keyboard"
+msgstr "Bàn phím Happy Hacking"
+
+#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Bàn phím Happy Hacking cho Mac"
+
+#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
+msgid "Hausa"
+msgstr "Hau-xa"
+
+#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Bàn phím Internet Hewlett-Packard"
+
+#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
+msgid "Hewlett-Packard Internet Keyboard 5181"
+msgstr "Bàn phím Internet Hewlett-Packard 5181"
+
+#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
+msgid "Hewlett-Packard Internet Keyboard 5185"
+msgstr "Bàn phím Internet Hewlett-Packard 5185"
+
+#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Bàn phím phim nhạc Hewlett-Packard SK-2501"
+
+#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Bàn phím Internet Hewlett-Packard SK-2505"
+
+#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
+msgid "Hindi Bolnagri"
+msgstr "Hin-Ä‘i Bolnagri"
+
+#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
+msgid "Homophonic"
+msgstr "Cùng một chủ điệu"
+
+#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
+msgid "Hun"
+msgstr "Hun"
+
+#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
+msgid "Hungary"
+msgstr "Hun-ga-ri"
+
+#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper được gắn tới các phím Win."
+
+#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+msgid "IBM Rapid Access"
+msgstr "Truy cập nhanh IBM"
+
+#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+msgid "IBM Rapid Access II"
+msgstr "Truy cập nhanh IBM II"
+
+#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "Truy cập nhanh IBM II (luân phiên tùy ch�n)"
+
+#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
+
+#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, quốc tế"
+
+#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+msgid "ISO Alternate"
+msgstr "ISO Xen kẽ"
+
+#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
+msgid "Iceland"
+msgstr "Băng �ảo"
+
+#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
+msgid "Igbo"
+msgstr "Ig-bô"
+
+#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+msgid "India"
+msgstr "Ấn �ộ"
+
+#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
+msgid "International (AltGr dead keys)"
+msgstr "Quốc tế (với phím chết AltGr)"
+
+#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
+msgid "International (with dead keys)"
+msgstr "Quốc tế (với phím chết)"
+
+#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+msgid "Inuktitut"
+msgstr "I-nukh-ti-tu-th"
+
+#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+msgid "Iran"
+msgstr "I-rắn"
+
+#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
+msgid "Iraq"
+msgstr "I-rắc"
+
+#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
+msgid "Ireland"
+msgstr "�i-nhĩ-lan"
+
+#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
+msgid "Irq"
+msgstr "Irq"
+
+#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
+msgid "Israel"
+msgstr "Do Thái"
+
+#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
+msgid "Italy"
+msgstr "�"
+
+#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
+msgid "Japan"
+msgstr "Nhật Bản"
+
+#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
+msgid "Japan (PC-98xx Series)"
+msgstr "Nhật (dãy PC-98xx)"
+
+#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
+msgid "Japanese 106-key"
+msgstr "Nhật bản 106 phím"
+
+#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
+msgid "Japanese keyboard options"
+msgstr "Tùy ch�n bàn phím tiếng Nhật"
+
+#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
+msgid "Kana Lock key is locking"
+msgstr "Phím Kana Lock sẽ khoá"
+
+#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
+msgid "Kashubian"
+msgstr "Kha-su-bi"
+
+#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
+msgid "Kazakh with Russian"
+msgstr "Kha-xắc với tiếng Nga"
+
+#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
+msgid "Kazakhstan"
+msgstr "Kha-xắc-x-tanh"
+
+#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
+msgid "Keypad"
+msgstr "Vùng phím"
+
+#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
+msgid "Keypad with unicode additions (arrows and math operators)"
+msgstr "Vùng phím có phần thêm Unicode (các mũi tên và toán tử toán h�c)"
+
+#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
+msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Vùng phím có phần thêm Unicode (các mũi tên và toán tử toán h�c).  Bậc mặc định thì nhập các toán tử toán h�c."
+
+#: ../rules/base.xml.in.h:320 ../rules/evdev.xml.in.h:320
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
+msgid "Khm"
+msgstr "Khm"
+
+#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
+msgid "Kir"
+msgstr "Kir"
+
+#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
+msgid "Komi"
+msgstr "Komi"
+
+#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
+msgid "Korea, Republic of"
+msgstr "Cộng Hoà Nam Hàn"
+
+#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
+msgid "Korean 106-key"
+msgstr "Hàn 106 phím"
+
+#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
+msgid "Ktunaxa"
+msgstr "Ktunaxa"
+
+#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+msgid "Kurdish, (F)"
+msgstr "Kuổ-đít (F)"
+
+#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+msgid "Kurdish, Arabic-Latin"
+msgstr "Kuổ-đít, A Rập/La-tinh"
+
+#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Kuổ-đít, La-tinh Alt-Q"
+
+#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
+msgid "Kurdish, Latin Q"
+msgstr "Kuổ-đít, La-tinh Q"
+
+#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
+msgid "Kyrgyzstan"
+msgstr "Kyr-gi-x-tanh"
+
+#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
+msgid "LCtrl+LShift change layout."
+msgstr "Ctrl+Shift bên trái thay đổi ngôn ngữ nhập vào."
+
+#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
+msgid "LEKP"
+msgstr "LEKP"
+
+#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
+msgid "LEKPa"
+msgstr "LEKPa"
+
+#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
+msgid "Lao"
+msgstr "Lào"
+
+#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
+msgid "Laos"
+msgstr "Lào"
+
+#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Bàn phím nh� g�n cho máy xách tay/notebook Compaq (ví dụ Armada)"
+
+#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Bàn phím Internet cho máy xách tay/notebook Compaq (ví dụ Presario)"
+
+#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Xách tay eMachines m68xx"
+
+#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
+msgid "Latin"
+msgstr "La-tinh"
+
+#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
+msgid "Latin American"
+msgstr "La-tinh Mỹ"
+
+#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
+msgid "Latin Unicode"
+msgstr "La-tinh Unicode"
+
+#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
+msgid "Latin Unicode qwerty"
+msgstr "La-tinh Unicode qwerty"
+
+#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
+msgid "Latin qwerty"
+msgstr "La-tinh qwerty"
+
+#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
+msgid "Latin unicode"
+msgstr "La-tinh Unicode"
+
+#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
+msgid "Latin unicode qwerty"
+msgstr "La-tinh Unicode QWERTY"
+
+#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
+msgid "Latin with guillemets"
+msgstr "La-tinh với « chim uria »"
+
+#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
+msgid "Latvia"
+msgstr "Lát-via"
+
+#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
+msgid "Lav"
+msgstr "Lav"
+
+#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
+msgid "Layout switching"
+msgstr "Chuyển đổi ngôn ngữ nhập"
+
+#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
+msgid "Left Alt is swapped with left Win-key."
+msgstr "Alt bên trái được trao đổi với phím Win bên trái."
+
+#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
+msgid "Left Alt key changes layout."
+msgstr "Phím Alt bên trái thay đổi ngôn ngữ nhập vào."
+
+#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
+msgid "Left Alt key switches layout while pressed."
+msgstr "Phím Alt bên trái chuyển đổi ngôn ngữ khi được nhấn."
+
+#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
+msgid "Left Ctrl key changes layout."
+msgstr "Phím Ctrl bên trái thay đổi ngôn ngữ nhập vào."
+
+#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
+msgid "Left Shift key changes layout."
+msgstr "Phím Shift bên trái thay đổi ngôn ngữ nhập vào."
+
+#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
+msgid "Left Win-key changes layout."
+msgstr "Phím Win bên trái thay đổi ngôn ngữ nhập vào."
+
+#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
+msgid "Left Win-key is Compose."
+msgstr "Phím Win bên trái là Soạn thảo."
+
+#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
+msgid "Left Win-key switches layout while pressed."
+msgstr "Phím Win bên trái chuyển đổi ngôn ngữ khi được nhấn."
+
+#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
+msgid "Left hand"
+msgstr "Thuận tay trái"
+
+#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
+msgid "Left handed Dvorak"
+msgstr "Dvorak thuận tay trái"
+
+#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+msgid "Legacy"
+msgstr "Thừa tự"
+
+#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
+msgid "Legacy Wang 724 keypad"
+msgstr "Vùng phím Wang 724 thừa tự"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+msgid "Legacy key with comma"
+msgstr "Phím thừa tự có dấu phẩy"
+
+#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+msgid "Legacy key with dot"
+msgstr "Phím thừa tự có chấm"
+
+#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
+msgid "Legacy keypad"
+msgstr "Vùng phím thừa tự"
+
+#: ../rules/base.xml.in.h:369 ../rules/evdev.xml.in.h:369
+msgid "Less-than/Greater-than is Compose."
+msgstr "Nh�/Lớn hơn là Soạn thảo."
+
+#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+msgid "Lithuania"
+msgstr "Li-tu-a-ni"
+
+#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
+msgid "Logitech Access Keyboard"
+msgstr "Bàn phím Truy cập Logitech"
+
+#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (tùy ch�n thay thế)"
+
+#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:375 ../rules/evdev.xml.in.h:375
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (luân phiên tùy ch�n2)"
+
+#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 các phím thêm thông qua G15daemon"
+
+#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
+msgid "Logitech Generic Keyboard"
+msgstr "Bàn phím chung Logitech"
+
+#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Bàn phím Internet Logitech 350"
+
+#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
+msgid "Logitech Internet Keyboard"
+msgstr "Bàn phím Internet Logitech"
+
+#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Bàn phím Logitech Internet Navigator"
+
+#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
+msgid "Logitech Media Elite Keyboard"
+msgstr "Bàn phím Logitech Media Elite"
+
+#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Bàn phím Logitech Ultra-X Cordless Media Desktop"
+
+#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Bàn phím Logitech Ultra-X"
+
+#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Bàn phím Logitech diNovo Edge"
+
+#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
+msgid "Logitech diNovo Keyboard"
+msgstr "Bàn phím Logitech diNovo"
+
+#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Bàn phím Không dây Logitech iTouch (mẫu mã Y-RB6)"
+
+#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Bàn phím Logitech iTouch Internet Navigator SE"
+
+#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Bàn phím Logitech iTouch Internet Navigator SE (USB)"
+
+#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
+msgid "MNE"
+msgstr "MNE"
+
+#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (quốc tế)"
+
+#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
+msgid "Macedonia"
+msgstr "Ma-xê-đô-ni-a"
+
+#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
+msgid "Macintosh Old"
+msgstr "Macintosh CÅ©"
+
+#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, phím chết Sun"
+
+#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Dùng CapsLock làm một Ctrl bổ sung."
+
+#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
+msgid "Malayalam Lalitha"
+msgstr "Malayalam Lalitha"
+
+#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
+msgid "Maldives"
+msgstr "Man-đi-vơ-xợ"
+
+#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
+msgid "Malta"
+msgstr "Man-tợ"
+
+#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
+msgid "Maltese keyboard with US layout"
+msgstr "Bàn phím Man-tợ có bố trí Mỹ"
+
+#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
+msgid "Maori"
+msgstr "Mao-ri"
+
+#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Bàn phím Memorex MX2500 EZ-Access"
+
+#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
+msgid "Menu is Compose."
+msgstr "Menu là Soạn thảo."
+
+#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
+msgid "Menu key changes layout."
+msgstr "Phím Menu thay đổi ngôn ngữ nhập vào."
+
+#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta được gắn với các phím Win."
+
+#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta được gắn với phím Win bên trái."
+
+#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
+msgid "Microsoft Internet Keyboard"
+msgstr "Bàn phím Internet Microsoft"
+
+#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Bàn phím Internet Microsoft Pro, Thụy �iển"
+
+#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
+
+#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:428 ../rules/evdev.xml.in.h:428
+msgid "Microsoft Office Keyboard"
+msgstr "Bàn phím Văn phòng Microsoft"
+
+#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+msgid "Miscellaneous compatibility options"
+msgstr "Tùy ch�n tương thích khác"
+
+#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
+msgid "Mongolia"
+msgstr "Mông Cổ"
+
+#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
+msgid "Montenegro"
+msgstr "Mon-te-nê-gợ-rô"
+
+#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
+msgid "Morocco"
+msgstr "Ma Rốc"
+
+#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
+msgid "Multilingual"
+msgstr "�a ngôn ngữ"
+
+#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
+msgid "Multilingual, first part"
+msgstr "�a ngôn ngữ, phần đầu"
+
+#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
+msgid "Multilingual, second part"
+msgstr "�a ngôn ngữ, phần hai"
+
+#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+msgid "Myanmar"
+msgstr "Miến �iện"
+
+#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
+msgid "NICOLA-F style Backspace"
+msgstr "Xoá lùi kiểu NICOLA-F"
+
+# Name or category? Tên hay phân loại?
+#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
+msgid "Neostyle"
+msgstr "Neostyle"
+
+#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
+msgid "Nepal"
+msgstr "Ne-pan"
+
+#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
+msgid "Netherlands"
+msgstr "Hà Lan"
+
+#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
+msgid "Nig"
+msgstr "Nig"
+
+#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
+msgid "Nigeria"
+msgstr "Ni-gê-ri-a"
+
+#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
+msgid "Northern Saami"
+msgstr "Bắc Xa-mi"
+
+#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Bắc Xa-mi, phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
+msgid "Norway"
+msgstr "Na Uy"
+
+#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
+msgid "NumLock LED shows alternative layout."
+msgstr "�èn NumLock cho biết ngôn ngữ tương đương."
+
+#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
+msgid "Numeric keypad delete key behaviour"
+msgstr "Ứng xử phím xoá của vùng số"
+
+#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
+msgid "Numeric keypad keys work as with Mac."
+msgstr "Phím vùng số hoạt động như trên Mac."
+
+#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
+msgid "Numeric keypad layout selection"
+msgstr "Ch�n bố trí vùng phím số"
+
+#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
+msgid "OLPC"
+msgstr "OLPC"
+
+#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
+msgid "OLPC Dari"
+msgstr "OLPC Dari"
+
+#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
+msgid "OLPC Pashto"
+msgstr "OLPC Pas-tô"
+
+#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
+msgid "OLPC Southern Uzbek"
+msgstr "OLPC Nam Ux-béc"
+
+#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
+msgid "Ogham"
+msgstr "Og-âm"
+
+#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
+msgid "Ogham IS434"
+msgstr "Ogam IS434"
+
+#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
+msgid "Oriya"
+msgstr "Ô-ri-a"
+
+#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Bàn phím Ortek MCK-800 MM/Internet"
+
+#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+msgid "Ossetian"
+msgstr "O-xét"
+
+#: ../rules/base.xml.in.h:469 ../rules/evdev.xml.in.h:469
+msgid "Ossetian, Winkeys"
+msgstr "O-xét, phím Win"
+
+#: ../rules/base.xml.in.h:470 ../rules/evdev.xml.in.h:470
+msgid "Ossetian, legacy"
+msgstr "O-xét, thừa tự"
+
+#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+msgid "PC-98xx Series"
+msgstr "Sê ri PC-98xx"
+
+#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:473 ../rules/evdev.xml.in.h:473
+msgid "Pakistan"
+msgstr "Pa-khi-x-tanh"
+
+#: ../rules/base.xml.in.h:474 ../rules/evdev.xml.in.h:474
+msgid "Pashto"
+msgstr "Pas-tô"
+
+#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
+msgid "Pattachote"
+msgstr "Pa-ta-chô-te"
+
+#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
+msgid "Phonetic"
+msgstr "Ngữ âm"
+
+#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
+msgid "Poland"
+msgstr "Phần Lan"
+
+#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
+msgid "Polytonic"
+msgstr "Nhi�u âm"
+
+#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+msgid "Portugal"
+msgstr "Bồ �ào Nha"
+
+#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Nhấn phím Alt bên trái để ch�n ngôn ngữ thứ 3."
+
+#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Nhấn phím Win bên trái để ch�n ngôn ngữ thứ 3."
+
+#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
+msgid "Press Menu key to choose 3rd level."
+msgstr "Nhấn phím Menu để ch�n ngôn ngữ thứ 3."
+
+#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "Nhấn phím Alt bên phải để ch�n ngôn ngữ thứ 3, phím Shift+Right Alt là Multi_Key."
+
+#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Nhấn phím Alt bên phải để ch�n ngôn ngữ thứ 3."
+
+#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Nhấn phím Control bên phải để ch�n ngôn ngữ thứ 3."
+
+#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Nhấn phím Win bên phải để ch�n ngôn ngữ thứ 3."
+
+#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Nhấn phím Alt bất kỳ để ch�n ngôn ngữ thứ 3."
+
+#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Nhấn phím Win bất kỳ để ch�n ngôn ngữ thứ 3."
+
+#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
+msgid "Pro Keypad"
+msgstr "Vùng phím Pro"
+
+#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
+msgid "Programmer Dvorak"
+msgstr "Programmer Dvorak"
+
+#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
+msgid "R-Alt switches layout while pressed."
+msgstr "Phím Alt bên phải chuyển đổi ngôn ngữ nhập vào khi được nhấn."
+
+#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
+msgid "Right Alt is Compose."
+msgstr "Alt bên phải là Soạn thảo."
+
+#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
+msgid "Right Alt key changes layout."
+msgstr "Phím Alt bên phải thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
+msgid "Right Alt key never chooses 3rd level."
+msgstr "Phím Alt bên phải không bao gi� ch�n ngôn ngữ thứ 3."
+
+#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
+msgid "Right Ctrl is Compose."
+msgstr "Ctrl bên phải là Soạn thảo."
+
+#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
+msgid "Right Ctrl key changes layout."
+msgstr "Phím Ctrl bên phải thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "Phím Ctrl bên phải chuyển đổi ngôn ngữ nhập vào khi được nhấn."
+
+#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Phím Ctrl bên phải làm việc như Alt bên phải."
+
+#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
+msgid "Right Shift key changes layout."
+msgstr "Phím Shift bên phải thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
+msgid "Right Win-key changes layout."
+msgstr "Phím Win bên phải thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
+msgid "Right Win-key is Compose."
+msgstr "Phím Win bên phải là Soạn thảo."
+
+#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
+msgid "Right Win-key switches layout while pressed."
+msgstr "Phím Win bên phải chuyển đổi ngôn ngữ nhập vào khi được nhấn."
+
+#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+msgid "Right hand"
+msgstr "Thuận tay phải"
+
+#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
+msgid "Right handed Dvorak"
+msgstr "Dvorak thuận tay phải"
+
+#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
+msgid "Romania"
+msgstr "Rô-ma-ni"
+
+#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
+msgid "Romanian keyboard with German letters"
+msgstr "Bàn phím Rô-ma-ni với các chữ cái �ức"
+
+#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Bàn phím Rô-ma-ni với các chữ cái �ức, các phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+msgid "Rus"
+msgstr "Nga"
+
+#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+msgid "Russia"
+msgstr "Nga"
+
+#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+msgid "Russian"
+msgstr "Nga"
+
+#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+msgid "Russian phonetic"
+msgstr "Nga ngữ âm"
+
+#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+msgid "Russian phonetic Dvorak"
+msgstr "Nga ngữ âm Dvorak"
+
+#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Nga ngữ âm, phím chết loại trừ"
+
+#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+msgid "Russian with Kazakh"
+msgstr "Nga có Kha-xắc"
+
+#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "Bàn phím Không dây �a phương tiện SILVERCREST"
+
+#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
+msgid "ScrollLock LED shows alternative layout."
+msgstr "�èn ScrollLock cho biết ngôn ngữ tương đương."
+
+#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
+msgid "Serbia"
+msgstr "Xéc-bi"
+
+#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
+msgid "Shift cancels CapsLock."
+msgstr "Shift thôi CapsLock."
+
+#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "Shift với các phím vùng số làm việc như trong MS Windows."
+
+#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
+msgid "Shift+CapsLock changes layout."
+msgstr "Shift+CapsLock thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
+msgid "Simple"
+msgstr "�ơn giản"
+
+#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
+msgid "Slovakia"
+msgstr "Xlô-vác"
+
+#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
+msgid "Slovenia"
+msgstr "Xlô-ven"
+
+#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
+msgid "South Africa"
+msgstr "Nam Phi"
+
+#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
+msgid "Southern Uzbek"
+msgstr "Nam Ux-béc"
+
+#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ tư, ký tự dấu cách không thể ngắt mảnh ở bậc thứ sáu."
+
+#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift"
+msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ tư, ký tự dấu cách không thể ngắt mảnh ở bậc thứ sáu (dùng Ctrl+Shift)."
+
+#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ tư."
+
+#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
+msgid "Space key outputs non-breakable space character at second level."
+msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ hai."
+
+#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ ba, không nhập gì ở bậc thứ tư."
+
+#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ ba, ký tự dấu cách không thể ngắt mảnh ở bậc thứ tư."
+
+#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
+msgid "Space key outputs non-breakable space character at third level."
+msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ ba."
+
+#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
+msgid "Space key outputs usual space at any level."
+msgstr "Phím dài nhập ký tự dấu cách bình thư�ng ở m�i bậc."
+
+#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+msgid "Spain"
+msgstr "Tây Ban Nha"
+
+#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "�i�u khiển các phím đặt biệt (Ctrl+Alt+&lt;key&gt;) trên một máy chủ."
+
+#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
+msgid "Sri Lanka"
+msgstr "Tích-lan"
+
+#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
+msgid "Standard"
+msgstr "Tiêu chuẩn"
+
+#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
+msgid "Standard (Cedilla)"
+msgstr "Chuẩn (dấu móc dưới)"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
+msgid "Standard RSTU"
+msgstr "RSTU chuẩn"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:560 ../rules/evdev.xml.in.h:560
+msgid "Standard RSTU on Russian layout"
+msgstr "RSTU chuẩn trên bố trí tiếng Nga"
+
+#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
+msgid "Sun Type 5/6"
+msgstr "Sun kiểu 5/6"
+
+#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
+msgid "Sun dead keys"
+msgstr "Phím chết Sun"
+
+#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
+msgid "Super Power Multimedia Keyboard"
+msgstr "Bàn phím Phim nhạc Siêu Năng Lực"
+
+#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
+msgid "Super is mapped to the Win-keys."
+msgstr "Super được ánh xạ tới các phím Win."
+
+#: ../rules/base.xml.in.h:565 ../rules/evdev.xml.in.h:565
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:567 ../rules/evdev.xml.in.h:567
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
+msgid "Swap Ctrl and CapsLock."
+msgstr "Trao đổi Ctrl và CapsLock."
+
+#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
+msgid "Swap ESC and CapsLock."
+msgstr "Trao đổi ESC và CapsLock"
+
+#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr "Trao đổi mã phím của hai phím khi bàn phím Mac bị hạt nhân phát hiện sai."
+
+#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+msgid "Sweden"
+msgstr "Thuỵ �iển"
+
+#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
+msgid "Switzerland"
+msgstr "Thuỵ Sĩ"
+
+#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+msgid "Syria"
+msgstr "Xy-ri"
+
+#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+msgid "Syriac"
+msgstr "Xi-ri"
+
+#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
+msgid "Syriac phonetic"
+msgstr "Xy-ri ngữ âm"
+
+#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
+msgid "Tajikistan"
+msgstr "Ta-gikh-x-tanh"
+
+#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
+msgid "Tamil"
+msgstr "Ta-min"
+
+#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
+msgid "Tamil TAB Typewriter"
+msgstr "Ta-min TAB máy chữ"
+
+#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
+msgid "Tamil TSCII Typewriter"
+msgstr "Ta-min TSCII máy chữ"
+
+#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
+msgid "Tamil Unicode"
+msgstr "Ta-min Unicode"
+
+#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
+msgid "Tatar"
+msgstr "Ta-tă"
+
+#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
+msgid "Telugu"
+msgstr "Te-lu-gu"
+
+#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
+msgid "Thailand"
+msgstr "Thái Lan"
+
+#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
+msgid "Third level choosers"
+msgstr "Trình ch�n ngôn ngữ thứ ba"
+
+#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
+msgid "Tibetan"
+msgstr "Tây Tạng"
+
+#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tây Tạng (có chữ số ASCII)"
+
+#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+msgid "Tifinagh"
+msgstr "Ti-phi-nac"
+
+#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
+msgid "Tifinagh Alternative"
+msgstr "Ti-phi-nac tÆ°Æ¡ng Ä‘Æ°Æ¡ng"
+
+#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Ti-phi-nac ngữ âm tương đương"
+
+#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
+msgid "Tifinagh Extended"
+msgstr "Ti-phi-nac mở rộng"
+
+#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
+msgid "Tifinagh Extended Phonetic"
+msgstr "Ti-phi-nac mở rộng ngữ âm"
+
+#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
+msgid "Tifinagh Phonetic"
+msgstr "Ti-phi-nac ngữ âm"
+
+#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
+msgid "Tilde (~) variant"
+msgstr "Phương án dấu sóng (~)"
+
+#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
+msgid "Trust Direct Access Keyboard"
+msgstr "Bàn phím Truy cập Thẳng Tin tưởng"
+
+#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Bàn Phím Cổ điển Không dây Tin tưởng"
+
+#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
+msgid "Turkey"
+msgstr "Thổ Nhĩ Kỳ"
+
+#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
+msgid "Typewriter"
+msgstr "Máy chữ"
+
+#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
+msgid "UCW layout (accented letters only)"
+msgstr "Bố trí UCW (chỉ chữ có dấu)"
+
+#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Bàn phím Mỹ với các chữ ghép Bo-x-ni-a"
+
+#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
+msgid "US keyboard with Bosnian letters"
+msgstr "Bàn phím Mỹ với các chữ cái Bo-x-ni-a"
+
+#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
+msgid "US keyboard with Croatian digraphs"
+msgstr "Bàn phím Mỹ với các chữ ghép Cợ-rô-a-ti-a"
+
+#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
+msgid "US keyboard with Croatian letters"
+msgstr "Bàn phím Mỹ với các chữ cái Croát-chi-a"
+
+#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
+msgid "US keyboard with Estonian letters"
+msgstr "Bàn phím Mỹ với các chữ cái E-x-tô-ni-a"
+
+#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
+msgid "US keyboard with Lithuanian letters"
+msgstr "Bàn phím Mỹ với các chữ cái Li-tu-a-nia"
+
+#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Bàn phím Mỹ với các chữ ghép Xlô-ven"
+
+#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
+msgid "US keyboard with Slovenian letters"
+msgstr "Bàn phím Mỹ với các chữ cái Xlô-ven"
+
+#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+msgid "USA"
+msgstr "Mỹ"
+
+#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
+msgid "Udmurt"
+msgstr "U-đ-muổt"
+
+#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
+msgid "Ukraine"
+msgstr "U-cợ-rainh"
+
+#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
+msgid "UnicodeExpert"
+msgstr "Unicode Chuyên môn"
+
+#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
+msgid "United Kingdom"
+msgstr "Vương Quốc Anh"
+
+#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
+msgid "Urdu"
+msgstr "Ua-Ä‘u"
+
+#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
+msgid "Use Bosnian digraphs"
+msgstr "Dùng chữ ghép Bo-x-ni-a"
+
+#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
+msgid "Use Croatian digraphs"
+msgstr "Dùng chữ ghép Cợ-rô-a-ti-a"
+
+#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
+msgid "Use Slovenian digraphs"
+msgstr "Dùng chữ ghép Xlô-ven"
+
+#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
+msgid "Use guillemets for quotes"
+msgstr "Dùng « chim uria » làm dấu trích dẫn"
+
+#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Sử dụng đèn bàn phím để chỉ ra ngôn ngữ tương đương."
+
+#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
+msgid "Using space key to input non-breakable space character"
+msgstr "Dùng phím dài để nhập ký tự dấu cách không thể ngắt"
+
+#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+msgid "Uzbekistan"
+msgstr "Uz-be-khi-xtanh"
+
+#: ../rules/base.xml.in.h:630 ../rules/evdev.xml.in.h:630
+msgid "Vietnam"
+msgstr "Việt Nam"
+
+#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "Bàn phím Internet ViewSonic KU-306"
+
+#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Vùng phím Wang 724 có phần thêm Unicode (các mũi tên và toán tử toán h�c)"
+
+#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr "Vùng phím Wang 724 có phần thêm Unicode (các mũi tên và toán tử toán h�c). Mặc định thì nhập toán tử toán h�c."
+
+#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+msgid "Wang model 724 azerty"
+msgstr "Wang mô hình 724 azerty"
+
+#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+msgid "Western"
+msgstr "Phương Tây"
+
+#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
+msgid "Winbook Model XP5"
+msgstr "Winbook kiểu mẫu XP5"
+
+#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
+msgid "Winkeys"
+msgstr "Phím Win"
+
+#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
+msgid "With &lt;\\|&gt; key"
+msgstr "Với phím &lt;\\|&gt;"
+
+#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
+msgid "With EuroSign on 5"
+msgstr "Thêm ký hiệu đồng Euro vào phím 5."
+
+#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+msgid "With guillemets"
+msgstr "Với « chim uria »"
+
+#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
+msgid "Yahoo! Internet Keyboard"
+msgstr "Bàn phím Internet Yahoo!"
+
+#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+msgid "Yakut"
+msgstr "Ya-khú-th"
+
+#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
+msgid "Yoruba"
+msgstr "Yoa-ru-ba"
+
+#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
+msgid "Z and ZHE swapped"
+msgstr "�ổi chỗ Z và ZHE"
+
+#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
+msgid "azerty/digits"
+msgstr "azerty/chữ số"
+
+#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
+msgid "digits"
+msgstr "chữ số"
+
+#: ../rules/base.xml.in.h:650 ../rules/evdev.xml.in.h:650
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "dấu chấm phẩy và dấu trích dẫn bị dịch (quá cũ)"
+
+#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, Gạch ngược mở rộng"
+
+#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
+msgid "qwerty/digits"
+msgstr "qwerty/chữ số"
+
+#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
+msgid "qwertz"
+msgstr "qwertz"
diff --git a/xorg-server/xkbdata.src/po/zh_CN.po b/xorg-server/xkbdata.src/po/zh_CN.po
new file mode 100644
index 000000000..c249e207c
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/zh_CN.po
@@ -0,0 +1,1464 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2003 xfree86_xkb_xml maintainers.
+# This file is distributed under the same license as the xfree86_xkb_xml package.
+# Funda Wang <fundawang@linux.net.cn>, 2003.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
+"POT-Creation-Date: 2003-11-25 23:38+0000\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
+
+#: xfree86.xml.in.h:1
+msgid "\"Typewriter\""
+msgstr "“打字机�"
+
+#: xfree86.xml.in.h:2
+msgid "A Tamil typewrite-style keymap; TAB encoding"
+msgstr "泰米尔打字机风格的键映射；TAB 编�"
+
+#: xfree86.xml.in.h:3
+msgid "A Tamil typewrite-style keymap; TSCII encoding"
+msgstr "泰米尔打字机风格的键映射；TSCII 编�"
+
+#: xfree86.xml.in.h:4
+msgid "A Tamil typewrite-style keymap; Unicode encoding"
+msgstr "泰米尔打字机风格的键映射；Unicode 编�"
+
+#: xfree86.xml.in.h:5
+msgid "ACPI Standard"
+msgstr "ACPI 标准"
+
+#: xfree86.xml.in.h:6
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: xfree86.xml.in.h:7
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr "�定时和 Shift 功能相�。Shift �消大写。"
+
+#: xfree86.xml.in.h:8
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "�定时和 Shift 功能相�。Shift ��消大写。"
+
+#: xfree86.xml.in.h:9
+msgid "Add the standard behavior to Menu key."
+msgstr "将标准行为添加到��键。"
+
+#: xfree86.xml.in.h:10
+msgid "Advance Scorpius KI"
+msgstr "高级 Scorpius KI"
+
+#: xfree86.xml.in.h:11
+msgid "Alb"
+msgstr "Alb"
+
+#: xfree86.xml.in.h:12
+msgid "Albanian"
+msgstr "阿尔巴尼亚"
+
+#: xfree86.xml.in.h:13
+msgid "Alt and Meta on the Alt keys (default)."
+msgstr "Alt 键�时代表 Alt 和 Meta(默认)。"
+
+#: xfree86.xml.in.h:14
+msgid "Alt+Control changes group"
+msgstr "Alt+Ctrl 更改组"
+
+#: xfree86.xml.in.h:15
+msgid "Alt+Shift changes group"
+msgstr "Alt+Shift 更改组"
+
+#: xfree86.xml.in.h:16
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win 键行为"
+
+#: xfree86.xml.in.h:17
+msgid "Alternate"
+msgstr "替代"
+
+#: xfree86.xml.in.h:18
+msgid "Arabic"
+msgstr "阿拉伯"
+
+#: xfree86.xml.in.h:19
+msgid "Arb"
+msgstr "Arb"
+
+#: xfree86.xml.in.h:20
+msgid "Arm"
+msgstr "Arm"
+
+#: xfree86.xml.in.h:21
+msgid "Armenian"
+msgstr "亚美尼亚"
+
+#: xfree86.xml.in.h:22
+msgid "Aze"
+msgstr "Aze"
+
+#: xfree86.xml.in.h:23
+msgid "Azerbaijani"
+msgstr "阿塞拜疆"
+
+#: xfree86.xml.in.h:24
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: xfree86.xml.in.h:25
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF 多媒体"
+
+#: xfree86.xml.in.h:26
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: xfree86.xml.in.h:27
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: xfree86.xml.in.h:28
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: xfree86.xml.in.h:29
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: xfree86.xml.in.h:30
+msgid "Basic"
+msgstr "基本"
+
+#: xfree86.xml.in.h:31
+msgid "Bel"
+msgstr "Bel"
+
+#: xfree86.xml.in.h:32
+msgid "Belarusian"
+msgstr "白俄罗斯"
+
+#: xfree86.xml.in.h:33
+msgid "Belgian"
+msgstr "比利时"
+
+#: xfree86.xml.in.h:34
+msgid "Ben"
+msgstr "Ben"
+
+#: xfree86.xml.in.h:35
+msgid "Bengali"
+msgstr "孟加拉"
+
+#: xfree86.xml.in.h:36
+msgid "Bgr"
+msgstr "Bgr"
+
+#: xfree86.xml.in.h:37
+msgid "Bih"
+msgstr "Bih"
+
+#: xfree86.xml.in.h:38
+msgid "Blr"
+msgstr "Blr"
+
+#: xfree86.xml.in.h:39
+msgid "Bosnian"
+msgstr "波斯尼亚"
+
+#: xfree86.xml.in.h:40
+msgid "Both Alt keys together change group"
+msgstr "两个 Alt 键�以更改组"
+
+#: xfree86.xml.in.h:41
+msgid "Both Ctrl keys together change group"
+msgstr "两个 Ctrl 键更改组"
+
+#: xfree86.xml.in.h:42
+msgid "Both Shift keys together change group"
+msgstr "两个 Shift 键更改组"
+
+#: xfree86.xml.in.h:43
+msgid "Both Win-keys switch group while pressed"
+msgstr "按下两个 Windows 键�切�组"
+
+#: xfree86.xml.in.h:44
+msgid "Bra"
+msgstr "Bra"
+
+#: xfree86.xml.in.h:45
+msgid "Brazilian"
+msgstr "巴西"
+
+#: xfree86.xml.in.h:46
+msgid "Brazilian ABNT2"
+msgstr "巴西 ABNT2"
+
+#: xfree86.xml.in.h:47
+msgid "Brother Internet Keyboard"
+msgstr "Brother 网际键盘"
+
+#: xfree86.xml.in.h:48
+msgid "Bulgarian"
+msgstr "�加利亚"
+
+#: xfree86.xml.in.h:49
+msgid "Burmese"
+msgstr "缅甸"
+
+#: xfree86.xml.in.h:50
+msgid "Can"
+msgstr "Can"
+
+#: xfree86.xml.in.h:51
+msgid "Canadian"
+msgstr "加拿大"
+
+#: xfree86.xml.in.h:52
+msgid "Caps Lock key changes group"
+msgstr "CapsLock 键更改组"
+
+#: xfree86.xml.in.h:53
+msgid "CapsLock key behavior"
+msgstr "CapsLock 键行为"
+
+#: xfree86.xml.in.h:54
+msgid "Caps_Lock LED shows alternative group"
+msgstr "CapsLock �显示替代组(_L)"
+
+#: xfree86.xml.in.h:55
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: xfree86.xml.in.h:56
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (替代选项)"
+
+#: xfree86.xml.in.h:57
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet 键盘"
+
+#: xfree86.xml.in.h:58
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: xfree86.xml.in.h:59
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: xfree86.xml.in.h:60
+msgid "CloGaelach Laptop"
+msgstr "CloGaelach 便�"
+
+#: xfree86.xml.in.h:61
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access 键盘"
+
+#: xfree86.xml.in.h:62
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq 网际键盘(13键)"
+
+#: xfree86.xml.in.h:63
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq 网际键盘(18键)"
+
+#: xfree86.xml.in.h:64
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq 网际键盘(7键)"
+
+#: xfree86.xml.in.h:65
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq 键盘"
+
+#: xfree86.xml.in.h:66
+msgid "Control Key Position"
+msgstr "Ctrl 键�置"
+
+#: xfree86.xml.in.h:67
+msgid "Control key at bottom left"
+msgstr "Ctrl 键在左下角"
+
+#: xfree86.xml.in.h:68
+msgid "Control key at left of 'A'"
+msgstr "Ctrl 键在“A�左侧"
+
+#: xfree86.xml.in.h:69
+msgid "Control+Shift changes group"
+msgstr "Ctrl+Shift 更改组"
+
+#: xfree86.xml.in.h:70
+msgid "Croatian"
+msgstr "克罗地亚"
+
+#: xfree86.xml.in.h:71
+msgid "Cyrillic"
+msgstr "西里尔"
+
+#: xfree86.xml.in.h:72
+msgid "Cze"
+msgstr "Cze"
+
+#: xfree86.xml.in.h:73
+msgid "Czech"
+msgstr "�克"
+
+#: xfree86.xml.in.h:74
+msgid "Czech (qwerty)"
+msgstr "�克(qwerty)"
+
+#: xfree86.xml.in.h:75
+msgid "Danish"
+msgstr "丹麦"
+
+#: xfree86.xml.in.h:76
+msgid "Dead acute"
+msgstr "Dead acute"
+
+#: xfree86.xml.in.h:77
+msgid "Dead grave acute"
+msgstr "Dead grave acute"
+
+#: xfree86.xml.in.h:78
+msgid "Dell"
+msgstr "Dell"
+
+#: xfree86.xml.in.h:79
+msgid "Dell 101-key PC"
+msgstr "Dell 101 键电脑"
+
+#: xfree86.xml.in.h:80
+msgid "Deu"
+msgstr "Deu"
+
+#: xfree86.xml.in.h:81
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa 无线桌�键盘"
+
+#: xfree86.xml.in.h:82
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 系列"
+
+#: xfree86.xml.in.h:83
+msgid "Dnk"
+msgstr "Dnk"
+
+#: xfree86.xml.in.h:84
+msgid "Dutch"
+msgstr "�兰"
+
+#: xfree86.xml.in.h:85
+msgid "Dvo"
+msgstr "Dvo"
+
+#: xfree86.xml.in.h:86
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: xfree86.xml.in.h:87
+msgid "Eliminate dead keys"
+msgstr "除去死键"
+
+#: xfree86.xml.in.h:88
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: xfree86.xml.in.h:89
+msgid "Esp"
+msgstr "Esp"
+
+#: xfree86.xml.in.h:90
+msgid "Est"
+msgstr "Est"
+
+#: xfree86.xml.in.h:91
+msgid "Estonian"
+msgstr "爱沙尼亚"
+
+#: xfree86.xml.in.h:92
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: xfree86.xml.in.h:93
+msgid "Extended"
+msgstr "扩展"
+
+#: xfree86.xml.in.h:94
+msgid "Fao"
+msgstr "Fao"
+
+#: xfree86.xml.in.h:95
+msgid "Faroese"
+msgstr "法罗"
+
+#: xfree86.xml.in.h:96
+msgid "Farsi"
+msgstr "波斯"
+
+#: xfree86.xml.in.h:97
+msgid "Fin"
+msgstr "Fin"
+
+#: xfree86.xml.in.h:98
+msgid "Finnish"
+msgstr "芬兰"
+
+#: xfree86.xml.in.h:99
+msgid "Fra"
+msgstr "Fra"
+
+#: xfree86.xml.in.h:100
+msgid "French"
+msgstr "法语"
+
+#: xfree86.xml.in.h:101
+msgid "French (alternative)"
+msgstr "法语(替代)"
+
+#: xfree86.xml.in.h:102
+msgid "French Canadian"
+msgstr "法裔加拿大"
+
+#: xfree86.xml.in.h:103
+msgid "GBr"
+msgstr "GBr"
+
+#: xfree86.xml.in.h:104
+msgid "Generic 101-key PC"
+msgstr "通用 101 键电脑"
+
+#: xfree86.xml.in.h:105
+msgid "Generic 102-key (Intl) PC"
+msgstr "通用 102 键(国际)电脑"
+
+#: xfree86.xml.in.h:106
+msgid "Generic 104-key PC"
+msgstr "通用 104 键电脑"
+
+#: xfree86.xml.in.h:107
+msgid "Generic 105-key (Intl) PC"
+msgstr "通用 105 键(国际)电脑"
+
+#: xfree86.xml.in.h:108
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "通用 Comfy KB-16M / Genius MM 键盘 KWD-910"
+
+#: xfree86.xml.in.h:109
+msgid "Geo"
+msgstr "Geo"
+
+#: xfree86.xml.in.h:110
+msgid "Georgian (latin)"
+msgstr "乔治亚(拉�)"
+
+#: xfree86.xml.in.h:111
+msgid "Georgian (russian)"
+msgstr "乔治亚(俄语)"
+
+#: xfree86.xml.in.h:112
+msgid "German"
+msgstr "德语"
+
+#: xfree86.xml.in.h:113
+msgid "Grc"
+msgstr "Grc"
+
+#: xfree86.xml.in.h:114
+msgid "Greek"
+msgstr "希腊"
+
+#: xfree86.xml.in.h:115
+msgid "Group Shift/Lock behavior"
+msgstr "组切�/�定行为"
+
+#: xfree86.xml.in.h:116
+msgid "Guj"
+msgstr "Guj"
+
+#: xfree86.xml.in.h:117
+msgid "Gujarati"
+msgstr "��拉特"
+
+#: xfree86.xml.in.h:118
+msgid "Gurmukhi"
+msgstr "��普"
+
+#: xfree86.xml.in.h:119
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "惠普网际键盘"
+
+#: xfree86.xml.in.h:120
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "惠普 Omnibook 500 FA"
+
+#: xfree86.xml.in.h:121
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "惠普 Omnibook 5xx"
+
+#: xfree86.xml.in.h:122
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "惠普 Omnibook 6000/6100"
+
+#: xfree86.xml.in.h:123
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "惠普 Omnibook XE3 GC"
+
+#: xfree86.xml.in.h:124
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "惠普 Omnibook XE3 CF"
+
+#: xfree86.xml.in.h:125
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "惠普 Omnibook XT1000"
+
+#: xfree86.xml.in.h:126
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "惠普 Pavilion ZT11xx"
+
+#: xfree86.xml.in.h:127
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "惠普 SK-2501 多媒体键盘"
+
+#: xfree86.xml.in.h:128
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "惠普 SK-2505 网际键盘"
+
+#: xfree86.xml.in.h:129
+msgid "Hin"
+msgstr "Hin"
+
+#: xfree86.xml.in.h:130
+msgid "Hindi"
+msgstr "�地"
+
+#: xfree86.xml.in.h:131
+msgid "Honeywell Euroboard"
+msgstr "Honeywell 欧洲键盘"
+
+#: xfree86.xml.in.h:132
+msgid "Hrv"
+msgstr "Hrv"
+
+#: xfree86.xml.in.h:133
+msgid "Hun"
+msgstr "Hun"
+
+#: xfree86.xml.in.h:134
+msgid "Hungarian"
+msgstr "匈牙利"
+
+#: xfree86.xml.in.h:135
+msgid "Hungarian (qwerty)"
+msgstr "匈牙利(qwerty)"
+
+#: xfree86.xml.in.h:136
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper 被映射到 Windows 键。"
+
+#: xfree86.xml.in.h:137
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: xfree86.xml.in.h:138
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: xfree86.xml.in.h:139
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II(替代选项)"
+
+#: xfree86.xml.in.h:140
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: xfree86.xml.in.h:141
+msgid "INSCRIPT layout"
+msgstr "INSCRIPT layout"
+
+#: xfree86.xml.in.h:142
+msgid "IS434"
+msgstr "IS434"
+
+#: xfree86.xml.in.h:143
+msgid "IS434 laptop"
+msgstr "IS434 便�"
+
+#: xfree86.xml.in.h:144
+msgid "ISO Alternate"
+msgstr "ISO 替代"
+
+#: xfree86.xml.in.h:145
+msgid "Icelandic"
+msgstr "冰岛"
+
+#: xfree86.xml.in.h:146
+msgid "Iku"
+msgstr "Iku"
+
+#: xfree86.xml.in.h:147
+msgid "Inuktitut"
+msgstr "因纽特"
+
+#: xfree86.xml.in.h:148
+msgid "Irish"
+msgstr "爱尔兰"
+
+#: xfree86.xml.in.h:149
+msgid "Irl"
+msgstr "Irl"
+
+#: xfree86.xml.in.h:150
+msgid "Irn"
+msgstr "Irn"
+
+#: xfree86.xml.in.h:151
+msgid "Isl"
+msgstr "Isl"
+
+#: xfree86.xml.in.h:152
+msgid "Isr"
+msgstr "Isr"
+
+#: xfree86.xml.in.h:153
+msgid "Israeli"
+msgstr "以色列"
+
+#: xfree86.xml.in.h:154
+msgid "Ita"
+msgstr "Ita"
+
+#: xfree86.xml.in.h:155
+msgid "Italian"
+msgstr "�大利"
+
+#: xfree86.xml.in.h:156
+msgid "Japanese"
+msgstr "日语"
+
+#: xfree86.xml.in.h:157
+msgid "Japanese 106-key"
+msgstr "日语 106 键"
+
+#: xfree86.xml.in.h:158
+msgid "Jpn"
+msgstr "Jpn"
+
+#: xfree86.xml.in.h:159
+msgid "Kan"
+msgstr "Kan"
+
+#: xfree86.xml.in.h:160
+msgid "Kannada"
+msgstr "埃纳德"
+
+#: xfree86.xml.in.h:161
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: xfree86.xml.in.h:162
+msgid "LAm"
+msgstr "LAm"
+
+#: xfree86.xml.in.h:163
+msgid "Laptop"
+msgstr "便�"
+
+#: xfree86.xml.in.h:164
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "便�/笔记本 Compaq(如 Armada)便�键盘"
+
+#: xfree86.xml.in.h:165
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "便�/笔记本 Compaq(如自由人)网际键盘"
+
+#: xfree86.xml.in.h:166
+msgid "Laptop/notebook Dell Inspiron 8xxx"
+msgstr "便�/笔记本 Dell Inspiron 8xxx"
+
+#: xfree86.xml.in.h:167
+msgid "Latin"
+msgstr "拉�"
+
+#: xfree86.xml.in.h:168
+msgid "Latin America"
+msgstr "拉美"
+
+#: xfree86.xml.in.h:169
+msgid "Latvian"
+msgstr "拉脱维亚"
+
+#: xfree86.xml.in.h:170
+msgid "Left Alt key changes group"
+msgstr "左 Alt 键更改组"
+
+#: xfree86.xml.in.h:171
+msgid "Left Ctrl key changes group"
+msgstr "左 Ctrl 键更改组"
+
+#: xfree86.xml.in.h:172
+msgid "Left Shift key changes group"
+msgstr "左 Shift 键更改组"
+
+#: xfree86.xml.in.h:173
+msgid "Left Win-key changes group"
+msgstr "左 Windows 键更改组"
+
+#: xfree86.xml.in.h:174
+msgid "Left Win-key switches group while pressed"
+msgstr "按下左 Windows 键切�组"
+
+#: xfree86.xml.in.h:175
+msgid "Lithuanian azerty standard"
+msgstr "立陶宛 azerty 标准"
+
+#: xfree86.xml.in.h:176
+msgid "Lithuanian qwerty \"numeric\""
+msgstr "立陶宛 qwerty“数字��"
+
+#: xfree86.xml.in.h:177
+msgid "Logitech Cordless Desktop"
+msgstr "罗技无影手"
+
+#: xfree86.xml.in.h:178
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "罗技无影手桌�导航器"
+
+#: xfree86.xml.in.h:179
+msgid "Logitech Cordless Desktop Optical"
+msgstr "罗技无影手光学组�"
+
+#: xfree86.xml.in.h:180
+msgid "Logitech Cordless Desktop Pro"
+msgstr "罗技无影手高级版"
+
+#: xfree86.xml.in.h:181
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "罗技无影手高级版(替代选项)"
+
+#: xfree86.xml.in.h:182
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "罗技无影手高级版(替代选项)"
+
+#: xfree86.xml.in.h:183
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "罗技网际无影手"
+
+#: xfree86.xml.in.h:184
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "罗技�光无影手组�/桌�导航器"
+
+#: xfree86.xml.in.h:185
+msgid "Logitech Deluxe Access Keyboard"
+msgstr "罗技强手键盘"
+
+#: xfree86.xml.in.h:186
+msgid "Logitech Internet Keyboard"
+msgstr "罗技网际键盘"
+
+#: xfree86.xml.in.h:187
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "罗技网际导航键盘"
+
+#: xfree86.xml.in.h:188
+msgid "Logitech iTouch"
+msgstr "罗技 iTouch"
+
+#: xfree86.xml.in.h:189
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "罗技 iTouch 无影手键盘(型� Y-RB6)"
+
+#: xfree86.xml.in.h:190
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr "罗技 iTouch 键盘网际导航器"
+
+#: xfree86.xml.in.h:191
+msgid "Ltu"
+msgstr "Ltu"
+
+#: xfree86.xml.in.h:192
+msgid "Lva"
+msgstr "Lva"
+
+#: xfree86.xml.in.h:193
+msgid "Macedonian"
+msgstr "马其顿"
+
+#: xfree86.xml.in.h:194
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: xfree86.xml.in.h:195
+msgid "Macintosh Old"
+msgstr "Macintosh 旧产�"
+
+#: xfree86.xml.in.h:196
+msgid "Make CapsLock an additional Control"
+msgstr "将 CapsLock 作为�外的 Ctrl"
+
+#: xfree86.xml.in.h:197
+msgid "Mal"
+msgstr "Mal"
+
+#: xfree86.xml.in.h:198
+msgid "Malayalam"
+msgstr "马�西亚"
+
+#: xfree86.xml.in.h:199
+msgid "Maltese"
+msgstr "马耳他"
+
+#: xfree86.xml.in.h:200
+msgid "Maltese (US layout)"
+msgstr "马耳他(美国布局)"
+
+#: xfree86.xml.in.h:201
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: xfree86.xml.in.h:202
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access 键盘"
+
+#: xfree86.xml.in.h:203
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: xfree86.xml.in.h:204
+msgid "Menu is Compose"
+msgstr "��已编排"
+
+#: xfree86.xml.in.h:205
+msgid "Menu key changes group"
+msgstr "��键更改组"
+
+#: xfree86.xml.in.h:206
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta 被映射到 Windows 键。"
+
+#: xfree86.xml.in.h:207
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta 被映射到左 Windows 键。"
+
+#: xfree86.xml.in.h:208
+msgid "Microsoft Internet Keyboard"
+msgstr "微软网际键盘"
+
+#: xfree86.xml.in.h:209
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "微软网际键盘增强版，瑞典"
+
+#: xfree86.xml.in.h:210
+msgid "Microsoft Natural"
+msgstr "微软自然键盘"
+
+#: xfree86.xml.in.h:211
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "微软自然键盘增强版/微软网际键盘增强版"
+
+#: xfree86.xml.in.h:212
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "微软自然键盘增强版 OEM"
+
+#: xfree86.xml.in.h:213
+msgid "Microsoft Office Keyboard"
+msgstr "微软 Office 键盘"
+
+#: xfree86.xml.in.h:214
+msgid "Miscellaneous compatibility options"
+msgstr "其它兼容选项"
+
+#: xfree86.xml.in.h:215
+msgid "Mkd"
+msgstr "Mkd"
+
+#: xfree86.xml.in.h:216
+msgid "Mlt"
+msgstr "Mlt"
+
+#: xfree86.xml.in.h:217
+msgid "Mmr"
+msgstr "Mmr"
+
+#: xfree86.xml.in.h:218
+msgid "Mng"
+msgstr "Mng"
+
+#: xfree86.xml.in.h:219
+msgid "Mongolian"
+msgstr "蒙�"
+
+#: xfree86.xml.in.h:220
+msgid "Nld"
+msgstr "Nld"
+
+#: xfree86.xml.in.h:221
+msgid "Nor"
+msgstr "Nor"
+
+#: xfree86.xml.in.h:222
+msgid "Northern Saami (Finland)"
+msgstr "北部沙米(芬兰)"
+
+#: xfree86.xml.in.h:223
+msgid "Northern Saami (Norway)"
+msgstr "北部沙米(挪�)"
+
+#: xfree86.xml.in.h:224
+msgid "Northern Saami (Sweden)"
+msgstr "北部沙米(瑞典)"
+
+#: xfree86.xml.in.h:225
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: xfree86.xml.in.h:226
+msgid "Norwegian"
+msgstr "挪�"
+
+#: xfree86.xml.in.h:227
+msgid "Num_Lock LED shows alternative group"
+msgstr "NumLock �显示替代组(_L)"
+
+#: xfree86.xml.in.h:228
+msgid "Ogh"
+msgstr "Ogh"
+
+#: xfree86.xml.in.h:229
+msgid "Ogham"
+msgstr "欧甘"
+
+#: xfree86.xml.in.h:230
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/网际键盘"
+
+#: xfree86.xml.in.h:231
+msgid "Ori"
+msgstr "Ori"
+
+#: xfree86.xml.in.h:232
+msgid "Oriya"
+msgstr "Oriya"
+
+#: xfree86.xml.in.h:233
+msgid "PC-98xx Series"
+msgstr "PC-98xx 系列"
+
+#: xfree86.xml.in.h:234
+msgid "PC104"
+msgstr "PC104"
+
+#: xfree86.xml.in.h:235
+msgid "Pan"
+msgstr "Pan"
+
+#: xfree86.xml.in.h:236
+msgid "Phonetic"
+msgstr "Phonetic"
+
+#: xfree86.xml.in.h:237
+msgid "Pol"
+msgstr "Pol"
+
+#: xfree86.xml.in.h:238
+msgid "Polish"
+msgstr "波兰"
+
+#: xfree86.xml.in.h:239
+msgid "Polish (qwertz)"
+msgstr "波兰(qwertz)"
+
+#: xfree86.xml.in.h:240
+msgid "Polytonic"
+msgstr "Polytonic"
+
+#: xfree86.xml.in.h:241
+msgid "Portuguese"
+msgstr "葡�牙"
+
+#: xfree86.xml.in.h:242
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: xfree86.xml.in.h:243
+msgid "Press Left Win-key to choose 3rd level"
+msgstr "按左 Windows 键选择第三级"
+
+#: xfree86.xml.in.h:244
+msgid "Press Menu key to choose 3rd level"
+msgstr "按��键选择第三级"
+
+#: xfree86.xml.in.h:245
+msgid "Press Right Control to choose 3rd level"
+msgstr "按� Ctrl 选择第三级"
+
+#: xfree86.xml.in.h:246
+msgid "Press Right Win-key to choose 3rd level"
+msgstr "按� Windows 键选择第三级"
+
+#: xfree86.xml.in.h:247
+msgid "Press any of Win-keys to choose 3rd level"
+msgstr "按任何 Windows 键选择第三级"
+
+#: xfree86.xml.in.h:248
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: xfree86.xml.in.h:249
+msgid "Prt"
+msgstr "Prt"
+
+#: xfree86.xml.in.h:250
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: xfree86.xml.in.h:251
+msgid "R-Alt switches group while pressed"
+msgstr "按下� Alt 切�组"
+
+#: xfree86.xml.in.h:252
+msgid "Right Alt is Compose"
+msgstr "� Alt 已编排"
+
+#: xfree86.xml.in.h:253
+msgid "Right Alt key changes group"
+msgstr "� Alt 键更改组"
+
+#: xfree86.xml.in.h:254
+msgid "Right Control key works as Right Alt"
+msgstr "� Ctrl 键等�于� Alt"
+
+#: xfree86.xml.in.h:255
+msgid "Right Ctrl key changes group"
+msgstr "� Ctrl 键更改组"
+
+#: xfree86.xml.in.h:256
+msgid "Right Shift key changes group"
+msgstr "� Shift �更改组"
+
+#: xfree86.xml.in.h:257
+msgid "Right Win-key changes group"
+msgstr "� Windows 键更改组"
+
+#: xfree86.xml.in.h:258
+msgid "Right Win-key is Compose"
+msgstr "� Windows 键已编排"
+
+#: xfree86.xml.in.h:259
+msgid "Right Win-key switches group while pressed"
+msgstr "按下� Windows 键切�组"
+
+#: xfree86.xml.in.h:260
+msgid "Romanian"
+msgstr "罗马尼亚"
+
+#: xfree86.xml.in.h:261
+msgid "Rou"
+msgstr "Rou"
+
+#: xfree86.xml.in.h:262
+msgid "Rus"
+msgstr "Rus"
+
+#: xfree86.xml.in.h:263
+msgid "Russian"
+msgstr "俄语"
+
+#: xfree86.xml.in.h:264
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: xfree86.xml.in.h:265
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: xfree86.xml.in.h:266
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: xfree86.xml.in.h:267
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: xfree86.xml.in.h:268
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: xfree86.xml.in.h:269
+msgid "Samsung SDM 4500P"
+msgstr "三星 SDM 4500P"
+
+#: xfree86.xml.in.h:270
+msgid "Samsung SDM 4510P"
+msgstr "三星 SDM 4510P"
+
+#: xfree86.xml.in.h:271
+msgid "Sapmi"
+msgstr "Sapmi"
+
+#: xfree86.xml.in.h:272
+msgid "Scg"
+msgstr "Scg"
+
+#: xfree86.xml.in.h:273
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "ScrollLock �显示替代组(_L)"
+
+#: xfree86.xml.in.h:274
+msgid "Serbian"
+msgstr "塞尔维亚"
+
+#: xfree86.xml.in.h:275
+msgid "Shift with numpad keys works as in MS Windows"
+msgstr "Shift+数字键盘的功能等�于 MS Windows"
+
+#: xfree86.xml.in.h:276
+msgid "Slovak"
+msgstr "斯洛�克"
+
+#: xfree86.xml.in.h:277
+msgid "Slovak (qwerty)"
+msgstr "斯洛�克(qwerty)"
+
+#: xfree86.xml.in.h:278
+msgid "Slovenian"
+msgstr "斯洛文尼亚"
+
+#: xfree86.xml.in.h:279
+msgid "Sme"
+msgstr "Sme"
+
+#: xfree86.xml.in.h:280
+msgid "Spanish"
+msgstr "西�牙"
+
+#: xfree86.xml.in.h:281
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "�务器处�的特殊键 (Ctrl+Alt+&lt;key&gt;)。"
+
+#: xfree86.xml.in.h:282
+msgid "Standard"
+msgstr "标准"
+
+#: xfree86.xml.in.h:283
+msgid "Sun dead keys"
+msgstr "Sun 死键"
+
+#: xfree86.xml.in.h:284
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "Super 被映射到 Windows 键(默认)。"
+
+#: xfree86.xml.in.h:285
+msgid "Sv"
+msgstr "Sv"
+
+#: xfree86.xml.in.h:286
+msgid "Svk"
+msgstr "Svk"
+
+#: xfree86.xml.in.h:287
+msgid "Svn"
+msgstr "Svn"
+
+#: xfree86.xml.in.h:288
+msgid "Swap Control and Caps Lock"
+msgstr "交� Ctrl 和 CapsLock"
+
+#: xfree86.xml.in.h:289
+msgid "Swe"
+msgstr "Swe"
+
+#: xfree86.xml.in.h:290
+msgid "Swedish"
+msgstr "ç‘žå…¸"
+
+#: xfree86.xml.in.h:291
+msgid "Swiss French"
+msgstr "瑞典法语"
+
+#: xfree86.xml.in.h:292
+msgid "Swiss German"
+msgstr "瑞典德语"
+
+#: xfree86.xml.in.h:293
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook(平�电脑)"
+
+#: xfree86.xml.in.h:294
+msgid "Syr"
+msgstr "Syr"
+
+#: xfree86.xml.in.h:295
+msgid "Syriac"
+msgstr "�利亚"
+
+#: xfree86.xml.in.h:296
+msgid "Tajik"
+msgstr "塔�克"
+
+#: xfree86.xml.in.h:297
+msgid "Tamil"
+msgstr "泰米尔"
+
+#: xfree86.xml.in.h:298
+msgid "Tel"
+msgstr "Tel"
+
+#: xfree86.xml.in.h:299
+msgid "Telugu"
+msgstr "泰�固"
+
+#: xfree86.xml.in.h:300
+msgid "Tha"
+msgstr "Tha"
+
+#: xfree86.xml.in.h:301
+msgid "Thai (Kedmanee)"
+msgstr "泰语(Kedmanee)"
+
+#: xfree86.xml.in.h:302
+msgid "Thai (Pattachote)"
+msgstr "泰语(Pattachote)"
+
+#: xfree86.xml.in.h:303
+msgid "Thai (TIS-820.2538)"
+msgstr "泰语(TIS-820.2538)"
+
+#: xfree86.xml.in.h:304
+msgid "Third level choosers"
+msgstr "第三级选择"
+
+#: xfree86.xml.in.h:305
+msgid "Tjk"
+msgstr "Tjk"
+
+#: xfree86.xml.in.h:306
+msgid "Tml"
+msgstr "Tml"
+
+#: xfree86.xml.in.h:307
+msgid "Toshiba Satellite S3000"
+msgstr "东� Satellite S3000"
+
+#: xfree86.xml.in.h:308
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access 键盘"
+
+#: xfree86.xml.in.h:309
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust 无线�典键盘"
+
+#: xfree86.xml.in.h:310
+msgid "Tur"
+msgstr "Tur"
+
+#: xfree86.xml.in.h:311
+msgid "Turkish"
+msgstr "土耳其"
+
+#: xfree86.xml.in.h:312
+msgid "Turkish (F)"
+msgstr "土耳其(F)"
+
+#: xfree86.xml.in.h:313
+msgid "Turkish Alt-Q Layout"
+msgstr "土耳其 ALt-Q 布局"
+
+#: xfree86.xml.in.h:314
+msgid "U.S. English"
+msgstr "美国英语"
+
+#: xfree86.xml.in.h:315
+msgid "U.S. English w/ ISO9995-3"
+msgstr "美国英语 ISO9995-3"
+
+#: xfree86.xml.in.h:316
+msgid "U.S. English w/ dead keys"
+msgstr "美国英语带死键"
+
+#: xfree86.xml.in.h:317
+msgid "US"
+msgstr "US"
+
+#: xfree86.xml.in.h:318
+msgid "US keyboard with Romanian letters"
+msgstr "美国键盘，带罗马尼亚字符"
+
+#: xfree86.xml.in.h:319
+msgid "USA"
+msgstr "USA"
+
+#: xfree86.xml.in.h:320
+msgid "Ukr"
+msgstr "Ukr"
+
+#: xfree86.xml.in.h:321
+msgid "Ukrainian"
+msgstr "乌克兰"
+
+#: xfree86.xml.in.h:322
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: xfree86.xml.in.h:323
+msgid "United Kingdom"
+msgstr "英国"
+
+#: xfree86.xml.in.h:324
+msgid "Use keyboard LED to show alternative group"
+msgstr "使用键盘�显示替代组"
+
+#: xfree86.xml.in.h:325
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr "使用内部大写。Shift �消大写。"
+
+#: xfree86.xml.in.h:326
+msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+msgstr "使用内部大写。Shift ��消大写。"
+
+#: xfree86.xml.in.h:327
+msgid "Uzb"
+msgstr "Uzb"
+
+#: xfree86.xml.in.h:328
+msgid "Uzbek"
+msgstr "乌兹别克"
+
+#: xfree86.xml.in.h:329
+msgid "Vietnamese"
+msgstr "越�语"
+
+#: xfree86.xml.in.h:330
+msgid "Vnm"
+msgstr "Vnm"
+
+#: xfree86.xml.in.h:331
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: xfree86.xml.in.h:332
+msgid "Winkeys"
+msgstr "Winkeys"
+
+#: xfree86.xml.in.h:333
+msgid "Yahoo! Internet Keyboard"
+msgstr "雅虎网际键盘"
+
+#: xfree86.xml.in.h:334
+msgid "Yug"
+msgstr "Yug"
+
+#: xfree86.xml.in.h:335
+msgid "Yugoslavian"
+msgstr "�斯拉夫"
+
+#: xfree86.xml.in.h:336
+msgid "abnt2"
+msgstr "abnt2"
+
+#: xfree86.xml.in.h:337
+msgid "azerty"
+msgstr "azerty"
+
+#: xfree86.xml.in.h:338
+msgid "azerty/digits"
+msgstr "azerty/æ•°å­—"
+
+#: xfree86.xml.in.h:339
+msgid "bksl"
+msgstr "bksl"
+
+#: xfree86.xml.in.h:340
+msgid "digits"
+msgstr "æ•°å­—"
+
+#: xfree86.xml.in.h:341
+msgid "l2/101/qwerty/comma"
+msgstr "l2/101/qwerty/comma"
+
+#: xfree86.xml.in.h:342
+msgid "l2/101/qwerty/dot"
+msgstr "l2/101/qwerty/dot"
+
+#: xfree86.xml.in.h:343
+msgid "l2/101/qwertz/comma"
+msgstr "l2/101/qwertz/comma"
+
+#: xfree86.xml.in.h:344
+msgid "l2/101/qwertz/dot"
+msgstr "l2/101/qwertz/dot"
+
+#: xfree86.xml.in.h:345
+msgid "l2/102/qwerty/comma"
+msgstr "l2/102/qwerty/comma"
+
+#: xfree86.xml.in.h:346
+msgid "l2/102/qwerty/dot"
+msgstr "l2/102/qwerty/dot"
+
+#: xfree86.xml.in.h:347
+msgid "l2/102/qwertz/comma"
+msgstr "l2/102/qwertz/comma"
+
+#: xfree86.xml.in.h:348
+msgid "l2/102/qwertz/dot"
+msgstr "l2/102/qwertz/dot"
+
+#: xfree86.xml.in.h:349
+msgid "laptop"
+msgstr "laptop"
+
+#: xfree86.xml.in.h:350
+msgid "lyx"
+msgstr "lyx"
+
+#: xfree86.xml.in.h:351
+msgid "qwerty"
+msgstr "qwerty"
+
+#: xfree86.xml.in.h:352
+msgid "qwerty/digits"
+msgstr "qwerty/digits"
+
+#: xfree86.xml.in.h:353
+msgid "sefi"
+msgstr "sefi"
+
+#: xfree86.xml.in.h:354
+msgid "si1452"
+msgstr "si1452"
+
+#: xfree86.xml.in.h:355
+msgid "uni/101/qwerty/comma"
+msgstr "uni/101/qwerty/comma"
+
+#: xfree86.xml.in.h:356
+msgid "uni/101/qwerty/dot"
+msgstr "uni/101/qwerty/dot"
+
+#: xfree86.xml.in.h:357
+msgid "uni/101/qwertz/comma"
+msgstr "uni/101/qwertz/comma"
+
+#: xfree86.xml.in.h:358
+msgid "uni/101/qwertz/dot"
+msgstr "uni/101/qwertz/dot"
+
+#: xfree86.xml.in.h:359
+msgid "uni/102/qwerty/comma"
+msgstr "uni/102/qwerty/comma"
+
+#: xfree86.xml.in.h:360
+msgid "uni/102/qwerty/dot"
+msgstr "uni/102/qwerty/dot"
+
+#: xfree86.xml.in.h:361
+msgid "uni/102/qwertz/comma"
+msgstr "uni/102/qwertz/comma"
+
+#: xfree86.xml.in.h:362
+msgid "uni/102/qwertz/dot"
+msgstr "uni/102/qwertz/dot"
diff --git a/xorg-server/xkbdata.src/po/zh_TW.po b/xorg-server/xkbdata.src/po/zh_TW.po
new file mode 100644
index 000000000..383e01e3f
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/zh_TW.po
@@ -0,0 +1,1671 @@
+# Traditional Chinese Messages for xkeyboard-config
+# Copyright (C) 2003, 05 Free Software Foundation, Inc.
+# Funda Wang <fundawang@linux.net.cn>, 2003
+# Wei-Lun Chao <chaoweilun@pcmail.com.tw>, 2005
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 0.6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-08-14 00:39+0100\n"
+"PO-Revision-Date: 2005-09-19 17:19+0800\n"
+"Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
+"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "\"Standard\""
+msgstr "「標準�"
+
+#: ../rules/base.xml.in.h:2
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:3
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/逗點/無用按�"
+
+#: ../rules/base.xml.in.h:4
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/逗點/除去無用按�"
+
+#: ../rules/base.xml.in.h:5
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/�點/無用按�"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/�點/除去無用按�"
+
+#: ../rules/base.xml.in.h:7
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/逗點/無用按�"
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwerty/逗點/除去無用按�"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/�點/無用按�"
+
+#: ../rules/base.xml.in.h:10
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/�點/除去無用按�"
+
+#: ../rules/base.xml.in.h:11
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/逗點/無用按�"
+
+#: ../rules/base.xml.in.h:12
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/逗點/除去無用按�"
+
+#: ../rules/base.xml.in.h:13
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/�點/無用按�"
+
+#: ../rules/base.xml.in.h:14
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/�點/除去無用按�"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/逗點/無用按�"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/逗點/除去無用按�"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/�點/無用按�"
+
+#: ../rules/base.xml.in.h:18
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/�點/除去無用按�"
+
+#: ../rules/base.xml.in.h:19
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:20
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:21
+msgid "ACPI Standard"
+msgstr "ACPI 標準"
+
+#: ../rules/base.xml.in.h:22
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:23
+msgid "Acer TravelMate 800"
+msgstr "Acer TravelMate 800"
+
+#: ../rules/base.xml.in.h:24
+msgid "Add the EuroSign to the 2 key."
+msgstr "將�元符號加到 2 �之上"
+
+#: ../rules/base.xml.in.h:25
+msgid "Add the EuroSign to the 5 key."
+msgstr "將�元符號加到 5 �之上"
+
+#: ../rules/base.xml.in.h:26
+msgid "Add the EuroSign to the E key."
+msgstr "將�元符號加到 E �之上"
+
+#: ../rules/base.xml.in.h:27
+msgid "Add the standard behavior to Menu key."
+msgstr "增加標準功能至 Menu �。"
+
+#: ../rules/base.xml.in.h:28
+msgid "Adding the EuroSign to certain keys"
+msgstr "將�元符號加到特定�之上"
+
+#: ../rules/base.xml.in.h:29
+msgid "Advance Scorpius KI"
+msgstr "進階 Scorpius KI"
+
+#: ../rules/base.xml.in.h:30
+msgid "Alb"
+msgstr "Alb"
+
+#: ../rules/base.xml.in.h:31
+msgid "Albania"
+msgstr "阿爾巴尼亞"
+
+#: ../rules/base.xml.in.h:32
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Alt 與 Meta �置於 Alt �（�設值）。"
+
+#: ../rules/base.xml.in.h:33
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt �置到�邊的 Win-key 並優先於 Menu。"
+
+#: ../rules/base.xml.in.h:34
+msgid "Alt+Control changes group."
+msgstr "以 Alt+Control 改變群組。"
+
+#: ../rules/base.xml.in.h:35
+msgid "Alt+Shift changes group."
+msgstr "以 Alt+Shift 改變群組。"
+
+#: ../rules/base.xml.in.h:36
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:37
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win �功能"
+
+#: ../rules/base.xml.in.h:38
+msgid "Alternative"
+msgstr "替代�擇"
+
+#: ../rules/base.xml.in.h:39
+msgid "Alternative international (former us_intl)"
+msgstr "替代國際化 (之�為 us_intl)"
+
+#: ../rules/base.xml.in.h:40
+msgid "Alternative, Sun dead keys"
+msgstr "替代�擇，Sun 的無用按�"
+
+#: ../rules/base.xml.in.h:41
+msgid "Alternative, eliminate dead keys"
+msgstr "替代�擇，除去無用按�"
+
+#: ../rules/base.xml.in.h:42
+msgid "Apostrophe (') variant"
+msgstr "撇號 (') 變型"
+
+#: ../rules/base.xml.in.h:43
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:44
+msgid "Arabic"
+msgstr "阿拉伯文"
+
+#: ../rules/base.xml.in.h:45
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:46
+msgid "Armenia"
+msgstr "亞美尼亞"
+
+#: ../rules/base.xml.in.h:47
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:48
+msgid "Azerbaijan"
+msgstr "亞塞拜然"
+
+#: ../rules/base.xml.in.h:49
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 無線網際�盤"
+
+#: ../rules/base.xml.in.h:50
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:51
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF 多媒體"
+
+#: ../rules/base.xml.in.h:52
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:53
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:54
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:55
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:56
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:57
+msgid "Bangladesh"
+msgstr "孟加拉"
+
+#: ../rules/base.xml.in.h:58
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:59
+msgid "Belarus"
+msgstr "白俄"
+
+#: ../rules/base.xml.in.h:60
+msgid "Belgium"
+msgstr "比利時"
+
+#: ../rules/base.xml.in.h:61
+msgid "Bengali"
+msgstr "孟加拉文"
+
+#: ../rules/base.xml.in.h:62
+msgid "Bengali Probhat"
+msgstr "孟加拉 Probhat 文"
+
+#: ../rules/base.xml.in.h:63
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:64
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:65
+msgid "Bhutan"
+msgstr "�丹"
+
+#: ../rules/base.xml.in.h:66
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:67
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:68
+msgid "Bosnia and Herzegovina"
+msgstr "波士尼亞�赫塞哥維那"
+
+#: ../rules/base.xml.in.h:69
+msgid "Both Alt keys together change group."
+msgstr "�時以兩個 Alt �改變群組。"
+
+#: ../rules/base.xml.in.h:70
+msgid "Both Ctrl keys together change group."
+msgstr "�時以兩個 Ctrl �改變群組。"
+
+#: ../rules/base.xml.in.h:71
+msgid "Both Shift keys together change group."
+msgstr "�時以兩個 Shift �改變群組。"
+
+#: ../rules/base.xml.in.h:72
+msgid "Both Win-keys switch group while pressed."
+msgstr "當按下兩個 Win-key 時切�群組。"
+
+#: ../rules/base.xml.in.h:73
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:74
+msgid "Brazil"
+msgstr "巴西"
+
+#: ../rules/base.xml.in.h:75
+msgid "Brazilian ABNT2"
+msgstr "巴西 ABNT2 �盤"
+
+#: ../rules/base.xml.in.h:76
+msgid "Brother Internet Keyboard"
+msgstr "Brother 網際�盤"
+
+#: ../rules/base.xml.in.h:77
+msgid "Bulgaria"
+msgstr "�加利亞"
+
+#: ../rules/base.xml.in.h:78
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:79
+msgid "Canada"
+msgstr "加拿大"
+
+#: ../rules/base.xml.in.h:80
+msgid "CapsLock LED shows alternative group."
+msgstr "以 CapsLock 燈號來顯示替代的群組。"
+
+#: ../rules/base.xml.in.h:81
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "Caps Lock 充當鎖定的 Shift。�以按 Shift �消之。"
+
+#: ../rules/base.xml.in.h:82
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "Caps Lock 充當鎖定的 Shift。無法以按 Shift �消之。"
+
+#: ../rules/base.xml.in.h:83
+msgid "CapsLock just locks the Shift modifier."
+msgstr "Caps Lock �用於鎖定 Shift 變更�。"
+
+#: ../rules/base.xml.in.h:84
+msgid "CapsLock key behavior"
+msgstr "Caps Lock �功能"
+
+#: ../rules/base.xml.in.h:85
+msgid "CapsLock key changes group."
+msgstr "以 Caps Lock �改變群組"
+
+#: ../rules/base.xml.in.h:86
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "以 Caps Lock 切� Shift 狀態而影響到所有按�。"
+
+#: ../rules/base.xml.in.h:87
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "以 Caps Lock 切�正常的字�字元大寫功能。"
+
+#: ../rules/base.xml.in.h:88
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr "Caps Lock 使用內建的大寫功能。�以 Shift �消之。"
+
+#: ../rules/base.xml.in.h:89
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr "Caps Lock 使用內建的大寫功能。無法以 Shift �消之。"
+
+#: ../rules/base.xml.in.h:90
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:91
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:92
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (替代�項)"
+
+#: ../rules/base.xml.in.h:93
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:94
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony 網際網路�盤"
+
+#: ../rules/base.xml.in.h:95
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:96
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:97
+msgid "Compaq Easy Access Keyboard"
+msgstr "康�輕鬆存��盤"
+
+#: ../rules/base.xml.in.h:98
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "康�網際�盤(13�)"
+
+#: ../rules/base.xml.in.h:99
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "康�網際�盤(18�)"
+
+#: ../rules/base.xml.in.h:100
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "康�網際�盤(7�)"
+
+#: ../rules/base.xml.in.h:101
+msgid "Compaq iPaq Keyboard"
+msgstr "康� iPaq �盤"
+
+#: ../rules/base.xml.in.h:102
+msgid "Compose key position"
+msgstr "Compose �的�置"
+
+#: ../rules/base.xml.in.h:103
+msgid "Control key at bottom left"
+msgstr "Control �在左下方"
+
+#: ../rules/base.xml.in.h:104
+msgid "Control key at left of 'A'"
+msgstr "Control �在“A�的左邊"
+
+#: ../rules/base.xml.in.h:105
+msgid "Control key position"
+msgstr "Control �的�置"
+
+#: ../rules/base.xml.in.h:106
+msgid "Control+Shift changes group."
+msgstr "以 Control+Shift �改變群組。"
+
+#: ../rules/base.xml.in.h:107
+msgid "Croatia"
+msgstr "克羅埃西亞"
+
+#: ../rules/base.xml.in.h:108
+msgid "Cyrillic"
+msgstr "斯拉夫文"
+
+#: ../rules/base.xml.in.h:109
+msgid "Cze"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:110
+msgid "Czechia"
+msgstr "�克文"
+
+#: ../rules/base.xml.in.h:111
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:112
+msgid "Dead acute"
+msgstr "Dead acute"
+
+#: ../rules/base.xml.in.h:113
+msgid "Dead grave acute"
+msgstr "Dead grave acute"
+
+#: ../rules/base.xml.in.h:114
+msgid "Dell"
+msgstr "戴爾"
+
+#: ../rules/base.xml.in.h:115
+msgid "Dell 101-key PC"
+msgstr "戴爾 101 � �盤"
+
+#: ../rules/base.xml.in.h:116
+msgid "Denmark"
+msgstr "丹麥"
+
+#: ../rules/base.xml.in.h:117
+msgid "Deu"
+msgstr "Deu"
+
+#: ../rules/base.xml.in.h:118
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa 無線桌��盤"
+
+#: ../rules/base.xml.in.h:119
+msgid "Dhivehi"
+msgstr "迪�喜文"
+
+#: ../rules/base.xml.in.h:120
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 系列"
+
+#: ../rules/base.xml.in.h:121
+msgid "Div"
+msgstr "Div"
+
+#: ../rules/base.xml.in.h:122
+msgid "Dnk"
+msgstr "Dnk"
+
+#: ../rules/base.xml.in.h:123
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:124
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak，波蘭�引號置於「1/!�按�"
+
+#: ../rules/base.xml.in.h:125
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak，波蘭�引號置於「1/!�按�"
+
+#: ../rules/base.xml.in.h:126
+msgid "Eliminate dead keys"
+msgstr "除去無用按�"
+
+#: ../rules/base.xml.in.h:127
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:128
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:129
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:130
+msgid "Estonia"
+msgstr "愛沙尼亞"
+
+#: ../rules/base.xml.in.h:131
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:132
+msgid "Extended"
+msgstr "延伸的"
+
+#: ../rules/base.xml.in.h:133
+msgid "Extended Backslash"
+msgstr "延伸的�斜線"
+
+#: ../rules/base.xml.in.h:134
+msgid "F-letter (F) variant"
+msgstr "F 字�變化"
+
+#: ../rules/base.xml.in.h:135
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:136
+msgid "Faroe Islands"
+msgstr "法羅群島"
+
+#: ../rules/base.xml.in.h:137
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:138
+msgid "Finland"
+msgstr "芬蘭"
+
+#: ../rules/base.xml.in.h:139
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:140
+msgid "France"
+msgstr "法國"
+
+#: ../rules/base.xml.in.h:141
+msgid "French"
+msgstr "法文"
+
+#: ../rules/base.xml.in.h:142
+msgid "French (legacy)"
+msgstr "法文 (傳統)"
+
+#: ../rules/base.xml.in.h:143
+msgid "French Dvorak"
+msgstr "法文 Dvorak"
+
+#: ../rules/base.xml.in.h:144
+msgid "French, Sun dead keys"
+msgstr "法文，Sun 的無用按�"
+
+#: ../rules/base.xml.in.h:145
+msgid "French, eliminate dead keys"
+msgstr "法文，除去無用按�"
+
+#: ../rules/base.xml.in.h:146
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:147
+msgid "Generic 101-key PC"
+msgstr "一般 101� �盤"
+
+#: ../rules/base.xml.in.h:148
+msgid "Generic 102-key (Intl) PC"
+msgstr "一般 102� (國際) �盤"
+
+#: ../rules/base.xml.in.h:149
+msgid "Generic 104-key PC"
+msgstr "一般 104� �盤"
+
+#: ../rules/base.xml.in.h:150
+msgid "Generic 105-key (Intl) PC"
+msgstr "一般 105 � (國際) �盤"
+
+#: ../rules/base.xml.in.h:151
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "昆盈 Comfy KB-16M / 昆盈 MM �盤 KWD-910"
+
+#: ../rules/base.xml.in.h:152
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "昆盈 Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:153
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:154
+msgid "Georgia"
+msgstr "喬治亞"
+
+#: ../rules/base.xml.in.h:155
+msgid "German, Sun dead keys"
+msgstr "德文，Sun 的無用按�"
+
+#: ../rules/base.xml.in.h:156
+msgid "German, eliminate dead keys"
+msgstr "德文，除去無用按�"
+
+#: ../rules/base.xml.in.h:157
+msgid "Germany"
+msgstr "德國"
+
+#: ../rules/base.xml.in.h:158
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:159
+msgid "Greece"
+msgstr "希臘"
+
+#: ../rules/base.xml.in.h:160
+msgid "Group Shift/Lock behavior"
+msgstr "群組 Shift/Lock 功能"
+
+#: ../rules/base.xml.in.h:161
+msgid "Gujarati"
+msgstr "��拉特文(�度)"
+
+#: ../rules/base.xml.in.h:162
+msgid "Gurmukhi"
+msgstr "�爾穆希文"
+
+#: ../rules/base.xml.in.h:163
+msgid "Gyration"
+msgstr "回轉"
+
+#: ../rules/base.xml.in.h:164
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "惠普網際�盤"
+
+#: ../rules/base.xml.in.h:165
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "惠普 Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:166
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "惠普 Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:167
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "惠普 Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:168
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "惠普 Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:169
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "惠普 Omnibook XE3 CF"
+
+#: ../rules/base.xml.in.h:170
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "惠普 Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:171
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "惠普 Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:172
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "惠普 SK-2501 多媒體�盤"
+
+#: ../rules/base.xml.in.h:173
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "惠普 SK-2505 網際�盤"
+
+#: ../rules/base.xml.in.h:174
+msgid "Honeywell Euroboard"
+msgstr "Honeywell �洲�盤"
+
+#: ../rules/base.xml.in.h:175
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:176
+msgid "Hun"
+msgstr "Hun"
+
+#: ../rules/base.xml.in.h:177
+msgid "Hungary"
+msgstr "匈牙利"
+
+#: ../rules/base.xml.in.h:178
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper �置到兩個 Win-key。"
+
+#: ../rules/base.xml.in.h:179
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:180
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:181
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II(替代�項)"
+
+#: ../rules/base.xml.in.h:182
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:183
+msgid "ISO Alternate"
+msgstr "ISO 替代"
+
+#: ../rules/base.xml.in.h:184
+msgid "Iceland"
+msgstr "冰島"
+
+#: ../rules/base.xml.in.h:185
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:186
+msgid "India"
+msgstr "�度"
+
+#: ../rules/base.xml.in.h:187
+msgid "International (with dead keys)"
+msgstr "國際�盤 (附無用按�)"
+
+#: ../rules/base.xml.in.h:188
+msgid "Inuktitut"
+msgstr "伊努伊特�盤"
+
+#: ../rules/base.xml.in.h:189
+msgid "Iran"
+msgstr "伊朗"
+
+#: ../rules/base.xml.in.h:190
+msgid "Ireland"
+msgstr "愛爾蘭"
+
+#: ../rules/base.xml.in.h:191
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:192
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:193
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:194
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:195
+msgid "Israel"
+msgstr "以色列"
+
+#: ../rules/base.xml.in.h:196
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:197
+msgid "Italy"
+msgstr "�大利"
+
+#: ../rules/base.xml.in.h:198
+msgid "Japan"
+msgstr "日本"
+
+#: ../rules/base.xml.in.h:199
+msgid "Japanese 106-key"
+msgstr "日文 106� �盤"
+
+#: ../rules/base.xml.in.h:200
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:201
+msgid "Kannada"
+msgstr "�度���文"
+
+#: ../rules/base.xml.in.h:202
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:203
+msgid "Kyr"
+msgstr "Kyr"
+
+#: ../rules/base.xml.in.h:204
+msgid "Kyrgyzstan"
+msgstr "�爾�斯"
+
+#: ../rules/base.xml.in.h:205
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:206
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:207
+msgid "Laos"
+msgstr "寮國"
+
+#: ../rules/base.xml.in.h:208
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "�攜�/筆記型 康� (如 Armada) �攜��盤"
+
+#: ../rules/base.xml.in.h:209
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "�攜�/筆記型 康� (如 Presario) 網際�盤"
+
+#: ../rules/base.xml.in.h:210
+msgid "Laptop/notebook Dell Inspiron 8xxx"
+msgstr "�攜�/筆記型 戴爾 Inspiron 8xxx"
+
+#: ../rules/base.xml.in.h:211
+msgid "Latin"
+msgstr "拉�文"
+
+#: ../rules/base.xml.in.h:212
+msgid "Latin American"
+msgstr "拉�美洲"
+
+#: ../rules/base.xml.in.h:213
+msgid "Latin Unicode"
+msgstr "拉�文統一碼"
+
+#: ../rules/base.xml.in.h:214
+msgid "Latin Unicode qwerty"
+msgstr "拉�文統一碼 qwerty"
+
+#: ../rules/base.xml.in.h:215
+msgid "Latin qwerty"
+msgstr "拉�文 qwerty"
+
+#: ../rules/base.xml.in.h:216
+msgid "Latin with guillemots"
+msgstr "拉�文附海鳩符號"
+
+#: ../rules/base.xml.in.h:217
+msgid "Latvia"
+msgstr "拉脫維亞"
+
+#: ../rules/base.xml.in.h:218
+msgid "Left Alt key changes group."
+msgstr "以左邊的 Alt �改變群組。"
+
+#: ../rules/base.xml.in.h:219
+msgid "Left Alt key switches group while pressed."
+msgstr "當按下左邊的 Alt �時切�群組。"
+
+#: ../rules/base.xml.in.h:220
+msgid "Left Ctrl key changes group."
+msgstr "以左邊的 Ctrl �改變群組。"
+
+#: ../rules/base.xml.in.h:221
+msgid "Left Shift key changes group."
+msgstr "以左邊的 Shift �改變群組。"
+
+#: ../rules/base.xml.in.h:222
+msgid "Left Win-key changes group."
+msgstr "以左邊的 Win-key 改變群組。"
+
+#: ../rules/base.xml.in.h:223
+msgid "Left Win-key switches group while pressed."
+msgstr "當按下左邊的 Win-key 時切�群組。"
+
+#: ../rules/base.xml.in.h:224
+msgid "Lithuania"
+msgstr "立陶宛"
+
+#: ../rules/base.xml.in.h:225
+msgid "Logitech Access Keyboard"
+msgstr "羅技 Access �盤"
+
+#: ../rules/base.xml.in.h:226
+msgid "Logitech Cordless Desktop"
+msgstr "羅技無影手"
+
+#: ../rules/base.xml.in.h:227
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "羅技無影手桌�導航器"
+
+#: ../rules/base.xml.in.h:228
+msgid "Logitech Cordless Desktop Optical"
+msgstr "羅技無影手光學組�"
+
+#: ../rules/base.xml.in.h:229
+msgid "Logitech Cordless Desktop Pro"
+msgstr "羅技無影手進階版"
+
+#: ../rules/base.xml.in.h:230
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "羅技無影手進階版(替代�項)"
+
+#: ../rules/base.xml.in.h:231
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "羅技無影手進階版(替代�項)"
+
+#: ../rules/base.xml.in.h:232
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "羅技網際無影手"
+
+#: ../rules/base.xml.in.h:233
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "羅技極光無影手組�/桌�導航器"
+
+#: ../rules/base.xml.in.h:234
+msgid "Logitech Deluxe Access Keyboard"
+msgstr "羅技強手�盤"
+
+#: ../rules/base.xml.in.h:235
+msgid "Logitech Internet Keyboard"
+msgstr "羅技網際�盤"
+
+#: ../rules/base.xml.in.h:236
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "羅技網際導航�盤"
+
+#: ../rules/base.xml.in.h:237
+msgid "Logitech Ultra-X Keyboard"
+msgstr "羅技銀幻手�盤"
+
+#: ../rules/base.xml.in.h:238
+msgid "Logitech iTouch"
+msgstr "羅技 iTouch"
+
+#: ../rules/base.xml.in.h:239
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "羅技 iTouch 無影手�盤(型號 Y-RB6)"
+
+#: ../rules/base.xml.in.h:240
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr "羅技 iTouch �盤網際導航器"
+
+#: ../rules/base.xml.in.h:241
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:242
+msgid "Lva"
+msgstr "Lva"
+
+#: ../rules/base.xml.in.h:243
+msgid "Macedonian"
+msgstr "馬其頓文"
+
+#: ../rules/base.xml.in.h:244
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:245
+msgid "Macintosh Old"
+msgstr "Macintosh 舊產�"
+
+#: ../rules/base.xml.in.h:246
+msgid "Make CapsLock an additional Control."
+msgstr "以 Caps Lock �為附加的控制�。"
+
+#: ../rules/base.xml.in.h:247
+msgid "Malayalam"
+msgstr "(�度)馬來雅拉姆文字"
+
+#: ../rules/base.xml.in.h:248
+msgid "Malta"
+msgstr "馬爾它"
+
+#: ../rules/base.xml.in.h:249
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:250
+msgid "Maori"
+msgstr "毛利"
+
+#: ../rules/base.xml.in.h:251
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:252
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access �盤"
+
+#: ../rules/base.xml.in.h:253
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:254
+msgid "Menu is Compose."
+msgstr "Menu 為組��。"
+
+#: ../rules/base.xml.in.h:255
+msgid "Menu key changes group."
+msgstr "以 Menu �改變群組。"
+
+#: ../rules/base.xml.in.h:256
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta �置到兩個 Win-key。"
+
+#: ../rules/base.xml.in.h:257
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta �置到左邊的 Win-key。"
+
+#: ../rules/base.xml.in.h:258
+msgid "Microsoft Internet Keyboard"
+msgstr "微軟網際�盤"
+
+#: ../rules/base.xml.in.h:259
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "微軟網際�盤增強版，瑞典"
+
+#: ../rules/base.xml.in.h:260
+msgid "Microsoft Natural"
+msgstr "微軟自然�盤"
+
+#: ../rules/base.xml.in.h:261
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "微軟原生�盤增強版/微軟網際�盤增強版"
+
+#: ../rules/base.xml.in.h:262
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "微軟原生�盤增強版 OEM"
+
+#: ../rules/base.xml.in.h:263
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "微軟自然�盤增強版 USB/微軟網際�盤增強版"
+
+#: ../rules/base.xml.in.h:264
+msgid "Microsoft Office Keyboard"
+msgstr "微軟 Office �盤"
+
+#: ../rules/base.xml.in.h:265
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "微軟無線多媒體�盤 1.0A"
+
+#: ../rules/base.xml.in.h:266
+msgid "Miscellaneous compatibility options"
+msgstr "其它相容�項"
+
+#: ../rules/base.xml.in.h:267
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:268
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:269
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:270
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:271
+msgid "Mongolia"
+msgstr "蒙�"
+
+#: ../rules/base.xml.in.h:272
+msgid "Multilingual"
+msgstr "多語言"
+
+#: ../rules/base.xml.in.h:273
+msgid "Multilingual, second part"
+msgstr "多語言，第二部份"
+
+#: ../rules/base.xml.in.h:274
+msgid "Myanmar"
+msgstr "緬甸"
+
+#: ../rules/base.xml.in.h:275
+msgid "Netherlands"
+msgstr "�蘭"
+
+#: ../rules/base.xml.in.h:276
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:277
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:278
+msgid "Northern Saami"
+msgstr "北部沙米文"
+
+#: ../rules/base.xml.in.h:279
+msgid "Northern Saami, eliminate dead keys"
+msgstr "北部沙米文，除去無用按�"
+
+#: ../rules/base.xml.in.h:280
+msgid "Northgate OmniKey 101"
+msgstr "Northgate Omnikey 101"
+
+#: ../rules/base.xml.in.h:281
+msgid "Norway"
+msgstr "挪�"
+
+#: ../rules/base.xml.in.h:282
+msgid "NumLock LED shows alternative group."
+msgstr "以 Num Lock 燈號來顯示替代的群組。"
+
+#: ../rules/base.xml.in.h:283
+msgid "Ogham"
+msgstr "(�愛爾蘭)�甘文字"
+
+#: ../rules/base.xml.in.h:284
+msgid "Ogham IS434"
+msgstr "�甘文字 IS434"
+
+#: ../rules/base.xml.in.h:285
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/網際�盤"
+
+#: ../rules/base.xml.in.h:286
+msgid "Oriya"
+msgstr "(�度)奧里雅�文字"
+
+#: ../rules/base.xml.in.h:287
+msgid "PC-98xx Series"
+msgstr "PC-98xx 系列"
+
+#: ../rules/base.xml.in.h:288
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:289
+msgid "Pakistan"
+msgstr "巴基斯�"
+
+#: ../rules/base.xml.in.h:290
+msgid "Pattachote"
+msgstr "æ³°æ–‡"
+
+#: ../rules/base.xml.in.h:291
+msgid "Phonetic"
+msgstr "音標"
+
+#: ../rules/base.xml.in.h:292
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:293
+msgid "Poland"
+msgstr "波蘭"
+
+#: ../rules/base.xml.in.h:294
+msgid "Polytonic"
+msgstr "多音字�"
+
+#: ../rules/base.xml.in.h:295
+msgid "Portugal"
+msgstr "葡�牙"
+
+#: ../rules/base.xml.in.h:296
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:297
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "按下左邊的 Alt �以�擇第三級。"
+
+#: ../rules/base.xml.in.h:298
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "按下左邊的 Win-key 以�擇第三級。"
+
+#: ../rules/base.xml.in.h:299
+msgid "Press Menu key to choose 3rd level."
+msgstr "按下 Menu �以�擇第三級。"
+
+#: ../rules/base.xml.in.h:300
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "按下�邊的 Alt �以�擇第三級。"
+
+#: ../rules/base.xml.in.h:301
+msgid "Press Right Control to choose 3rd level."
+msgstr "按下�邊的 Control 以�擇第三級。"
+
+#: ../rules/base.xml.in.h:302
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "按下�邊的 Win-key 以�擇第三級。"
+
+#: ../rules/base.xml.in.h:303
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "按下任一 Alt �以�擇第三級。"
+
+#: ../rules/base.xml.in.h:304
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "按下任一 Win-key 以�擇第三級。"
+
+#: ../rules/base.xml.in.h:305
+msgid "Probhat"
+msgstr "孟加拉 Probhat"
+
+#: ../rules/base.xml.in.h:306
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:307
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:308
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:309
+msgid "R-Alt switches group while pressed."
+msgstr "當按下�邊 Alt 時切�群組。"
+
+#: ../rules/base.xml.in.h:310
+msgid "Right Alt is Compose."
+msgstr "�邊的 Alt 為組��。"
+
+#: ../rules/base.xml.in.h:311
+msgid "Right Alt key changes group."
+msgstr "以�邊的 Alt �改變群組。"
+
+#: ../rules/base.xml.in.h:312
+msgid "Right Control key works as Right Alt."
+msgstr "�邊 Ctrl �等�於�邊 Alt。"
+
+#: ../rules/base.xml.in.h:313
+msgid "Right Ctrl is Compose."
+msgstr "�邊的 Ctrl 為組��。"
+
+#: ../rules/base.xml.in.h:314
+msgid "Right Ctrl key changes group."
+msgstr "以�邊的 Ctrl �改變群組。"
+
+#: ../rules/base.xml.in.h:315
+msgid "Right Ctrl key switches group while pressed."
+msgstr "當按下�邊的 Ctrl �時切�群組。"
+
+#: ../rules/base.xml.in.h:316
+msgid "Right Shift key changes group."
+msgstr "以�邊的 Shift �改變群組。"
+
+#: ../rules/base.xml.in.h:317
+msgid "Right Win-key changes group."
+msgstr "以�邊的 Win-key 改變群組。"
+
+#: ../rules/base.xml.in.h:318
+msgid "Right Win-key is Compose."
+msgstr "�邊的 Win-key 為組��。"
+
+#: ../rules/base.xml.in.h:319
+msgid "Right Win-key switches group while pressed."
+msgstr "當按下�邊的 Win-key 時切�群組。"
+
+#: ../rules/base.xml.in.h:320
+msgid "Romania"
+msgstr "羅馬尼亞"
+
+#: ../rules/base.xml.in.h:321
+msgid "Romanian keyboard with German letters"
+msgstr "羅馬尼亞�盤附德文字�"
+
+#: ../rules/base.xml.in.h:322
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "羅馬尼亞�盤附德文字�，除去無用按�"
+
+#: ../rules/base.xml.in.h:323
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:324
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:325
+msgid "Russia"
+msgstr "ä¿„ç¾…æ–¯"
+
+#: ../rules/base.xml.in.h:326
+msgid "Russian"
+msgstr "ä¿„æ–‡"
+
+#: ../rules/base.xml.in.h:327
+msgid "Russian phonetic"
+msgstr "俄文音標"
+
+#: ../rules/base.xml.in.h:328
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "俄文音標，除去無用按�"
+
+#: ../rules/base.xml.in.h:329
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:330
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:331
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:332
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:333
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:334
+msgid "Samsung SDM 4500P"
+msgstr "三星 SDM 4500P"
+
+#: ../rules/base.xml.in.h:335
+msgid "Samsung SDM 4510P"
+msgstr "三星 SDM 4510P"
+
+#: ../rules/base.xml.in.h:336
+msgid "ScrollLock LED shows alternative group."
+msgstr "以 Scroll Lock 燈號來顯示替代的群組。"
+
+#: ../rules/base.xml.in.h:337
+msgid "Serbian"
+msgstr "塞爾維亞文"
+
+#: ../rules/base.xml.in.h:338
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Shift+數字�盤的功能等�於在 MS Windows 之中。"
+
+#: ../rules/base.xml.in.h:339
+msgid "Shift+CapsLock changes group."
+msgstr "以 Shift+Caps Lock �改變群組。"
+
+#: ../rules/base.xml.in.h:340
+msgid "Slovakia"
+msgstr "斯洛�克"
+
+#: ../rules/base.xml.in.h:341
+msgid "Slovenia"
+msgstr "斯洛凡尼亞"
+
+#: ../rules/base.xml.in.h:342
+msgid "Spain"
+msgstr "西�牙"
+
+#: ../rules/base.xml.in.h:343
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "伺�器處�的特殊� (Ctrl+Alt+&lt;key&gt;)。"
+
+#: ../rules/base.xml.in.h:344
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:345
+msgid "Sri Lanka"
+msgstr "斯里蘭�"
+
+#: ../rules/base.xml.in.h:346
+msgid "Srp"
+msgstr "Srp"
+
+#: ../rules/base.xml.in.h:347
+msgid "Standard"
+msgstr "標準"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:349
+msgid "Standard RSTU"
+msgstr "標準 RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:351
+msgid "Standard RSTU on Russian layout"
+msgstr "俄文排列上的標準 RSTU"
+
+#: ../rules/base.xml.in.h:352
+msgid "Sun dead keys"
+msgstr "Sun 無用按�"
+
+#: ../rules/base.xml.in.h:353
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power 多媒體�盤"
+
+#: ../rules/base.xml.in.h:354
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "Super �置到兩個 Win-key （�設值）。"
+
+#: ../rules/base.xml.in.h:355
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:356
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:357
+msgid "Swap Control and CapsLock."
+msgstr "Control 與 Caps Lock �互�。"
+
+#: ../rules/base.xml.in.h:358
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:359
+msgid "Sweden"
+msgstr "ç‘žå…¸"
+
+#: ../rules/base.xml.in.h:360
+msgid "Switzerland"
+msgstr "瑞士"
+
+#: ../rules/base.xml.in.h:361
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (平�電腦)"
+
+#: ../rules/base.xml.in.h:362
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:363
+msgid "Syria"
+msgstr "敘利亞"
+
+#: ../rules/base.xml.in.h:364
+msgid "Syriac"
+msgstr "敘利亞語"
+
+#: ../rules/base.xml.in.h:365
+msgid "Syriac phonetic"
+msgstr "敘利亞音標"
+
+#: ../rules/base.xml.in.h:366
+msgid "TIS-820.2538"
+msgstr "泰語(TIS-820.2538)"
+
+#: ../rules/base.xml.in.h:367
+msgid "Tajikistan"
+msgstr "塔�克"
+
+#: ../rules/base.xml.in.h:368
+msgid "Tamil"
+msgstr "�米爾文"
+
+#: ../rules/base.xml.in.h:369
+msgid "Tamil INSCRIPT"
+msgstr "�米爾文 INSCRIPT"
+
+#: ../rules/base.xml.in.h:370
+msgid "Tamil TAB Typewriter"
+msgstr "�米爾文 TAB 打字機"
+
+#: ../rules/base.xml.in.h:371
+msgid "Tamil TSCII Typewriter"
+msgstr "�米爾文 TSCII 打字機"
+
+#: ../rules/base.xml.in.h:372
+msgid "Tamil Unicode"
+msgstr "�米爾文統一碼"
+
+#: ../rules/base.xml.in.h:373
+msgid "Telugu"
+msgstr "泰盧固語"
+
+#: ../rules/base.xml.in.h:374
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:375
+msgid "Thailand"
+msgstr "泰國"
+
+#: ../rules/base.xml.in.h:376
+msgid "Third level choosers"
+msgstr "第三級�擇器"
+
+#: ../rules/base.xml.in.h:377
+msgid "Tilde (~) variant"
+msgstr "波折號 (~) 變化"
+
+#: ../rules/base.xml.in.h:378
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:379
+msgid "Toshiba Satellite S3000"
+msgstr "�� Satellite S3000"
+
+#: ../rules/base.xml.in.h:380
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access �盤"
+
+#: ../rules/base.xml.in.h:381
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust 無線經典�盤"
+
+#: ../rules/base.xml.in.h:382
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:383
+msgid "Turkish"
+msgstr "土耳其文"
+
+#: ../rules/base.xml.in.h:384
+msgid "Typewriter"
+msgstr "打字機"
+
+#: ../rules/base.xml.in.h:385
+msgid "U.S. English"
+msgstr "美�英文"
+
+#: ../rules/base.xml.in.h:386
+msgid "US keyboard with Croatian letters"
+msgstr "美國�盤附克羅埃西亞字�"
+
+#: ../rules/base.xml.in.h:387
+msgid "US keyboard with Lithuanian letters"
+msgstr "美國�盤附立陶宛字�"
+
+#: ../rules/base.xml.in.h:388
+msgid "US keyboard with Maltian letters"
+msgstr "美國�盤附馬爾它字�"
+
+#: ../rules/base.xml.in.h:389
+msgid "US keyboard with Romanian letters"
+msgstr "美國�盤附羅馬尼亞字�"
+
+#: ../rules/base.xml.in.h:390
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.xml.in.h:391
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:392
+msgid "Ukraine"
+msgstr "�克蘭"
+
+#: ../rules/base.xml.in.h:393
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:394
+msgid "United Kingdom"
+msgstr "英國"
+
+#: ../rules/base.xml.in.h:395
+msgid "Urdu"
+msgstr "�都文"
+
+#: ../rules/base.xml.in.h:396
+msgid "Use keyboard LED to show alternative group."
+msgstr "使用�盤燈號來顯示替代的群組。"
+
+#: ../rules/base.xml.in.h:397
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:398
+msgid "Uzbekistan"
+msgstr "�茲別克"
+
+#: ../rules/base.xml.in.h:399
+msgid "Vietnam"
+msgstr "越�"
+
+#: ../rules/base.xml.in.h:400
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:401
+msgid "Winbook Model XP5"
+msgstr "Winbook XP5 �盤"
+
+#: ../rules/base.xml.in.h:402
+msgid "Winkeys"
+msgstr "Winkeys"
+
+#: ../rules/base.xml.in.h:403
+msgid "With &lt;\\|&gt; key"
+msgstr "附帶 &lt;\\|&gt; �"
+
+#: ../rules/base.xml.in.h:404
+msgid "With guillemots"
+msgstr "附帶海鳩符號"
+
+#: ../rules/base.xml.in.h:405
+msgid "Yahoo! Internet Keyboard"
+msgstr "雅虎網際�盤"
+
+#: ../rules/base.xml.in.h:406
+msgid "Z and ZHE swapped"
+msgstr "已交� Z 與 ZHE"
+
+#: ../rules/base.xml.in.h:407
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:408
+msgid "azerty/digits"
+msgstr "azerty/數字"
+
+#: ../rules/base.xml.in.h:409
+msgid "digits"
+msgstr "數字"
+
+#: ../rules/base.xml.in.h:410
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:411
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:412
+msgid "qwerty, extended Backslash"
+msgstr "qwerty，延伸的�斜線"
+
+#: ../rules/base.xml.in.h:413
+msgid "qwerty/digits"
+msgstr "qwerty/數字"
+
+#: ../rules/base.xml.in.h:414
+msgid "qwertz"
+msgstr "qwertz"
+
+#: ../rules/base.xml.in.h:415
+msgid "si1452"
+msgstr "si1452"
diff --git a/xorg-server/xkbdata.src/rules/HDR b/xorg-server/xkbdata.src/rules/HDR
new file mode 100644
index 000000000..717fdea85
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/HDR
@@ -0,0 +1,28 @@
+! model		=	keycodes
+! layout[1]	=	keycodes
+! layout	=	keycodes
+! option	=	keycodes
+! model		layout	=	geometry
+! model		=	geometry
+! model		layout		variant		=	symbols
+! model		layout				=	symbols
+! model		layout[1]			=	symbols
+! model		layout[1]	variant[1]	=	symbols
+! layout[2]	=	symbols
+! layout[3]	=	symbols
+! layout[4]	=	symbols
+! layout[2]	variant[2]	=	symbols
+! layout[3]	variant[3]	=	symbols
+! layout[4]	variant[4]	=	symbols
+! model		=	symbols
+! model		layout		=	compat
+! model		layout[1]	=	compat
+! model		=	types
+! layout	option	=	symbols
+! layout[1]	option	=	symbols
+! layout[2]	option	=	symbols
+! layout[3]	option	=	symbols
+! layout[4]	option	=	symbols
+! option	=	symbols
+! option	=	compat
+! option	=	types
diff --git a/xorg-server/xkbdata.src/rules/Makefile.am b/xorg-server/xkbdata.src/rules/Makefile.am
new file mode 100644
index 000000000..eaed78216
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/Makefile.am
@@ -0,0 +1,128 @@
+SUBDIRS = compat
+
+if CREATE_RULES_SYMLINK
+#  extra_rules_file = $(xkb_rules_symlink)
+#  extra_dir_file   = $(extra_rules_file).xml 
+#  extra_lst_file   = $(extra_rules_file).lst
+
+install-data-hook:
+	for file in `echo "$(xkb_rules_symlink)" | sed 's/,/ /'` ; do \
+		extra_rules_file=$$file ; \
+		extra_dir_file=$$extra_rules_file.xml ; \
+		extra_lst_file=$$extra_rules_file.lst ; \
+		ln -sf base     $(DESTDIR)$(rulesdir)/$$extra_rules_file ; \
+		ln -sf base.lst $(DESTDIR)$(rulesdir)/$$extra_lst_file ; \
+		ln -sf base.xml $(DESTDIR)$(rulesdir)/$$extra_dir_file ; \
+	done
+
+else
+install-data-hook:
+
+endif
+
+base_parts_no_compat = base.hdr.part base.lists.part \
+HDR base.m_k.part HDR base.l1_k.part HDR base.l_k.part  \
+HDR base.ml_g.part \
+HDR base.m_g.part HDR base.mlv_s.part HDR base.ml_s.part \
+HDR base.ml1_s.part HDR \
+HDR base.l2_s.part HDR base.l3_s.part HDR base.l4_s.part HDR HDR HDR \
+HDR base.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
+HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part
+
+evdev_parts_no_compat = base.hdr.part base.lists.part \
+HDR evdev.m_k.part HDR base.l1_k.part HDR base.l_k.part  \
+HDR base.ml_g.part \
+HDR base.m_g.part HDR base.mlv_s.part HDR base.ml_s.part \
+HDR base.ml1_s.part HDR \
+HDR base.l2_s.part HDR base.l3_s.part HDR base.l4_s.part HDR HDR HDR \
+HDR evdev.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
+HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part
+
+if USE_COMPAT_RULES
+base_parts = base.hdr.part base.lists.part \
+compat/base.lists.part \
+HDR base.m_k.part HDR base.l1_k.part     \
+HDR base.l_k.part HDR base.o_k.part      \
+HDR base.ml_g.part \
+HDR base.m_g.part \
+HDR compat/base.mlv_s.part base.mlv_s.part \
+HDR compat/base.ml_s.part base.ml_s.part  \
+HDR compat/base.ml1_s.part base.ml1_s.part \
+HDR compat/base.ml1v1_s.part \
+HDR compat/base.l2_s.part base.l2_s.part  \
+HDR compat/base.l3_s.part base.l3_s.part  \
+HDR compat/base.l4_s.part base.l4_s.part  \
+HDR compat/base.l2v2_s.part \
+HDR compat/base.l3v3_s.part \
+HDR compat/base.l4v4_s.part \
+HDR base.m_s.part  HDR base.ml_c.part HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR base.lo_s.part HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
+HDR compat/base.o_s.part base.o_s.part \
+HDR base.o_c.part HDR base.o_t.part
+
+evdev_parts = base.hdr.part base.lists.part \
+compat/base.lists.part \
+HDR evdev.m_k.part HDR base.l1_k.part     \
+HDR base.l_k.part HDR base.o_k.part      \
+HDR base.ml_g.part \
+HDR base.m_g.part \
+HDR compat/base.mlv_s.part base.mlv_s.part \
+HDR compat/base.ml_s.part base.ml_s.part  \
+HDR compat/base.ml1_s.part base.ml1_s.part \
+HDR compat/base.ml1v1_s.part \
+HDR compat/base.l2_s.part base.l2_s.part  \
+HDR compat/base.l3_s.part base.l3_s.part  \
+HDR compat/base.l4_s.part base.l4_s.part  \
+HDR compat/base.l2v2_s.part \
+HDR compat/base.l3v3_s.part \
+HDR compat/base.l4v4_s.part \
+HDR evdev.m_s.part  HDR base.ml_c.part HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR base.lo_s.part HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
+HDR compat/base.o_s.part base.o_s.part \
+HDR base.o_c.part HDR base.o_t.part
+else
+base_parts = $(base_parts_no_compat)
+evdev_parts = $(base_parts_no_compat)
+endif
+
+rules_files = base evdev xfree98
+
+lst_files = base.lst evdev.lst
+
+%.lst: %.xml
+	perl $(srcdir)/xml2lst.pl < $< > $@
+
+base: $(base_parts_no_compat)
+	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts)
+
+evdev: $(evdev_parts_no_compat)
+	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts)
+
+all_rules_files = $(rules_files) $(lst_files) \
+xkb.dtd README
+
+rules_DATA = $(all_rules_files)
+
+xml_in_files = base.xml.in evdev.xml.in
+xml_DATA = $(xml_in_files:.xml.in=.xml) 
+
+evdev.xml.in: base.xml.in
+	cp $< $@
+
+EXTRA_DIST= $(all_rules_files) $(xml_in_files) \
+            $(base_parts_no_compat) \
+            $(evdev_parts_no_compat) \
+            xml2lst.pl merge.sh
+
+DISTCLEANFILES=base.xml base.lst evdev.xml evdev.lst
+
+rulesdir = $(xkb_base)/rules
+xmldir = $(rulesdir)
+
+@INTLTOOL_XML_NOMERGE_RULE@
diff --git a/xorg-server/xkbdata.src/rules/Makefile.in b/xorg-server/xkbdata.src/rules/Makefile.in
new file mode 100644
index 000000000..a5184f2ba
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/Makefile.in
@@ -0,0 +1,655 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = rules
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(rulesdir)" "$(DESTDIR)$(xmldir)"
+rulesDATA_INSTALL = $(INSTALL_DATA)
+xmlDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(rules_DATA) $(xml_DATA)
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+SUBDIRS = compat
+base_parts_no_compat = base.hdr.part base.lists.part \
+HDR base.m_k.part HDR base.l1_k.part HDR base.l_k.part  \
+HDR base.ml_g.part \
+HDR base.m_g.part HDR base.mlv_s.part HDR base.ml_s.part \
+HDR base.ml1_s.part HDR \
+HDR base.l2_s.part HDR base.l3_s.part HDR base.l4_s.part HDR HDR HDR \
+HDR base.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
+HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part
+
+evdev_parts_no_compat = base.hdr.part base.lists.part \
+HDR evdev.m_k.part HDR base.l1_k.part HDR base.l_k.part  \
+HDR base.ml_g.part \
+HDR base.m_g.part HDR base.mlv_s.part HDR base.ml_s.part \
+HDR base.ml1_s.part HDR \
+HDR base.l2_s.part HDR base.l3_s.part HDR base.l4_s.part HDR HDR HDR \
+HDR evdev.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
+HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part
+
+@USE_COMPAT_RULES_FALSE@base_parts = $(base_parts_no_compat)
+@USE_COMPAT_RULES_TRUE@base_parts = base.hdr.part base.lists.part \
+@USE_COMPAT_RULES_TRUE@compat/base.lists.part \
+@USE_COMPAT_RULES_TRUE@HDR base.m_k.part HDR base.l1_k.part     \
+@USE_COMPAT_RULES_TRUE@HDR base.l_k.part HDR base.o_k.part      \
+@USE_COMPAT_RULES_TRUE@HDR base.ml_g.part \
+@USE_COMPAT_RULES_TRUE@HDR base.m_g.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part base.mlv_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part base.ml_s.part  \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part base.ml1_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part base.l2_s.part  \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part base.l3_s.part  \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part base.l4_s.part  \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part \
+@USE_COMPAT_RULES_TRUE@HDR base.m_s.part  HDR base.ml_c.part HDR base.ml1_c.part \
+@USE_COMPAT_RULES_TRUE@HDR base.m_t.part \
+@USE_COMPAT_RULES_TRUE@HDR base.lo_s.part HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \
+@USE_COMPAT_RULES_TRUE@HDR base.o_c.part HDR base.o_t.part
+
+@USE_COMPAT_RULES_FALSE@evdev_parts = $(base_parts_no_compat)
+@USE_COMPAT_RULES_TRUE@evdev_parts = base.hdr.part base.lists.part \
+@USE_COMPAT_RULES_TRUE@compat/base.lists.part \
+@USE_COMPAT_RULES_TRUE@HDR evdev.m_k.part HDR base.l1_k.part     \
+@USE_COMPAT_RULES_TRUE@HDR base.l_k.part HDR base.o_k.part      \
+@USE_COMPAT_RULES_TRUE@HDR base.ml_g.part \
+@USE_COMPAT_RULES_TRUE@HDR base.m_g.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part base.mlv_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part base.ml_s.part  \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part base.ml1_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part base.l2_s.part  \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part base.l3_s.part  \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part base.l4_s.part  \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part \
+@USE_COMPAT_RULES_TRUE@HDR evdev.m_s.part  HDR base.ml_c.part HDR base.ml1_c.part \
+@USE_COMPAT_RULES_TRUE@HDR base.m_t.part \
+@USE_COMPAT_RULES_TRUE@HDR base.lo_s.part HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \
+@USE_COMPAT_RULES_TRUE@HDR base.o_c.part HDR base.o_t.part
+
+rules_files = base evdev xfree98
+lst_files = base.lst evdev.lst
+all_rules_files = $(rules_files) $(lst_files) \
+xkb.dtd README
+
+rules_DATA = $(all_rules_files)
+xml_in_files = base.xml.in evdev.xml.in
+xml_DATA = $(xml_in_files:.xml.in=.xml) 
+EXTRA_DIST = $(all_rules_files) $(xml_in_files) \
+            $(base_parts_no_compat) \
+            $(evdev_parts_no_compat) \
+            xml2lst.pl merge.sh
+
+DISTCLEANFILES = base.xml base.lst evdev.xml evdev.lst
+rulesdir = $(xkb_base)/rules
+xmldir = $(rulesdir)
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  rules/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  rules/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-rulesDATA: $(rules_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(rulesdir)" || $(mkdir_p) "$(DESTDIR)$(rulesdir)"
+	@list='$(rules_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(rulesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rulesdir)/$$f'"; \
+	  $(rulesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rulesdir)/$$f"; \
+	done
+
+uninstall-rulesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(rules_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(rulesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(rulesdir)/$$f"; \
+	done
+install-xmlDATA: $(xml_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)"
+	@list='$(xml_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \
+	  $(xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \
+	done
+
+uninstall-xmlDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(xml_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(xmldir)/$$f"; \
+	done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(rulesdir)" "$(DESTDIR)$(xmldir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-rulesDATA install-xmlDATA
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-rulesDATA uninstall-xmlDATA
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-recursive ctags ctags-recursive \
+	distclean distclean-generic distclean-recursive distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-data-hook \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-rulesDATA install-strip install-xmlDATA \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-info-am uninstall-rulesDATA \
+	uninstall-xmlDATA
+
+
+#  extra_rules_file = $(xkb_rules_symlink)
+#  extra_dir_file   = $(extra_rules_file).xml 
+#  extra_lst_file   = $(extra_rules_file).lst
+
+@CREATE_RULES_SYMLINK_TRUE@install-data-hook:
+@CREATE_RULES_SYMLINK_TRUE@	for file in `echo "$(xkb_rules_symlink)" | sed 's/,/ /'` ; do \
+@CREATE_RULES_SYMLINK_TRUE@		extra_rules_file=$$file ; \
+@CREATE_RULES_SYMLINK_TRUE@		extra_dir_file=$$extra_rules_file.xml ; \
+@CREATE_RULES_SYMLINK_TRUE@		extra_lst_file=$$extra_rules_file.lst ; \
+@CREATE_RULES_SYMLINK_TRUE@		ln -sf base     $(DESTDIR)$(rulesdir)/$$extra_rules_file ; \
+@CREATE_RULES_SYMLINK_TRUE@		ln -sf base.lst $(DESTDIR)$(rulesdir)/$$extra_lst_file ; \
+@CREATE_RULES_SYMLINK_TRUE@		ln -sf base.xml $(DESTDIR)$(rulesdir)/$$extra_dir_file ; \
+@CREATE_RULES_SYMLINK_TRUE@	done
+
+@CREATE_RULES_SYMLINK_FALSE@install-data-hook:
+
+%.lst: %.xml
+	perl $(srcdir)/xml2lst.pl < $< > $@
+
+base: $(base_parts_no_compat)
+	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts)
+
+evdev: $(evdev_parts_no_compat)
+	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts)
+
+evdev.xml.in: base.xml.in
+	cp $< $@
+
+@INTLTOOL_XML_NOMERGE_RULE@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/rules/README b/xorg-server/xkbdata.src/rules/README
new file mode 100644
index 000000000..bcf19ce0c
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/README
@@ -0,0 +1,2 @@
+This directory lists sets of rules which can be used to obtain an exact XKB
+configuration.
diff --git a/xorg-server/xkbdata.src/rules/base b/xorg-server/xkbdata.src/rules/base
new file mode 100644
index 000000000..66f484a6c
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base
@@ -0,0 +1,993 @@
+// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY merge.sh FROM rules/*.part
+// $Xorg: xfree86,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
+
+//
+//  Rules for resolving XKB components for use with XFree86
+//  Copyright 1996 by Joseph Moss
+//
+//  2002 Modifier: Ivan Pascal      The XFree86 Project
+//  $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.79 2004/01/09 00:16:01 dawes Exp $
+//
+
+// If you want non-latin layouts implicitly include the en_US layout
+// uncomment lines below
+//! $nonlatin = am ara ben bd bg bt by cs deva ge gh gr guj guru il \
+//              in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \
+//              ru scc sy syr tel th tj tam ua uz
+
+// PC models
+! $pcmodels = pc101 pc102 pc104 pc105
+
+// Microsoft models (using MS geometry)
+! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose
+
+// PC geometries - they have special geometry but symbols are mostly pc105
+! $pcgeometries = abnt2 latitude jp106 kr106
+
+// Layouts that provide further specializations for the OLPC
+! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us 
+
+! $macbooks = macbook78 macbook79
+! $maclaptop = ibook powerbook macbook78 macbook79
+! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
+
+! $macvendorlayouts = ch de dk es fi fr gb is it latam nl no pt se us
+
+! $azerty = be fr
+! $qwertz = al cz de hr hu ro si sk 
+
+! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \
+              acer_c300 acer_ferrari4k acer_laptop \
+              acpi airkey \
+              apple armada asus_laptop azonaRF2300 \
+              benqx brother \
+              btc5113rf btc5126t btc6301urf btc9000 btc9000a btc9001ah btc5090 btc9019u \
+              cherryblue cherrybluea cherryblueb cherrycyboard \
+              chicony chicony0108 chicony9885 \
+              compaqeak8 compaqik7 compaqik13 compaqik18 \
+              cymotionlinux \
+              dell dellm65 inspiron precision_m dellusbmm dtk2000 \
+              emachines ennyah_dkb1008 evdev fscaa1667g \
+              genius geniuscomfy geniuscomfy2 geniuskb19e \
+              gyration honeywell_euroboard \
+              hp2501 hp2505 hp5xx hp500fa hp5181 hp5185 \
+              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
+              ibm_spacesaver ipaq inspiron intel latitude \
+              logiaccess logicda logicink \
+              logiex110 logiclx300 \
+              logiinkse logiinkseusb logiitc logiik \
+              logitech_base itouch logiultrax \
+              logitech_g15 \
+	      logidinovo logidinovoedge \
+              microsoft7000 microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
+              microsoftoffice microsoftmult \
+              mx1998 mx2500 mx2750 \
+              oretec \
+              presario propeller \
+              qtronix \
+              rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \
+              samsung4500 samsung4510 \
+              scorpius silvercrest \
+              sk1300 sk2500 sk6200 sk7100 sp_inet \
+              sven sven303 symplon \
+              toshiba_s3000 trust trustda \
+              yahoo
+
+// all layouts with 3rd and 4th groups
+! $threelevellayouts = al az \
+              be br bt \
+              ca ch cs cz \
+              de dk \
+              ee es \
+              fi fo fr \
+              gb gr \
+              hu \
+              ie ir is it \
+              kg \
+              latam \
+              lk lt \
+              mn mt \
+              nl no \
+              pl pt \
+              ro \
+              se sk \
+              tr \
+              us \
+              vn \
+              za
+
+
+! $dvoraklayouts = br ca de ee es fr gb no pl se us
+
+! model		=	keycodes
+  amiga		=	amiga(de)
+  ataritt	=	ataritt(de)
+  sun4		=	sun(type4_euro)
+  sun5		=	sun(type5_euro)
+  sun6		=	sun(type6_usb)
+  pc98		=	xfree98(pc98)
+  abnt2		=	xfree86(abnt2)
+  jp106		=	xfree86(jp106)
+  evdev		=	evdev
+  olpc		=	evdev
+  macintosh_hhk	=	macintosh(hhk)
+  macintosh_old	=	macintosh(old)
+ $macbooks	=	macintosh+macintosh(goodmap)
+ $macs   	=	macintosh
+  thinkpadz60	=	xfree86(thinkpadz60)
+  *		=	xfree86
+
+! layout[1]	=	keycodes
+  $azerty       =       +aliases(azerty)
+  $qwertz       =       +aliases(qwertz)
+  *             =       +aliases(qwerty)
+
+! layout	=	keycodes
+  $azerty       =       +aliases(azerty)
+  $qwertz       =       +aliases(qwertz)
+  *             =       +aliases(qwerty)
+
+! option	=	keycodes
+  apple:badmap		=	+macintosh(badmap)
+  apple:goodmap		=	+macintosh(goodmap)
+
+! model		layout	=	geometry
+  thinkpad     us              =       thinkpad(us)
+
+! model		=	geometry
+  microsoftelite	=	microsoft(elite)
+ $msmodels	=	microsoft(natural)
+  dell101	=	dell(dell101)
+  dellm65	=	dell(dellm65)
+  flexpro	=	keytronic(FlexPro)
+  hp6000	=	hp(omnibook)
+  omnikey101	=	northgate(omnikey101)
+ $pcmodels	=	pc(%m)
+ $pcgeometries	=	pc(%m)
+  everex	=	everex(STEPnote)
+  thinkpad	=	thinkpad(intl)
+  thinkpad60	=	thinkpad(60)
+  thinkpadz60	=	thinkpad(60)
+  winbook	=	winbook(XP5)
+  pc98		=	nec(pc98)
+ $macbooks      =       macintosh(%m)
+ $macs		=	macintosh(macintosh)
+  hhk		=	hhk(basic)
+  kinesis	=	kinesis(model100)
+  *		=       pc(pc104)
+
+! model		layout		variant		=	symbols
+  *		ben		basic		=	pc+in(ben)
+  *		ben		probhat		=	pc+in(ben_probhat)
+  *		dev		basic		=	pc+in(deva)
+  *		dvorak		$dvoraklayouts		=	pc+%v(dvorak)
+  *		dvorak		basic		=	pc+us(dvorak)
+  *		dvorak		pl_basic		=	pc+pl(dvorak)
+  *		dvorak		pl		=	pc+pl(dvorak_quotes)
+  *		dvorak		pl_altquotes		=	pc+pl(dvorak_altquotes)
+  *		dzdwi		basic		=	pc+bt(basic)
+  *		fi		basic		=	pc+fi(classic)
+  *		ge		azerty_tskapo		=	pc+fr(geo)
+  *		guj		basic		=	pc+in(guj)
+  *		gur		basic		=	pc+in(guru)
+  *		ie		laptop		=	pc+ie(basic)
+  *		ie		CloGaelachLaptop		=	pc+ie(CloGaelach)
+  *		il		si1452		=	pc+ie(basic)
+  *		iu		basic		=	pc+ca(ike)
+  *		lo		basic		=	pc+la(basic)
+  *		kan		basic		=	pc+in(kan)
+  *		mal		basic		=	pc+in(mal)
+  *		mal		mlplusnum		=	pc+in(mal)
+  *		ogham		basic		=	pc+ie(ogam)
+  *		ogham		laptop		=	pc+ie(ogam)
+  *		ogham		is434		=	pc+ie(ogam_is434)
+  *		ogham		is434laptop		=	pc+ie(ogam_is434)
+  *		ori		basic		=	pc+in(ori)
+  *		ro		de		=	pc+ro(winkeys)
+  *		ro		us		=	pc+ro(std)
+  *		ro		academic		=	pc+ro(std)
+  *		ro		std_comma		=	pc+ro(std)
+  *		ro		comma		=	pc+ro(basic)
+  *		ru		os		=	pc+ru(os_legacy)
+  *		sapmi		basic		=	pc+no(smi)
+  *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
+  *		sapmi		sefi		=	pc+fi(smi)
+  *		sin		phonetic-static		=	pc+in(sin_phonetic)
+  *		syr		basic		=	pc+sy(syc)
+  *		syr		phonetic		=	pc+sy(syc_phonetic)
+  *		tam		INSCRIPT		=	pc+in(tam)
+  *		tam		UNI		=	pc+in(tam_unicode)
+  *		tam		TAB		=	pc+in(tam_TAB)
+  *		tam		TSCII		=	pc+in(tam_TSCII)
+  *		tel		basic		=	pc+in(tel)
+  *		yu		basic		=	pc+srp(latin)
+  *		yu		unicode		=	pc+srp(latinunicode)
+  *		yu		yz		=	pc+srp(latinyz)
+  *		yu		unicodeyz		=	pc+srp(latinunicodeyz)
+  classmate	us		intl		=	pc+us(classmate-intl)
+  classmate	us		alt-intl	=	pc+us(classmate-alt-intl)
+  classmate	us		altgr-intl	=	pc+us(classmate-altgr-intl)
+
+! model		layout				=	symbols
+  *		ar			=	pc+ara
+  *		ben			=	pc+in(ben)
+  *		bs			=	pc+ba
+  *		cs			=	pc+rs
+  *		cz_qwerty			=	pc+cz(qwerty)
+  *		dev			=	pc+in(deva)
+  *		dvorak			=	pc+us(dvorak)
+  *		dzdwi			=	pc+bt
+  *		el			=	pc+gr
+  *		en_US			=	pc+latin
+  *		guj			=	pc+in(guj)
+  *		gur			=	pc+in(guru)
+  *		iu			=	pc+ca(ike)
+  *		lo			=	pc+la
+  *		kan			=	pc+in(kan)
+  *		mi			=	pc+mao
+  *		ml			=	pc+in(mal)
+  *		ogham			=	pc+ie(ogam)
+  *		ori			=	pc+ie(ori)
+  *		sapmi			=	pc+no(smi)
+  *		sr			=	pc+srp
+  *		syr			=	pc+sy(syc)
+  *		tel			=	pc+in(tel)
+  *		tml			=	pc+in(tam)
+  *		yu			=	pc+srp
+  *		fr-latin9			=	pc+fr(latin9)
+  *		us_intl			=	pc+us(alt-intl)
+  *		ben(basic)			=	pc+in(ben)
+  *		ben(probhat)			=	pc+in(ben_probhat)
+  *		dev(basic)			=	pc+in(deva)
+  *		dvorak($dvoraklayouts)			=	pc+%v(dvorak)
+  *		dvorak(basic)			=	pc+us(dvorak)
+  *		dvorak(pl_basic)			=	pc+pl(dvorak)
+  *		dvorak(pl)			=	pc+pl(dvorak_quotes)
+  *		dvorak(pl_altquotes)			=	pc+pl(dvorak_altquotes)
+  *		dzdwi(basic)			=	pc+bt(basic)
+  *		fi(basic)			=	pc+fi(classic)
+  *		ge(azerty_tskapo)			=	pc+fr(geo)
+  *		guj(basic)			=	pc+in(guj)
+  *		gur(basic)			=	pc+in(guru)
+  *		ie(laptop)			=	pc+ie(basic)
+  *		ie(CloGaelachLaptop)			=	pc+ie(CloGaelach)
+  *		il(si1452)			=	pc+ie(basic)
+  *		iu(basic)			=	pc+ca(ike)
+  *		lo(basic)			=	pc+la(basic)
+  *		kan(basic)			=	pc+in(kan)
+  *		mal(basic)			=	pc+in(mal)
+  *		mal(mlplusnum)			=	pc+in(mal)
+  *		ogham(basic)			=	pc+ie(ogam)
+  *		ogham(laptop)			=	pc+ie(ogam)
+  *		ogham(is434)			=	pc+ie(ogam_is434)
+  *		ogham(is434laptop)			=	pc+ie(ogam_is434)
+  *		ori(basic)			=	pc+in(ori)
+  *		ro(de)			=	pc+ro(winkeys)
+  *		ro(us)			=	pc+ro(std)
+  *		ro(academic)			=	pc+ro(std)
+  *		ro(std_comma)			=	pc+ro(std)
+  *		ro(comma)			=	pc+ro(basic)
+  *		ru(os)			=	pc+ru(os_legacy)
+  *		sapmi(basic)			=	pc+no(smi)
+  *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
+  *		sapmi(sefi)			=	pc+fi(smi)
+  *		sin(phonetic-static)			=	pc+in(sin_phonetic)
+  *		syr(basic)			=	pc+sy(syc)
+  *		syr(phonetic)			=	pc+sy(syc_phonetic)
+  *		tam(INSCRIPT)			=	pc+in(tam)
+  *		tam(UNI)			=	pc+in(tam_unicode)
+  *		tam(TAB)			=	pc+in(tam_TAB)
+  *		tam(TSCII)			=	pc+in(tam_TSCII)
+  *		tel(basic)			=	pc+in(tel)
+  *		yu(basic)			=	pc+srp(latin)
+  *		yu(unicode)			=	pc+srp(latinunicode)
+  *		yu(yz)			=	pc+srp(latinyz)
+  *		yu(unicodeyz)			=	pc+srp(latinunicodeyz)
+  ataritt	$nonlatin		=	xfree68_vndr/ataritt(us)+%l%(v):2
+  ataritt	*			=	xfree68_vndr/ataritt(us)+%l%(v)
+  amiga		$nonlatin		=	xfree68_vndr/amiga(usa1)+%l%(v):2
+  amiga		*			=	xfree68_vndr/amiga(usa1)+%l%(v)
+  classmate	us			=	pc+%l(classmate)
+  sun4		$nonlatin		=	latin+sun_vndr/us(sun4)+%l%(v):2
+  sun4		*			=	latin+sun_vndr/us(sun4)+%l%(v)
+  sun5		$nonlatin		=	latin+sun_vndr/us(sun5)+%l%(v):2
+  sun5		*			=	latin+sun_vndr/us(sun5)+%l%(v)
+  sun6		us			=	sun_vndr/us(type6)
+  sun6		en_US			=	sun_vndr/us(type6)+iso9995-3(basic)
+  sun6		*			=	sun_vndr/us(type6)+%l%(v)
+  pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
+  macintosh_old	us			=	macintosh_vndr/us(oldmac)
+  macintosh_old	en_US			=	macintosh_vndr/us(oldmac)
+  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v)
+  macintosh_old	$nonlatin		=	macintosh_vndr/us(oldmac)+%l%(v):2
+  macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
+ $macs		en_US			=	pc+macintosh_vndr/us(extended)
+ $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
+  olpc		$olpclayouts		=	olpc+%l%(m)
+  olpc		*			=	olpc+%l%(v)
+  thinkpad   	br			=	pc+br(thinkpad)
+  *	   	$nonlatin		=	pc+us+%l%(v):2
+  *		*			=	pc+%l%(v)
+
+! model		layout[1]			=	symbols
+  *		ar			=	pc+ara%(v[1])
+  *		ben			=	pc+in(ben)%(v[1])
+  *		bs			=	pc+ba%(v[1])
+  *		cs			=	pc+rs%(v[1])
+  *		cz_qwerty			=	pc+cz(qwerty)%(v[1])
+  *		dev			=	pc+in(deva)%(v[1])
+  *		dvorak			=	pc+us(dvorak)%(v[1])
+  *		dzdwi			=	pc+bt%(v[1])
+  *		el			=	pc+gr%(v[1])
+  *		en_US			=	pc+latin%(v[1])
+  *		guj			=	pc+in(guj)%(v[1])
+  *		gur			=	pc+in(guru)%(v[1])
+  *		iu			=	pc+ca(ike)%(v[1])
+  *		lo			=	pc+la%(v[1])
+  *		kan			=	pc+in(kan)%(v[1])
+  *		mi			=	pc+mao%(v[1])
+  *		ml			=	pc+in(mal)%(v[1])
+  *		ogham			=	pc+ie(ogam)%(v[1])
+  *		ori			=	pc+ie(ori)%(v[1])
+  *		sapmi			=	pc+no(smi)%(v[1])
+  *		sr			=	pc+srp%(v[1])
+  *		syr			=	pc+sy(syc)%(v[1])
+  *		tel			=	pc+in(tel)%(v[1])
+  *		tml			=	pc+in(tam)%(v[1])
+  *		yu			=	pc+srp%(v[1])
+  *		fr-latin9			=	pc+fr(latin9)%(v[1])
+  *		us_intl			=	pc+us(alt-intl)%(v[1])
+  *		ben(basic)			=	pc+in(ben)
+  *		ben(probhat)			=	pc+in(ben_probhat)
+  *		dev(basic)			=	pc+in(deva)
+  *		dvorak($dvoraklayouts)			=	pc+%v(dvorak)
+  *		dvorak(basic)			=	pc+us(dvorak)
+  *		dvorak(pl_basic)			=	pc+pl(dvorak)
+  *		dvorak(pl)			=	pc+pl(dvorak_quotes)
+  *		dvorak(pl_altquotes)			=	pc+pl(dvorak_altquotes)
+  *		dzdwi(basic)			=	pc+bt(basic)
+  *		fi(basic)			=	pc+fi(classic)
+  *		ge(azerty_tskapo)			=	pc+fr(geo)
+  *		guj(basic)			=	pc+in(guj)
+  *		gur(basic)			=	pc+in(guru)
+  *		ie(laptop)			=	pc+ie(basic)
+  *		ie(CloGaelachLaptop)			=	pc+ie(CloGaelach)
+  *		il(si1452)			=	pc+ie(basic)
+  *		iu(basic)			=	pc+ca(ike)
+  *		lo(basic)			=	pc+la(basic)
+  *		kan(basic)			=	pc+in(kan)
+  *		mal(basic)			=	pc+in(mal)
+  *		mal(mlplusnum)			=	pc+in(mal)
+  *		ogham(basic)			=	pc+ie(ogam)
+  *		ogham(laptop)			=	pc+ie(ogam)
+  *		ogham(is434)			=	pc+ie(ogam_is434)
+  *		ogham(is434laptop)			=	pc+ie(ogam_is434)
+  *		ori(basic)			=	pc+in(ori)
+  *		ro(de)			=	pc+ro(winkeys)
+  *		ro(us)			=	pc+ro(std)
+  *		ro(academic)			=	pc+ro(std)
+  *		ro(std_comma)			=	pc+ro(std)
+  *		ro(comma)			=	pc+ro(basic)
+  *		ru(os)			=	pc+ru(os_legacy)
+  *		sapmi(basic)			=	pc+no(smi)
+  *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
+  *		sapmi(sefi)			=	pc+fi(smi)
+  *		sin(phonetic-static)			=	pc+in(sin_phonetic)
+  *		syr(basic)			=	pc+sy(syc)
+  *		syr(phonetic)			=	pc+sy(syc_phonetic)
+  *		tam(INSCRIPT)			=	pc+in(tam)
+  *		tam(UNI)			=	pc+in(tam_unicode)
+  *		tam(TAB)			=	pc+in(tam_TAB)
+  *		tam(TSCII)			=	pc+in(tam_TSCII)
+  *		tel(basic)			=	pc+in(tel)
+  *		yu(basic)			=	pc+srp(latin)
+  *		yu(unicode)			=	pc+srp(latinunicode)
+  *		yu(yz)			=	pc+srp(latinyz)
+  *		yu(unicodeyz)			=	pc+srp(latinunicodeyz)
+  ataritt	*			=	xfree68_vndr/ataritt(us)+%l[1]%(v[1])
+  amiga		*			=	xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
+  sun4		*			=	latin+sun_vndr/us(sun4)+%l[1]%(v[1])
+  sun5		*			=	latin+sun_vndr/us(sun5)+%l[1]%(v[1])
+  macintosh_old	us			=	macintosh_vndr/us(oldmac)
+  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
+  macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l[1]%(v[1])
+ $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l[1]%(v[1])
+  thinkpad	br			=	pc+%l[1](thinkpad)
+  *		*			=	pc+%l[1]%(v[1])
+
+! model		layout[1]	variant[1]	=	symbols
+  *		ben		basic		=	pc+in(ben)
+  *		ben		probhat		=	pc+in(ben_probhat)
+  *		dev		basic		=	pc+in(deva)
+  *		dvorak		$dvoraklayouts		=	pc+%v(dvorak)
+  *		dvorak		basic		=	pc+us(dvorak)
+  *		dvorak		pl_basic		=	pc+pl(dvorak)
+  *		dvorak		pl		=	pc+pl(dvorak_quotes)
+  *		dvorak		pl_altquotes		=	pc+pl(dvorak_altquotes)
+  *		dzdwi		basic		=	pc+bt(basic)
+  *		fi		basic		=	pc+fi(classic)
+  *		ge		azerty_tskapo		=	pc+fr(geo)
+  *		guj		basic		=	pc+in(guj)
+  *		gur		basic		=	pc+in(guru)
+  *		ie		laptop		=	pc+ie(basic)
+  *		ie		CloGaelachLaptop		=	pc+ie(CloGaelach)
+  *		il		si1452		=	pc+ie(basic)
+  *		iu		basic		=	pc+ca(ike)
+  *		lo		basic		=	pc+la(basic)
+  *		kan		basic		=	pc+in(kan)
+  *		mal		basic		=	pc+in(mal)
+  *		mal		mlplusnum		=	pc+in(mal)
+  *		ogham		basic		=	pc+ie(ogam)
+  *		ogham		laptop		=	pc+ie(ogam)
+  *		ogham		is434		=	pc+ie(ogam_is434)
+  *		ogham		is434laptop		=	pc+ie(ogam_is434)
+  *		ori		basic		=	pc+in(ori)
+  *		ro		de		=	pc+ro(winkeys)
+  *		ro		us		=	pc+ro(std)
+  *		ro		academic		=	pc+ro(std)
+  *		ro		std_comma		=	pc+ro(std)
+  *		ro		comma		=	pc+ro(basic)
+  *		ru		os		=	pc+ru(os_legacy)
+  *		sapmi		basic		=	pc+no(smi)
+  *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
+  *		sapmi		sefi		=	pc+fi(smi)
+  *		sin		phonetic-static		=	pc+in(sin_phonetic)
+  *		syr		basic		=	pc+sy(syc)
+  *		syr		phonetic		=	pc+sy(syc_phonetic)
+  *		tam		INSCRIPT		=	pc+in(tam)
+  *		tam		UNI		=	pc+in(tam_unicode)
+  *		tam		TAB		=	pc+in(tam_TAB)
+  *		tam		TSCII		=	pc+in(tam_TSCII)
+  *		tel		basic		=	pc+in(tel)
+  *		yu		basic		=	pc+srp(latin)
+  *		yu		unicode		=	pc+srp(latinunicode)
+  *		yu		yz		=	pc+srp(latinyz)
+  *		yu		unicodeyz		=	pc+srp(latinunicodeyz)
+
+! layout[2]	=	symbols
+  ar		=	+ara%(v[2]):2
+  ben		=	+in(ben)%(v[2]):2
+  bs		=	+ba%(v[2]):2
+  cs		=	+rs%(v[2]):2
+  cz_qwerty		=	+cz(qwerty)%(v[2]):2
+  dev		=	+in(deva)%(v[2]):2
+  dvorak		=	+us(dvorak)%(v[2]):2
+  dzdwi		=	+bt%(v[2]):2
+  el		=	+gr%(v[2]):2
+  en_US		=	+latin%(v[2]):2
+  guj		=	+in(guj)%(v[2]):2
+  gur		=	+in(guru)%(v[2]):2
+  iu		=	+ca(ike)%(v[2]):2
+  lo		=	+la%(v[2]):2
+  kan		=	+in(kan)%(v[2]):2
+  mi		=	+mao%(v[2]):2
+  ml		=	+in(mal)%(v[2]):2
+  ogham		=	+ie(ogam)%(v[2]):2
+  ori		=	+ie(ori)%(v[2]):2
+  sapmi		=	+no(smi)%(v[2]):2
+  sr		=	+srp%(v[2]):2
+  syr		=	+sy(syc)%(v[2]):2
+  tel		=	+in(tel)%(v[2]):2
+  tml		=	+in(tam)%(v[2]):2
+  yu		=	+srp%(v[2]):2
+  fr-latin9		=	+fr(latin9)%(v[2]):2
+  us_intl		=	+us(alt-intl)%(v[2]):2
+  ben(basic)	=	+in(ben):2
+  ben(probhat)	=	+in(ben_probhat):2
+  dev(basic)	=	+in(deva):2
+  dvorak($dvoraklayouts)	=	+%v(dvorak):2
+  dvorak(basic)	=	+us(dvorak):2
+  dvorak(pl_basic)	=	+pl(dvorak):2
+  dvorak(pl)	=	+pl(dvorak_quotes):2
+  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):2
+  dzdwi(basic)	=	+bt(basic):2
+  fi(basic)	=	+fi(classic):2
+  ge(azerty_tskapo)	=	+fr(geo):2
+  guj(basic)	=	+in(guj):2
+  gur(basic)	=	+in(guru):2
+  ie(laptop)	=	+ie(basic):2
+  ie(CloGaelachLaptop)	=	+ie(CloGaelach):2
+  il(si1452)	=	+ie(basic):2
+  iu(basic)	=	+ca(ike):2
+  lo(basic)	=	+la(basic):2
+  kan(basic)	=	+in(kan):2
+  mal(basic)	=	+in(mal):2
+  mal(mlplusnum)	=	+in(mal):2
+  ogham(basic)	=	+ie(ogam):2
+  ogham(laptop)	=	+ie(ogam):2
+  ogham(is434)	=	+ie(ogam_is434):2
+  ogham(is434laptop)	=	+ie(ogam_is434):2
+  ori(basic)	=	+in(ori):2
+  ro(de)	=	+ro(winkeys):2
+  ro(us)	=	+ro(std):2
+  ro(academic)	=	+ro(std):2
+  ro(std_comma)	=	+ro(std):2
+  ro(comma)	=	+ro(basic):2
+  ru(os)	=	+ru(os_legacy):2
+  sapmi(basic)	=	+no(smi):2
+  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):2
+  sapmi(sefi)	=	+fi(smi):2
+  sin(phonetic-static)	=	+in(sin_phonetic):2
+  syr(basic)	=	+sy(syc):2
+  syr(phonetic)	=	+sy(syc_phonetic):2
+  tam(INSCRIPT)	=	+in(tam):2
+  tam(UNI)	=	+in(tam_unicode):2
+  tam(TAB)	=	+in(tam_TAB):2
+  tam(TSCII)	=	+in(tam_TSCII):2
+  tel(basic)	=	+in(tel):2
+  yu(basic)	=	+srp(latin):2
+  yu(unicode)	=	+srp(latinunicode):2
+  yu(yz)	=	+srp(latinyz):2
+  yu(unicodeyz)	=	+srp(latinunicodeyz):2
+  *		=	+%l[2]%(v[2]):2
+
+! layout[3]	=	symbols
+  ar		=	+ara%(v[3]):3
+  ben		=	+in(ben)%(v[3]):3
+  bs		=	+ba%(v[3]):3
+  cs		=	+rs%(v[3]):3
+  cz_qwerty		=	+cz(qwerty)%(v[3]):3
+  dev		=	+in(deva)%(v[3]):3
+  dvorak		=	+us(dvorak)%(v[3]):3
+  dzdwi		=	+bt%(v[3]):3
+  el		=	+gr%(v[3]):3
+  en_US		=	+latin%(v[3]):3
+  guj		=	+in(guj)%(v[3]):3
+  gur		=	+in(guru)%(v[3]):3
+  iu		=	+ca(ike)%(v[3]):3
+  lo		=	+la%(v[3]):3
+  kan		=	+in(kan)%(v[3]):3
+  mi		=	+mao%(v[3]):3
+  ml		=	+in(mal)%(v[3]):3
+  ogham		=	+ie(ogam)%(v[3]):3
+  ori		=	+ie(ori)%(v[3]):3
+  sapmi		=	+no(smi)%(v[3]):3
+  sr		=	+srp%(v[3]):3
+  syr		=	+sy(syc)%(v[3]):3
+  tel		=	+in(tel)%(v[3]):3
+  tml		=	+in(tam)%(v[3]):3
+  yu		=	+srp%(v[3]):3
+  fr-latin9		=	+fr(latin9)%(v[3]):3
+  us_intl		=	+us(alt-intl)%(v[3]):3
+  ben(basic)	=	+in(ben):3
+  ben(probhat)	=	+in(ben_probhat):3
+  dev(basic)	=	+in(deva):3
+  dvorak($dvoraklayouts)	=	+%v(dvorak):3
+  dvorak(basic)	=	+us(dvorak):3
+  dvorak(pl_basic)	=	+pl(dvorak):3
+  dvorak(pl)	=	+pl(dvorak_quotes):3
+  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):3
+  dzdwi(basic)	=	+bt(basic):3
+  fi(basic)	=	+fi(classic):3
+  ge(azerty_tskapo)	=	+fr(geo):3
+  guj(basic)	=	+in(guj):3
+  gur(basic)	=	+in(guru):3
+  ie(laptop)	=	+ie(basic):3
+  ie(CloGaelachLaptop)	=	+ie(CloGaelach):3
+  il(si1452)	=	+ie(basic):3
+  iu(basic)	=	+ca(ike):3
+  lo(basic)	=	+la(basic):3
+  kan(basic)	=	+in(kan):3
+  mal(basic)	=	+in(mal):3
+  mal(mlplusnum)	=	+in(mal):3
+  ogham(basic)	=	+ie(ogam):3
+  ogham(laptop)	=	+ie(ogam):3
+  ogham(is434)	=	+ie(ogam_is434):3
+  ogham(is434laptop)	=	+ie(ogam_is434):3
+  ori(basic)	=	+in(ori):3
+  ro(de)	=	+ro(winkeys):3
+  ro(us)	=	+ro(std):3
+  ro(academic)	=	+ro(std):3
+  ro(std_comma)	=	+ro(std):3
+  ro(comma)	=	+ro(basic):3
+  ru(os)	=	+ru(os_legacy):3
+  sapmi(basic)	=	+no(smi):3
+  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):3
+  sapmi(sefi)	=	+fi(smi):3
+  sin(phonetic-static)	=	+in(sin_phonetic):3
+  syr(basic)	=	+sy(syc):3
+  syr(phonetic)	=	+sy(syc_phonetic):3
+  tam(INSCRIPT)	=	+in(tam):3
+  tam(UNI)	=	+in(tam_unicode):3
+  tam(TAB)	=	+in(tam_TAB):3
+  tam(TSCII)	=	+in(tam_TSCII):3
+  tel(basic)	=	+in(tel):3
+  yu(basic)	=	+srp(latin):3
+  yu(unicode)	=	+srp(latinunicode):3
+  yu(yz)	=	+srp(latinyz):3
+  yu(unicodeyz)	=	+srp(latinunicodeyz):3
+  *		=	+%l[3]%(v[3]):3
+
+! layout[4]	=	symbols
+  ar		=	+ara%(v[4]):4
+  ben		=	+in(ben)%(v[4]):4
+  bs		=	+ba%(v[4]):4
+  cs		=	+rs%(v[4]):4
+  cz_qwerty		=	+cz(qwerty)%(v[4]):4
+  dev		=	+in(deva)%(v[4]):4
+  dvorak		=	+us(dvorak)%(v[4]):4
+  dzdwi		=	+bt%(v[4]):4
+  el		=	+gr%(v[4]):4
+  en_US		=	+latin%(v[4]):4
+  guj		=	+in(guj)%(v[4]):4
+  gur		=	+in(guru)%(v[4]):4
+  iu		=	+ca(ike)%(v[4]):4
+  lo		=	+la%(v[4]):4
+  kan		=	+in(kan)%(v[4]):4
+  mi		=	+mao%(v[4]):4
+  ml		=	+in(mal)%(v[4]):4
+  ogham		=	+ie(ogam)%(v[4]):4
+  ori		=	+ie(ori)%(v[4]):4
+  sapmi		=	+no(smi)%(v[4]):4
+  sr		=	+srp%(v[4]):4
+  syr		=	+sy(syc)%(v[4]):4
+  tel		=	+in(tel)%(v[4]):4
+  tml		=	+in(tam)%(v[4]):4
+  yu		=	+srp%(v[4]):4
+  fr-latin9		=	+fr(latin9)%(v[4]):4
+  us_intl		=	+us(alt-intl)%(v[4]):4
+  ben(basic)	=	+in(ben):4
+  ben(probhat)	=	+in(ben_probhat):4
+  dev(basic)	=	+in(deva):4
+  dvorak($dvoraklayouts)	=	+%v(dvorak):4
+  dvorak(basic)	=	+us(dvorak):4
+  dvorak(pl_basic)	=	+pl(dvorak):4
+  dvorak(pl)	=	+pl(dvorak_quotes):4
+  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):4
+  dzdwi(basic)	=	+bt(basic):4
+  fi(basic)	=	+fi(classic):4
+  ge(azerty_tskapo)	=	+fr(geo):4
+  guj(basic)	=	+in(guj):4
+  gur(basic)	=	+in(guru):4
+  ie(laptop)	=	+ie(basic):4
+  ie(CloGaelachLaptop)	=	+ie(CloGaelach):4
+  il(si1452)	=	+ie(basic):4
+  iu(basic)	=	+ca(ike):4
+  lo(basic)	=	+la(basic):4
+  kan(basic)	=	+in(kan):4
+  mal(basic)	=	+in(mal):4
+  mal(mlplusnum)	=	+in(mal):4
+  ogham(basic)	=	+ie(ogam):4
+  ogham(laptop)	=	+ie(ogam):4
+  ogham(is434)	=	+ie(ogam_is434):4
+  ogham(is434laptop)	=	+ie(ogam_is434):4
+  ori(basic)	=	+in(ori):4
+  ro(de)	=	+ro(winkeys):4
+  ro(us)	=	+ro(std):4
+  ro(academic)	=	+ro(std):4
+  ro(std_comma)	=	+ro(std):4
+  ro(comma)	=	+ro(basic):4
+  ru(os)	=	+ru(os_legacy):4
+  sapmi(basic)	=	+no(smi):4
+  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):4
+  sapmi(sefi)	=	+fi(smi):4
+  sin(phonetic-static)	=	+in(sin_phonetic):4
+  syr(basic)	=	+sy(syc):4
+  syr(phonetic)	=	+sy(syc_phonetic):4
+  tam(INSCRIPT)	=	+in(tam):4
+  tam(UNI)	=	+in(tam_unicode):4
+  tam(TAB)	=	+in(tam_TAB):4
+  tam(TSCII)	=	+in(tam_TSCII):4
+  tel(basic)	=	+in(tel):4
+  yu(basic)	=	+srp(latin):4
+  yu(unicode)	=	+srp(latinunicode):4
+  yu(yz)	=	+srp(latinyz):4
+  yu(unicodeyz)	=	+srp(latinunicodeyz):4
+  *		=	+%l[4]%(v[4]):4
+
+! layout[2]	variant[2]	=	symbols
+  ben		basic	=	+in(ben):2
+  ben		probhat	=	+in(ben_probhat):2
+  dev		basic	=	+in(deva):2
+  dvorak		$dvoraklayouts	=	+%v(dvorak):2
+  dvorak		basic	=	+us(dvorak):2
+  dvorak		pl_basic	=	+pl(dvorak):2
+  dvorak		pl	=	+pl(dvorak_quotes):2
+  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):2
+  dzdwi		basic	=	+bt(basic):2
+  fi		basic	=	+fi(classic):2
+  ge		azerty_tskapo	=	+fr(geo):2
+  guj		basic	=	+in(guj):2
+  gur		basic	=	+in(guru):2
+  ie		laptop	=	+ie(basic):2
+  ie		CloGaelachLaptop	=	+ie(CloGaelach):2
+  il		si1452	=	+ie(basic):2
+  iu		basic	=	+ca(ike):2
+  lo		basic	=	+la(basic):2
+  kan		basic	=	+in(kan):2
+  mal		basic	=	+in(mal):2
+  mal		mlplusnum	=	+in(mal):2
+  ogham		basic	=	+ie(ogam):2
+  ogham		laptop	=	+ie(ogam):2
+  ogham		is434	=	+ie(ogam_is434):2
+  ogham		is434laptop	=	+ie(ogam_is434):2
+  ori		basic	=	+in(ori):2
+  ro		de	=	+ro(winkeys):2
+  ro		us	=	+ro(std):2
+  ro		academic	=	+ro(std):2
+  ro		std_comma	=	+ro(std):2
+  ro		comma	=	+ro(basic):2
+  ru		os	=	+ru(os_legacy):2
+  sapmi		basic	=	+no(smi):2
+  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):2
+  sapmi		sefi	=	+fi(smi):2
+  sin		phonetic-static	=	+in(sin_phonetic):2
+  syr		basic	=	+sy(syc):2
+  syr		phonetic	=	+sy(syc_phonetic):2
+  tam		INSCRIPT	=	+in(tam):2
+  tam		UNI	=	+in(tam_unicode):2
+  tam		TAB	=	+in(tam_TAB):2
+  tam		TSCII	=	+in(tam_TSCII):2
+  tel		basic	=	+in(tel):2
+  yu		basic	=	+srp(latin):2
+  yu		unicode	=	+srp(latinunicode):2
+  yu		yz	=	+srp(latinyz):2
+  yu		unicodeyz	=	+srp(latinunicodeyz):2
+
+! layout[3]	variant[3]	=	symbols
+  ben		basic	=	+in(ben):3
+  ben		probhat	=	+in(ben_probhat):3
+  dev		basic	=	+in(deva):3
+  dvorak		$dvoraklayouts	=	+%v(dvorak):3
+  dvorak		basic	=	+us(dvorak):3
+  dvorak		pl_basic	=	+pl(dvorak):3
+  dvorak		pl	=	+pl(dvorak_quotes):3
+  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):3
+  dzdwi		basic	=	+bt(basic):3
+  fi		basic	=	+fi(classic):3
+  ge		azerty_tskapo	=	+fr(geo):3
+  guj		basic	=	+in(guj):3
+  gur		basic	=	+in(guru):3
+  ie		laptop	=	+ie(basic):3
+  ie		CloGaelachLaptop	=	+ie(CloGaelach):3
+  il		si1452	=	+ie(basic):3
+  iu		basic	=	+ca(ike):3
+  lo		basic	=	+la(basic):3
+  kan		basic	=	+in(kan):3
+  mal		basic	=	+in(mal):3
+  mal		mlplusnum	=	+in(mal):3
+  ogham		basic	=	+ie(ogam):3
+  ogham		laptop	=	+ie(ogam):3
+  ogham		is434	=	+ie(ogam_is434):3
+  ogham		is434laptop	=	+ie(ogam_is434):3
+  ori		basic	=	+in(ori):3
+  ro		de	=	+ro(winkeys):3
+  ro		us	=	+ro(std):3
+  ro		academic	=	+ro(std):3
+  ro		std_comma	=	+ro(std):3
+  ro		comma	=	+ro(basic):3
+  ru		os	=	+ru(os_legacy):3
+  sapmi		basic	=	+no(smi):3
+  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):3
+  sapmi		sefi	=	+fi(smi):3
+  sin		phonetic-static	=	+in(sin_phonetic):3
+  syr		basic	=	+sy(syc):3
+  syr		phonetic	=	+sy(syc_phonetic):3
+  tam		INSCRIPT	=	+in(tam):3
+  tam		UNI	=	+in(tam_unicode):3
+  tam		TAB	=	+in(tam_TAB):3
+  tam		TSCII	=	+in(tam_TSCII):3
+  tel		basic	=	+in(tel):3
+  yu		basic	=	+srp(latin):3
+  yu		unicode	=	+srp(latinunicode):3
+  yu		yz	=	+srp(latinyz):3
+  yu		unicodeyz	=	+srp(latinunicodeyz):3
+
+! layout[4]	variant[4]	=	symbols
+  ben		basic	=	+in(ben):4
+  ben		probhat	=	+in(ben_probhat):4
+  dev		basic	=	+in(deva):4
+  dvorak		$dvoraklayouts	=	+%v(dvorak):4
+  dvorak		basic	=	+us(dvorak):4
+  dvorak		pl_basic	=	+pl(dvorak):4
+  dvorak		pl	=	+pl(dvorak_quotes):4
+  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):4
+  dzdwi		basic	=	+bt(basic):4
+  fi		basic	=	+fi(classic):4
+  ge		azerty_tskapo	=	+fr(geo):4
+  guj		basic	=	+in(guj):4
+  gur		basic	=	+in(guru):4
+  ie		laptop	=	+ie(basic):4
+  ie		CloGaelachLaptop	=	+ie(CloGaelach):4
+  il		si1452	=	+ie(basic):4
+  iu		basic	=	+ca(ike):4
+  lo		basic	=	+la(basic):4
+  kan		basic	=	+in(kan):4
+  mal		basic	=	+in(mal):4
+  mal		mlplusnum	=	+in(mal):4
+  ogham		basic	=	+ie(ogam):4
+  ogham		laptop	=	+ie(ogam):4
+  ogham		is434	=	+ie(ogam_is434):4
+  ogham		is434laptop	=	+ie(ogam_is434):4
+  ori		basic	=	+in(ori):4
+  ro		de	=	+ro(winkeys):4
+  ro		us	=	+ro(std):4
+  ro		academic	=	+ro(std):4
+  ro		std_comma	=	+ro(std):4
+  ro		comma	=	+ro(basic):4
+  ru		os	=	+ru(os_legacy):4
+  sapmi		basic	=	+no(smi):4
+  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):4
+  sapmi		sefi	=	+fi(smi):4
+  sin		phonetic-static	=	+in(sin_phonetic):4
+  syr		basic	=	+sy(syc):4
+  syr		phonetic	=	+sy(syc_phonetic):4
+  tam		INSCRIPT	=	+in(tam):4
+  tam		UNI	=	+in(tam_unicode):4
+  tam		TAB	=	+in(tam_TAB):4
+  tam		TSCII	=	+in(tam_TSCII):4
+  tel		basic	=	+in(tel):4
+  yu		basic	=	+srp(latin):4
+  yu		unicode	=	+srp(latinunicode):4
+  yu		yz	=	+srp(latinyz):4
+  yu		unicodeyz	=	+srp(latinunicodeyz):4
+
+! model		=	symbols
+  benqx730      =       +inet(benqx)
+  benqx800      =       +inet(benqx)
+  dellsk8125    =       +inet(dell)
+  dellsk8135    =       +inet(dell)
+  hpnx9020      =       +inet(hp5185)
+  logicd        =       +inet(logitech_base)
+  logicd_it     =       +inet(logitech_base)
+  logicd_nav    =       +inet(logitech_base)
+  logicd_opt    =       +inet(logitech_base)
+  logiultrax    =       +inet(logitech_base)
+  logiclx300    =       +inet(logiex110)
+  logii350      =       +inet(logiex110)
+  logimel       =       +inet(logiex110)
+  vsonku306     =       +inet(microsoftprooem)
+  $inetkbds     =       +inet(%m)
+  acer_tm_800   =       +inet(acer_laptop)
+  benqx730      =       +inet(benqx)
+  benqx800      =       +inet(benqx)
+  dell8125      =       +inet(dellusbmm)
+  dell8135      =       +inet(dellusbmm)
+  ltcd          =       +inet(logicda)
+  logicdit      =       +inet(logicd)
+  logicdo       =       +inet(logicd)
+  logicdp       =       +inet(logicd)
+  logicdpa      =       +inet(logicda)
+  logiciink     =       +inet(logicink)
+  $maclaptop    =       +inet(apple)+level3(enter_switch)
+  $macs	        =       +inet(apple)
+  thinkpadz60   =       +inet(thinkpad60)
+
+! model		layout		=	compat
+  pc98		nec_vndr/jp	=	pc98(basic)
+  *		jp		=	complete+japan
+  olpc         *               =       olpc
+  *		*		=	complete
+
+! model		layout[1]	=	compat
+  *		*		=	complete
+
+! model		=	types
+  $macs		=	complete+numpad(mac)
+  *		=	complete
+
+! layout	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
+
+! layout[1]	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
+
+! layout[2]	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
+
+! layout[3]	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
+
+! layout[4]	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
+
+! option	=	symbols
+  grp:shift_toggle	=	+group(shifts_toggle)
+  altwin:menu		=	+altwin(menu)
+  altwin:meta_alt	=	+altwin(meta_alt)
+  altwin:ctrl_win	=	+altwin(ctrl_win)
+  altwin:meta_win	=	+altwin(meta_win)
+  altwin:left_meta_win	=	+altwin(left_meta_win)
+  altwin:super_win	=	+altwin(super_win)
+  altwin:hyper_win	=	+altwin(hyper_win)
+  altwin:alt_super_win	=	+altwin(alt_super_win)
+  altwin:swap_lalt_lwin	=	+altwin(swap_lalt_lwin)
+  grp:switch		=	+group(switch)
+  grp:lswitch		=	+group(lswitch)
+  grp:win_switch	=	+group(win_switch)
+  grp:lwin_switch	=	+group(lwin_switch)
+  grp:rwin_switch	=	+group(rwin_switch)
+  grp:toggle		=	+group(toggle)
+  grp:shifts_toggle	=	+group(shifts_toggle)
+  grp:ctrls_toggle	=	+group(ctrls_toggle)
+  grp:alts_toggle	=	+group(alts_toggle)
+  grp:ctrl_shift_toggle	=	+group(ctrl_shift_toggle)
+  grp:lctrl_lshift_toggle	=	+group(lctrl_lshift_toggle)
+  grp:caps_toggle	=	+capslock(grouplock)
+  grp:caps_switch       =       +capslock(groupshift)
+  grp:shift_caps_toggle	=	+group(shift_caps_toggle)
+  grp:shift_caps_switch	=	+group(shift_caps_switch)
+  grp:alt_caps_toggle   =       +group(alt_caps_toggle)
+  grp:ctrl_alt_toggle	=	+group(ctrl_alt_toggle)
+  grp:alt_shift_toggle	=	+group(alt_shift_toggle)
+  grp:menu_toggle	=	+group(menu_toggle)
+  grp:lwin_toggle	=	+group(lwin_toggle)
+  grp:rwin_toggle	=	+group(rwin_toggle)
+  grp:lshift_toggle	=	+group(lshift_toggle)
+  grp:rshift_toggle	=	+group(rshift_toggle)
+  grp:rctrl_switch	=	+group(rctrl_switch)
+  grp:lctrl_toggle	=	+group(lctrl_toggle)
+  grp:rctrl_toggle	=	+group(rctrl_toggle)
+  grp:lalt_toggle	=	+group(lalt_toggle)
+  lv3:switch		=	+level3(switch)
+  lv3:ralt_switch	=	+level3(ralt_switch)
+  lv3:ralt_switch_multikey	=	+level3(ralt_switch_multikey)
+  lv3:ralt_alt		=	+level3(ralt_alt)
+  lv3:lalt_switch	=	+level3(lalt_switch)
+  lv3:alt_switch	=	+level3(alt_switch)
+  lv3:menu_switch	=	+level3(menu_switch)
+  lv3:win_switch	=	+level3(win_switch)
+  lv3:lwin_switch	=	+level3(lwin_switch)
+  lv3:rwin_switch	=	+level3(rwin_switch)
+  caps:capslock		=	+capslock(capslock)
+  caps:shiftlock	=	+capslock(shiftlock)
+  caps:swapescape	=	+capslock(swapescape)
+  ctrl:nocaps		=	+ctrl(nocaps)
+  ctrl:swapcaps		=	+ctrl(swapcaps)
+  ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
+  ctrl:ctrl_aa		=	+ctrl(ctrl_aa)
+  ctrl:ctrl_ra		=	+ctrl(ctrl_ra)
+  compose:ralt		=	+compose(ralt)
+  compose:lwin		=	+compose(lwin)
+  compose:rwin		=	+compose(rwin)
+  compose:menu		=	+compose(menu)
+  compose:rctrl		=	+compose(rctrl)
+  compose:caps		=	+compose(caps)
+  compose:102		=	+compose(102)
+  srvrkeys:none		=	+srvr_ctrl(no_srvr_keys)
+  eurosign:e		=	+eurosign(e)
+  eurosign:2		=	+eurosign(2)
+  eurosign:4		=	+eurosign(4)
+  eurosign:5		=	+eurosign(5)
+  keypad:oss            =       +keypad(oss)
+  keypad:legacy         =	+keypad(legacy)
+  keypad:legacy_wang    =	+keypad(legacy_wang)
+  keypad:oss_wang       =	+keypad(oss_wang)
+  keypad:future         =	+keypad(future)
+  keypad:future_wang    =	+keypad(future_wang)
+  keypad:phone_hex      =	+keypad(phone_hex)
+  nbsp:none             =	+nbsp(none)
+  nbsp:level2           =	+nbsp(level2)
+  nbsp:level3           =	+nbsp(level3)
+  nbsp:level3s          =	+nbsp(level3s)
+  nbsp:level3n          =	+nbsp(level3n)
+  nbsp:level4           =	+nbsp(level4)
+  nbsp:level4n          =	+nbsp(level4n)
+  nbsp:level4nl         =	+nbsp(level4nl)
+  japan:nicola_f_bs     =	+jp(nicola_f_bs)
+  kpdl:dot              =	+kpdl(dot)
+  kpdl:comma            =	+kpdl(comma)
+  kpdl:dotoss           =	+kpdl(dotoss)
+  kpdl:dotoss_latin9    =	+kpdl(dotoss_latin9)
+  kpdl:commaoss         =	+kpdl(commaoss)
+  kpdl:momayyezoss      =	+kpdl(momayyezoss)
+  kpdl:kposs            =	+kpdl(kposs)
+  shift:breaks_caps     =	+shift(breaks_caps)
+
+
+! option	=	compat
+  grp_led:num		=	+lednum(group_lock)
+  grp_led:caps		=	+ledcaps(group_lock)
+  grp_led:scroll	=	+ledscroll(group_lock)
+  grp:caps_toggle	=	+ledcaps(group_lock)
+  japan:kana_lock	=	+japan(kana_lock)
+
+
+! option	=	types
+  caps:internal			=	+caps(internal)
+  caps:internal_nocancel	=	+caps(internal_nocancel)
+  caps:shift			=	+caps(shift)
+  caps:shift_nocancel		=	+caps(shift_nocancel)
+  numpad:pc			=	+numpad(pc)
+  numpad:mac			=	+numpad(mac)
+  numpad:microsoft		=	+numpad(microsoft)
diff --git a/xorg-server/xkbdata.src/rules/base.hdr.part b/xorg-server/xkbdata.src/rules/base.hdr.part
new file mode 100644
index 000000000..d867c8876
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.hdr.part
@@ -0,0 +1,9 @@
+// $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 $
+//
diff --git a/xorg-server/xkbdata.src/rules/base.l1_k.part b/xorg-server/xkbdata.src/rules/base.l1_k.part
new file mode 100644
index 000000000..91b775396
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.l1_k.part
@@ -0,0 +1,3 @@
+  $azerty       =       +aliases(azerty)
+  $qwertz       =       +aliases(qwertz)
+  *             =       +aliases(qwerty)
diff --git a/xorg-server/xkbdata.src/rules/base.l1o_s.part b/xorg-server/xkbdata.src/rules/base.l1o_s.part
new file mode 100644
index 000000000..5544d5386
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.l1o_s.part
@@ -0,0 +1 @@
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
diff --git a/xorg-server/xkbdata.src/rules/base.l2_s.part b/xorg-server/xkbdata.src/rules/base.l2_s.part
new file mode 100644
index 000000000..03a7aafe6
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.l2_s.part
@@ -0,0 +1 @@
+  *		=	+%l[2]%(v[2]):2
diff --git a/xorg-server/xkbdata.src/rules/base.l2o_s.part b/xorg-server/xkbdata.src/rules/base.l2o_s.part
new file mode 100644
index 000000000..3ffd6a8b0
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.l2o_s.part
@@ -0,0 +1 @@
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
diff --git a/xorg-server/xkbdata.src/rules/base.l3_s.part b/xorg-server/xkbdata.src/rules/base.l3_s.part
new file mode 100644
index 000000000..0947c11f4
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.l3_s.part
@@ -0,0 +1 @@
+  *		=	+%l[3]%(v[3]):3
diff --git a/xorg-server/xkbdata.src/rules/base.l3o_s.part b/xorg-server/xkbdata.src/rules/base.l3o_s.part
new file mode 100644
index 000000000..aa327eb42
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.l3o_s.part
@@ -0,0 +1 @@
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
diff --git a/xorg-server/xkbdata.src/rules/base.l4_s.part b/xorg-server/xkbdata.src/rules/base.l4_s.part
new file mode 100644
index 000000000..23ccc22ec
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.l4_s.part
@@ -0,0 +1 @@
+  *		=	+%l[4]%(v[4]):4
diff --git a/xorg-server/xkbdata.src/rules/base.l4o_s.part b/xorg-server/xkbdata.src/rules/base.l4o_s.part
new file mode 100644
index 000000000..79682503e
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.l4o_s.part
@@ -0,0 +1 @@
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
diff --git a/xorg-server/xkbdata.src/rules/base.l_k.part b/xorg-server/xkbdata.src/rules/base.l_k.part
new file mode 100644
index 000000000..91b775396
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.l_k.part
@@ -0,0 +1,3 @@
+  $azerty       =       +aliases(azerty)
+  $qwertz       =       +aliases(qwertz)
+  *             =       +aliases(qwerty)
diff --git a/xorg-server/xkbdata.src/rules/base.lists.part b/xorg-server/xkbdata.src/rules/base.lists.part
new file mode 100644
index 000000000..b08ab24fe
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.lists.part
@@ -0,0 +1,88 @@
+
+// If you want non-latin layouts implicitly include the en_US layout
+// uncomment lines below
+//! $nonlatin = am ara ben bd bg bt by cs deva ge gh gr guj guru il \
+//              in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \
+//              ru scc sy syr tel th tj tam ua uz
+
+// PC models
+! $pcmodels = pc101 pc102 pc104 pc105
+
+// Microsoft models (using MS geometry)
+! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose
+
+// PC geometries - they have special geometry but symbols are mostly pc105
+! $pcgeometries = abnt2 latitude jp106 kr106
+
+// Layouts that provide further specializations for the OLPC
+! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us 
+
+! $macbooks = macbook78 macbook79
+! $maclaptop = ibook powerbook macbook78 macbook79
+! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
+
+! $macvendorlayouts = ch de dk es fi fr gb is it latam nl no pt se us
+
+! $azerty = be fr
+! $qwertz = al cz de hr hu ro si sk 
+
+! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \
+              acer_c300 acer_ferrari4k acer_laptop \
+              acpi airkey \
+              apple armada asus_laptop azonaRF2300 \
+              benqx brother \
+              btc5113rf btc5126t btc6301urf btc9000 btc9000a btc9001ah btc5090 btc9019u \
+              cherryblue cherrybluea cherryblueb cherrycyboard \
+              chicony chicony0108 chicony9885 \
+              compaqeak8 compaqik7 compaqik13 compaqik18 \
+              cymotionlinux \
+              dell dellm65 inspiron precision_m dellusbmm dtk2000 \
+              emachines ennyah_dkb1008 evdev fscaa1667g \
+              genius geniuscomfy geniuscomfy2 geniuskb19e \
+              gyration honeywell_euroboard \
+              hp2501 hp2505 hp5xx hp500fa hp5181 hp5185 \
+              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
+              ibm_spacesaver ipaq inspiron intel latitude \
+              logiaccess logicda logicink \
+              logiex110 logiclx300 \
+              logiinkse logiinkseusb logiitc logiik \
+              logitech_base itouch logiultrax \
+              logitech_g15 \
+	      logidinovo logidinovoedge \
+              microsoft7000 microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
+              microsoftoffice microsoftmult \
+              mx1998 mx2500 mx2750 \
+              oretec \
+              presario propeller \
+              qtronix \
+              rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \
+              samsung4500 samsung4510 \
+              scorpius silvercrest \
+              sk1300 sk2500 sk6200 sk7100 sp_inet \
+              sven sven303 symplon \
+              toshiba_s3000 trust trustda \
+              yahoo
+
+// all layouts with 3rd and 4th groups
+! $threelevellayouts = al az \
+              be br bt \
+              ca ch cs cz \
+              de dk \
+              ee es \
+              fi fo fr \
+              gb gr \
+              hu \
+              ie ir is it \
+              kg \
+              latam \
+              lk lt \
+              mn mt \
+              nl no \
+              pl pt \
+              ro \
+              se sk \
+              tr \
+              us \
+              vn \
+              za
+
diff --git a/xorg-server/xkbdata.src/rules/base.lst b/xorg-server/xkbdata.src/rules/base.lst
new file mode 100644
index 000000000..17742b8e6
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.lst
@@ -0,0 +1,683 @@
+! model
+  pc101           Generic 101-key PC
+  pc102           Generic 102-key (Intl) PC
+  pc104           Generic 104-key PC
+  pc105           Generic 105-key (Intl) PC
+  dell101         Dell 101-key PC
+  latitude        Dell Latitude series laptop
+  dellm65         Dell Precision M65
+  everex          Everex STEPnote
+  flexpro         Keytronic FlexPro
+  microsoft       Microsoft Natural
+  omnikey101      Northgate OmniKey 101
+  winbook         Winbook Model XP5
+  jp106           Japanese 106-key
+  pc98            PC-98xx Series
+  a4techKB21      A4Tech KB-21
+  a4techKBS8      A4Tech KBS-8
+  a4_rfkb23       A4Tech Wireless Desktop RFKB-23
+  abnt2           Brazilian ABNT2
+  airkey          Acer AirKey V
+  acpi            ACPI Standard
+  azonaRF2300     Azona RF2300 wireless Internet Keyboard
+  scorpius        Advance Scorpius KI
+  brother         Brother Internet Keyboard
+  btc5113rf       BTC 5113RF Multimedia
+  btc5126t        BTC 5126T
+  btc6301urf      BTC 6301URF
+  btc9000         BTC 9000
+  btc9000a        BTC 9000A
+  btc9001ah       BTC 9001AH
+  btc5090         BTC 5090
+  btc9019u        BTC 9019U
+  cherryblue      Cherry Blue Line CyBo@rd
+  cherryblueb     Cherry CyMotion Master XPress
+  cherrybluea     Cherry Blue Line CyBo@rd (alternate option)
+  cherrycyboard   Cherry CyBo@rd USB-Hub
+  chicony         Chicony Internet Keyboard
+  chicony0108     Chicony KU-0108
+  chicony9885     Chicony KB-9885
+  compaqeak8      Compaq Easy Access Keyboard
+  compaqik7       Compaq Internet Keyboard (7 keys)
+  compaqik13      Compaq Internet Keyboard (13 keys)
+  compaqik18      Compaq Internet Keyboard (18 keys)
+  cymotionlinux   Cherry CyMotion Master Linux
+  armada          Laptop/notebook Compaq (eg. Armada) Laptop Keyboard
+  presario        Laptop/notebook Compaq (eg. Presario) Internet Keyboard
+  ipaq            Compaq iPaq Keyboard
+  dell            Dell
+  dellsk8125      Dell SK-8125
+  dellsk8135      Dell SK-8135
+  dellusbmm       Dell USB Multimedia Keyboard
+  inspiron        Dell Laptop/notebook Inspiron 6xxx/8xxx
+  precision_m     Dell Laptop/notebook Precision M series
+  dexxa           Dexxa Wireless Desktop Keyboard
+  diamond         Diamond 9801 / 9802 series
+  dtk2000         DTK2000
+  ennyah_dkb1008  Ennyah DKB-1008
+  fscaa1667g      Fujitsu-Siemens Computers AMILO A1667G laptop
+  genius          Genius Comfy KB-16M / Genius MM Keyboard KWD-910
+  geniuscomfy     Genius Comfy KB-12e
+  geniuscomfy2    Genius Comfy KB-21e-Scroll
+  geniuskb19e     Genius KB-19e NB
+  gyration        Gyration
+  logitech_base   Logitech Generic Keyboard
+  logitech_g15    Logitech G15 extra keys via G15daemon
+  hpi6            Hewlett-Packard Internet Keyboard
+  hp2501          Hewlett-Packard SK-2501 Multimedia Keyboard
+  hp2505          Hewlett-Packard SK-2505 Internet Keyboard
+  hpxe3gc         Hewlett-Packard Omnibook XE3 GC
+  hpxe3gf         Hewlett-Packard Omnibook XE3 GF
+  hpxt1000        Hewlett-Packard Omnibook XT1000
+  hpzt11xx        Hewlett-Packard Pavilion ZT11xx
+  hp500fa         Hewlett-Packard Omnibook 500 FA
+  hp5xx           Hewlett-Packard Omnibook 5xx
+  hp5181          Hewlett-Packard Internet Keyboard 5181
+  hp5185          Hewlett-Packard Internet Keyboard 5185
+  hpnx9020        Hewlett-Packard nx9020
+  hp6000          Hewlett-Packard Omnibook 6000/6100
+  honeywell_euroboard Honeywell Euroboard
+  rapidaccess     IBM Rapid Access
+  rapidaccess2    IBM Rapid Access II
+  rapidaccess2a   IBM Rapid Access II (alternate option)
+  thinkpad        IBM ThinkPad 560Z/600/600E/A22E
+  thinkpadintl    IBM ThinkPad 560Z/600/600E/A22E, Intl
+  thinkpad60      IBM ThinkPad R60/T60/R61/T61
+  thinkpadz60     IBM ThinkPad Z60m/Z60t/Z61m/Z61t
+  ibm_spacesaver  IBM Space Saver
+  logiaccess      Logitech Access Keyboard
+  logiclx300      Logitech Cordless Desktop LX-300
+  logii350        Logitech Internet 350 Keyboard
+  logimel         Logitech Media Elite Keyboard
+  logicd          Logitech Cordless Desktop
+  logicd_it       Logitech Cordless Desktop iTouch
+  logicd_nav      Logitech Cordless Desktop Navigator
+  logicd_opt      Logitech Cordless Desktop Optical
+  logicda         Logitech Cordless Desktop (alternate option)
+  logicdpa2       Logitech Cordless Desktop Pro (alternate option2)
+  logicfn         Logitech Cordless Freedom/Desktop Navigator
+  logicdn         Logitech Cordless Desktop Navigator
+  logiitc         Logitech iTouch Cordless Keyboard (model Y-RB6)
+  logiik          Logitech Internet Keyboard
+  itouch          Logitech iTouch
+  logicink        Logitech Internet Navigator Keyboard
+  logiex110       Logitech Cordless Desktop EX110
+  logiinkse       Logitech iTouch Internet Navigator Keyboard SE
+  logiinkseusb    Logitech iTouch Internet Navigator Keyboard SE (USB)
+  logiultrax      Logitech Ultra-X Keyboard
+  logiultraxc     Logitech Ultra-X Cordless Media Desktop Keyboard
+  logidinovo      Logitech diNovo Keyboard
+  logidinovoedge  Logitech diNovo Edge Keyboard
+  mx1998          Memorex MX1998
+  mx2500          Memorex MX2500 EZ-Access Keyboard
+  mx2750          Memorex MX2750
+  microsoft7000   Microsoft Natural Wireless Ergonomic Keyboard 7000
+  microsoftinet   Microsoft Internet Keyboard
+  microsoftpro    Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
+  microsoftprousb Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro
+  microsoftprooem Microsoft Natural Keyboard Pro OEM
+  vsonku306       ViewSonic KU-306 Internet Keyboard
+  microsoftprose  Microsoft Internet Keyboard Pro, Swedish
+  microsoftoffice Microsoft Office Keyboard
+  microsoftmult   Microsoft Wireless Multimedia Keyboard 1.0A
+  microsoftelite  Microsoft Natural Keyboard Elite
+  oretec          Ortek MCK-800 MM/Internet keyboard
+  propeller       Propeller Voyager (KTEZ-1000)
+  qtronix         QTronix Scorpius 98N+
+  samsung4500     Samsung SDM 4500P
+  samsung4510     Samsung SDM 4510P
+  sk1300          SK-1300
+  sk2500          SK-2500
+  sk6200          SK-6200
+  sk7100          SK-7100
+  sp_inet         Super Power Multimedia Keyboard
+  sven            SVEN Ergonomic 2500
+  sven303         SVEN Slim 303
+  symplon         Symplon PaceBook (tablet PC)
+  toshiba_s3000   Toshiba Satellite S3000
+  trust           Trust Wireless Keyboard Classic
+  trustda         Trust Direct Access Keyboard
+  yahoo           Yahoo! Internet Keyboard
+  macbook78       MacBook/MacBook Pro
+  macbook79       MacBook/MacBook Pro (Intl)
+  macintosh       Macintosh
+  macintosh_old   Macintosh Old
+  macintosh_hhk   Happy Hacking Keyboard for Mac
+  acer_c300       Acer C300
+  acer_ferrari4k  Acer Ferrari 4000
+  acer_laptop     Acer Laptop
+  asus_laptop     Asus Laptop
+  apple           Apple
+  apple_laptop    Apple Laptop
+  silvercrest     SILVERCREST Multimedia Wireless Keyboard
+  emachines       Laptop/notebook eMachines m68xx
+  kr106           Korean 106-key
+  evdev           Evdev-managed keyboard
+  benqx           BenQ X-Touch
+  benqx730        BenQ X-Touch 730
+  benqx800        BenQ X-Touch 800
+  hhk             Happy Hacking Keyboard
+  classmate       Classmate PC
+  olpc            OLPC
+  sun6            Sun Type 5/6
+
+! layout
+  us              USA
+  ad              Andorra
+  af              Afghanistan
+  ara             Arabic
+  al              Albania
+  am              Armenia
+  az              Azerbaijan
+  by              Belarus
+  be              Belgium
+  bd              Bangladesh
+  in              India
+  ba              Bosnia and Herzegovina
+  br              Brazil
+  bg              Bulgaria
+  ma              Morocco
+  mm              Myanmar
+  ca              Canada
+  cd              Congo, Democratic Republic of the
+  cn              China
+  hr              Croatia
+  cz              Czechia
+  dk              Denmark
+  nl              Netherlands
+  bt              Bhutan
+  ee              Estonia
+  ir              Iran
+  iq              Iraq
+  fo              Faroe Islands
+  fi              Finland
+  fr              France
+  gh              Ghana
+  gn              Guinea
+  ge              Georgia
+  de              Germany
+  gr              Greece
+  hu              Hungary
+  is              Iceland
+  il              Israel
+  it              Italy
+  jp              Japan
+  kg              Kyrgyzstan
+  kh              Cambodia
+  kz              Kazakhstan
+  la              Laos
+  latam           Latin American
+  lt              Lithuania
+  lv              Latvia
+  mao             Maori
+  me              Montenegro
+  mk              Macedonia
+  mt              Malta
+  mn              Mongolia
+  no              Norway
+  pl              Poland
+  pt              Portugal
+  ro              Romania
+  ru              Russia
+  rs              Serbia
+  si              Slovenia
+  sk              Slovakia
+  es              Spain
+  se              Sweden
+  ch              Switzerland
+  sy              Syria
+  tj              Tajikistan
+  lk              Sri Lanka
+  th              Thailand
+  tr              Turkey
+  ua              Ukraine
+  gb              United Kingdom
+  uz              Uzbekistan
+  vn              Vietnam
+  kr              Korea, Republic of
+  nec_vndr/jp     Japan (PC-98xx Series)
+  ie              Ireland
+  pk              Pakistan
+  mv              Maldives
+  za              South Africa
+  epo             Esperanto
+  np              Nepal
+  ng              Nigeria
+  et              Ethiopia
+  braille         Braille
+
+! variant
+  chr             us: Cherokee
+  euro            us: With EuroSign on 5
+  intl            us: International (with dead keys)
+  alt-intl        us: Alternative international (former us_intl)
+  colemak         us: Colemak
+  dvorak          us: Dvorak
+  dvorak-intl     us: Dvorak international
+  dvorak-l        us: Left handed Dvorak
+  dvorak-r        us: Right handed Dvorak
+  dvorak-classic  us: Classic Dvorak
+  dvp             us: Programmer Dvorak
+  rus             us: Russian phonetic
+  mac             us: Macintosh
+  altgr-intl      us: International (AltGr dead keys)
+  olpc2           us: Group toggle on multiply/divide key
+  ps              af: Pashto
+  uz              af: Southern Uzbek
+  olpc-ps         af: OLPC Pashto
+  olpc-fa         af: OLPC Dari
+  olpc-uz         af: OLPC Southern Uzbek
+  azerty          ara: azerty
+  azerty_digits   ara: azerty/digits
+  digits          ara: digits
+  qwerty          ara: qwerty
+  qwerty_digits   ara: qwerty/digits
+  buckwalter      ara: Buckwalter
+  phonetic        am: Phonetic
+  phonetic-alt    am: Alternative Phonetic
+  eastern         am: Eastern
+  western         am: Western
+  eastern-alt     am: Alternative Eastern
+  cyrillic        az: Cyrillic
+  winkeys         by: Winkeys
+  latin           by: Latin
+  iso-alternate   be: ISO Alternate
+  nodeadkeys      be: Eliminate dead keys
+  sundeadkeys     be: Sun dead keys
+  wang            be: Wang model 724 azerty
+  probhat         bd: Probhat
+  ben             in: Bengali
+  ben_probhat     in: Bengali Probhat
+  guj             in: Gujarati
+  guru            in: Gurmukhi
+  jhelum          in: Gurmukhi Jhelum
+  kan             in: Kannada
+  mal             in: Malayalam
+  mal_lalitha     in: Malayalam Lalitha
+  ori             in: Oriya
+  tam_unicode     in: Tamil Unicode
+  tam_TAB         in: Tamil TAB Typewriter
+  tam_TSCII       in: Tamil TSCII Typewriter
+  tam             in: Tamil
+  tel             in: Telugu
+  urd             in: Urdu
+  bolnagri        in: Hindi Bolnagri
+  alternatequotes ba: Use guillemets for quotes
+  unicode         ba: Use Bosnian digraphs
+  unicodeus       ba: US keyboard with Bosnian digraphs
+  us              ba: US keyboard with Bosnian letters
+  nodeadkeys      br: Eliminate dead keys
+  dvorak          br: Dvorak
+  nativo          br: Nativo
+  nativo-us       br: Nativo for USA keyboards
+  nativo-epo      br: Nativo for Esperanto
+  phonetic        bg: Phonetic
+  french          ma: French
+  tifinagh        ma: Tifinagh
+  tifinagh-alt    ma: Tifinagh Alternative
+  tifinagh-alt-phonetic ma: Tifinagh Alternative Phonetic
+  tifinagh-extended ma: Tifinagh Extended
+  tifinagh-phonetic ma: Tifinagh Phonetic
+  tifinagh-extended-phonetic ma: Tifinagh Extended Phonetic
+  fr-dvorak       ca: French Dvorak
+  fr-legacy       ca: French (legacy)
+  multix          ca: Multilingual
+  multi           ca: Multilingual, first part
+  multi-2gr       ca: Multilingual, second part
+  ike             ca: Inuktitut
+  shs             ca: Secwepemctsin
+  kut             ca: Ktunaxa
+  tib             cn: Tibetan
+  tib_asciinum    cn: Tibetan (with ASCII numerals)
+  alternatequotes hr: Use guillemets for quotes
+  unicode         hr: Use Croatian digraphs
+  unicodeus       hr: US keyboard with Croatian digraphs
+  us              hr: US keyboard with Croatian letters
+  bksl            cz: With &lt;\|&gt; key
+  qwerty          cz: qwerty
+  qwerty_bksl     cz: qwerty, extended Backslash
+  ucw             cz: UCW layout (accented letters only)
+  nodeadkeys      dk: Eliminate dead keys
+  mac             dk: Macintosh
+  mac_nodeadkeys  dk: Macintosh, eliminate dead keys
+  dvorak          dk: Dvorak
+  sundeadkeys     nl: Sun dead keys
+  mac             nl: Macintosh
+  std             nl: Standard
+  nodeadkeys      ee: Eliminate dead keys
+  dvorak          ee: Dvorak
+  us              ee: US keyboard with Estonian letters
+  pro             ir: Pro
+  keypad          ir: Keypad
+  pro_keypad      ir: Pro Keypad
+  ku              ir: Kurdish, Latin Q
+  ku_f            ir: Kurdish, (F)
+  ku_alt          ir: Kurdish, Latin Alt-Q
+  ku_ara          ir: Kurdish, Arabic-Latin
+  ku              iq: Kurdish, Latin Q
+  ku_f            iq: Kurdish, (F)
+  ku_alt          iq: Kurdish, Latin Alt-Q
+  ku_ara          iq: Kurdish, Arabic-Latin
+  nodeadkeys      fo: Eliminate dead keys
+  nodeadkeys      fi: Eliminate dead keys
+  smi             fi: Northern Saami
+  classic         fi: Classic
+  mac             fi: Macintosh
+  nodeadkeys      fr: Eliminate dead keys
+  sundeadkeys     fr: Sun dead keys
+  oss             fr: Alternative
+  oss_latin9      fr: Alternative, latin-9 only
+  oss_nodeadkeys  fr: Alternative, eliminate dead keys
+  oss_sundeadkeys fr: Alternative, Sun dead keys
+  latin9          fr: (Legacy) Alternative
+  latin9_nodeadkeys fr: (Legacy) Alternative, eliminate dead keys
+  latin9_sundeadkeys fr: (Legacy) Alternative, Sun dead keys
+  bepo            fr: Bepo, ergonomic, Dvorak way
+  bepo_latin9     fr: Bepo, ergonomic, Dvorak way, latin-9 only
+  dvorak          fr: Dvorak
+  mac             fr: Macintosh
+  geo             fr: Georgian AZERTY Tskapo
+  generic         gh: Multilingual
+  akan            gh: Akan
+  ewe             gh: Ewe
+  fula            gh: Fula
+  ga              gh: Ga
+  hausa           gh: Hausa
+  ergonomic       ge: Ergonomic
+  mess            ge: MESS
+  ru              ge: Russian
+  os              ge: Ossetian
+  deadacute       de: Dead acute
+  deadgraveacute  de: Dead grave acute
+  nodeadkeys      de: Eliminate dead keys
+  ro              de: Romanian keyboard with German letters
+  ro_nodeadkeys   de: Romanian keyboard with German letters, eliminate dead keys
+  dvorak          de: Dvorak
+  sundeadkeys     de: Sun dead keys
+  neo             de: Neostyle
+  mac             de: Macintosh
+  mac_nodeadkeys  de: Macintosh, eliminate dead keys
+  simple          gr: Simple
+  extended        gr: Extended
+  nodeadkeys      gr: Eliminate dead keys
+  polytonic       gr: Polytonic
+  standard        hu: Standard
+  nodeadkeys      hu: Eliminate dead keys
+  qwerty          hu: qwerty
+  101_qwertz_comma_dead hu: 101/qwertz/comma/Dead keys
+  101_qwertz_comma_nodead hu: 101/qwertz/comma/Eliminate dead keys
+  101_qwertz_dot_dead hu: 101/qwertz/dot/Dead keys
+  101_qwertz_dot_nodead hu: 101/qwertz/dot/Eliminate dead keys
+  101_qwerty_comma_dead hu: 101/qwerty/comma/Dead keys
+  101_qwerty_comma_nodead hu: 101/qwerty/comma/Eliminate dead keys
+  101_qwerty_dot_dead hu: 101/qwerty/dot/Dead keys
+  101_qwerty_dot_nodead hu: 101/qwerty/dot/Eliminate dead keys
+  102_qwertz_comma_dead hu: 102/qwertz/comma/Dead keys
+  102_qwertz_comma_nodead hu: 102/qwertz/comma/Eliminate dead keys
+  102_qwertz_dot_dead hu: 102/qwertz/dot/Dead keys
+  102_qwertz_dot_nodead hu: 102/qwertz/dot/Eliminate dead keys
+  102_qwerty_comma_dead hu: 102/qwerty/comma/Dead keys
+  102_qwerty_comma_nodead hu: 102/qwerty/comma/Eliminate dead keys
+  102_qwerty_dot_dead hu: 102/qwerty/dot/Dead keys
+  102_qwerty_dot_nodead hu: 102/qwerty/dot/Eliminate dead keys
+  Sundeadkeys     is: Sun dead keys
+  nodeadkeys      is: Eliminate dead keys
+  mac             is: Macintosh
+  dvorak          is: Dvorak
+  lyx             il: lyx
+  phonetic        il: Phonetic
+  biblical        il: Biblical Hebrew (Tiro)
+  nodeadkeys      it: Eliminate dead keys
+  mac             it: Macintosh
+  geo             it: Georgian
+  kana            jp: Kana
+  OADG109A        jp: OADG 109A
+  ruskaz          kz: Russian with Kazakh
+  kazrus          kz: Kazakh with Russian
+  nodeadkeys      latam: Eliminate dead keys
+  sundeadkeys     latam: Sun dead keys
+  std             lt: Standard
+  us              lt: US keyboard with Lithuanian letters
+  ibm             lt: IBM (LST 1205-92)
+  lekp            lt: LEKP
+  lekpa           lt: LEKPa
+  balticplus      lt: Baltic+
+  apostrophe      lv: Apostrophe (') variant
+  tilde           lv: Tilde (~) variant
+  fkey            lv: F-letter (F) variant
+  cyrillic        me: Cyrillic
+  cyrillicyz      me: Cyrillic, Z and ZHE swapped
+  latinunicode    me: Latin unicode
+  latinyz         me: Latin qwerty
+  latinunicodeyz  me: Latin unicode qwerty
+  cyrillicalternatequotes me: Cyrillic with guillemets
+  latinalternatequotes me: Latin with guillemets
+  nodeadkeys      mk: Eliminate dead keys
+  us              mt: Maltese keyboard with US layout
+  nodeadkeys      no: Eliminate dead keys
+  dvorak          no: Dvorak
+  smi             no: Northern Saami
+  smi_nodeadkeys  no: Northern Saami, eliminate dead keys
+  mac             no: Macintosh
+  mac_nodeadkeys  no: Macintosh, eliminate dead keys
+  qwertz          pl: qwertz
+  dvorak          pl: Dvorak
+  dvorak_quotes   pl: Dvorak, Polish quotes on quotemark key
+  dvorak_altquotes pl: Dvorak, Polish quotes on key "1/!"
+  csb             pl: Kashubian
+  ru_phonetic_dvorak pl: Russian phonetic Dvorak
+  nodeadkeys      pt: Eliminate dead keys
+  sundeadkeys     pt: Sun dead keys
+  mac             pt: Macintosh
+  mac_nodeadkeys  pt: Macintosh, eliminate dead keys
+  mac_sundeadkeys pt: Macintosh, Sun dead keys
+  nativo          pt: Nativo
+  nativo-us       pt: Nativo for USA keyboards
+  nativo-epo      pt: Nativo for Esperanto
+  cedilla         ro: Cedilla
+  std             ro: Standard
+  std_cedilla     ro: Standard (Cedilla)
+  winkeys         ro: Winkeys
+  phonetic        ru: Phonetic
+  typewriter      ru: Typewriter
+  legacy          ru: Legacy
+  tt              ru: Tatar
+  os_legacy       ru: Ossetian, legacy
+  os_winkeys      ru: Ossetian, Winkeys
+  cv              ru: Chuvash
+  cv_latin        ru: Chuvash Latin
+  udm             ru: Udmurt
+  kom             ru: Komi
+  sah             ru: Yakut
+  yz              rs: Z and ZHE swapped
+  latin           rs: Latin
+  latinunicode    rs: Latin Unicode
+  latinyz         rs: Latin qwerty
+  latinunicodeyz  rs: Latin Unicode qwerty
+  alternatequotes rs: With guillemets
+  latinalternatequotes rs: Latin with guillemets
+  alternatequotes si: Use guillemets for quotes
+  unicode         si: Use Slovenian digraphs
+  unicodeus       si: US keyboard with Slovenian digraphs
+  us              si: US keyboard with Slovenian letters
+  bksl            sk: Extended Backslash
+  qwerty          sk: qwerty
+  qwerty_bksl     sk: qwerty, extended Backslash
+  nodeadkeys      es: Eliminate dead keys
+  sundeadkeys     es: Sun dead keys
+  dvorak          es: Dvorak
+  ast             es: Asturian variant with bottom-dot H and bottom-dot L
+  cat             es: Catalan variant with middle-dot L
+  mac             es: Macintosh
+  nodeadkeys      se: Eliminate dead keys
+  dvorak          se: Dvorak
+  rus             se: Russian phonetic
+  rus_nodeadkeys  se: Russian phonetic, eliminate dead keys
+  smi             se: Northern Saami
+  mac             se: Macintosh
+  svdvorak        se: Svdvorak
+  de_nodeadkeys   ch: German, eliminate dead keys
+  de_sundeadkeys  ch: German, Sun dead keys
+  fr              ch: French
+  fr_nodeadkeys   ch: French, eliminate dead keys
+  fr_sundeadkeys  ch: French, Sun dead keys
+  fr_mac          ch: French (Macintosh)
+  de_mac          ch: German (Macintosh)
+  syc             sy: Syriac
+  syc_phonetic    sy: Syriac phonetic
+  ku              sy: Kurdish, Latin Q
+  ku_f            sy: Kurdish, (F)
+  ku_alt          sy: Kurdish, Latin Alt-Q
+  tam_unicode     lk: Tamil Unicode
+  tam_TAB         lk: Tamil TAB Typewriter
+  tis             th: TIS-820.2538
+  pat             th: Pattachote
+  f               tr: (F)
+  alt             tr: Alt-Q
+  sundeadkeys     tr: Sun dead keys
+  ku              tr: Kurdish, Latin Q
+  ku_f            tr: Kurdish, (F)
+  ku_alt          tr: Kurdish, Latin Alt-Q
+  intl            tr: International (with dead keys)
+  phonetic        ua: Phonetic
+  typewriter      ua: Typewriter
+  winkeys         ua: Winkeys
+  unicode         ua: Unicode
+  rstu            ua: Standard RSTU
+  rstu_ru         ua: Standard RSTU on Russian layout
+  homophonic      ua: Homophonic
+  intl            gb: International (with dead keys)
+  dvorak          gb: Dvorak
+  dvorakukp       gb: Dvorak (UK Punctuation)
+  mac             gb: Macintosh
+  colemak         gb: Colemak
+  latin           uz: Latin
+  kr104           kr: 101/104 key Compatible
+  CloGaelach      ie: CloGaelach
+  UnicodeExpert   ie: UnicodeExpert
+  ogam            ie: Ogham
+  ogam_is434      ie: Ogham IS434
+  ara             pk: Arabic
+  legacy          epo: displaced semicolon and quote (obsolete)
+  igbo            ng: Igbo
+  yoruba          ng: Yoruba
+  hausa           ng: Hausa
+  left_hand       braille: Left hand
+  right_hand      braille: Right hand
+
+! option
+  grp                  Layout switching
+  grp:switch           R-Alt switches layout while pressed.
+  grp:lswitch          Left Alt key switches layout while pressed.
+  grp:lwin_switch      Left Win-key switches layout while pressed.
+  grp:rwin_switch      Right Win-key switches layout while pressed.
+  grp:win_switch       Both Win-keys switch layout while pressed.
+  grp:caps_switch      CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.
+  grp:rctrl_switch     Right Ctrl key switches layout while pressed.
+  grp:toggle           Right Alt key changes layout.
+  grp:lalt_toggle      Left Alt key changes layout.
+  grp:caps_toggle      CapsLock key changes layout.
+  grp:shift_caps_toggle Shift+CapsLock changes layout.
+  grp:shift_caps_switch CapsLock switch to first layout, Shift+CapsLock switch to last layout.
+  grp:alt_caps_toggle  Alt+CapsLock changes layout.
+  grp:shifts_toggle    Both Shift keys together change layout.
+  grp:alts_toggle      Both Alt keys together change layout.
+  grp:ctrls_toggle     Both Ctrl keys together change layout.
+  grp:ctrl_shift_toggle Ctrl+Shift change layout.
+  grp:lctrl_lshift_toggle LCtrl+LShift change layout.
+  grp:ctrl_alt_toggle  Alt+Ctrl change layout.
+  grp:alt_shift_toggle Alt+Shift change layout.
+  grp:menu_toggle      Menu key changes layout.
+  grp:lwin_toggle      Left Win-key changes layout.
+  grp:rwin_toggle      Right Win-key changes layout.
+  grp:lshift_toggle    Left Shift key changes layout.
+  grp:rshift_toggle    Right Shift key changes layout.
+  grp:lctrl_toggle     Left Ctrl key changes layout.
+  grp:rctrl_toggle     Right Ctrl key changes layout.
+  lv3                  Third level choosers
+  lv3:switch           Press Right Ctrl to choose 3rd level.
+  lv3:menu_switch      Press Menu key to choose 3rd level.
+  lv3:win_switch       Press any of Win-keys to choose 3rd level.
+  lv3:lwin_switch      Press Left Win-key to choose 3rd level.
+  lv3:rwin_switch      Press Right Win-key to choose 3rd level.
+  lv3:alt_switch       Press any of Alt keys to choose 3rd level.
+  lv3:lalt_switch      Press Left Alt key to choose 3rd level.
+  lv3:ralt_switch      Press Right Alt key to choose 3rd level.
+  lv3:ralt_switch_multikey Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.
+  lv3:ralt_alt         Right Alt key never chooses 3rd level.
+  ctrl                 Ctrl key position
+  ctrl:nocaps          Make CapsLock an additional Ctrl.
+  ctrl:swapcaps        Swap Ctrl and CapsLock.
+  ctrl:ctrl_ac         Ctrl key at left of 'A'
+  ctrl:ctrl_aa         Ctrl key at bottom left
+  ctrl:ctrl_ra         Right Ctrl key works as Right Alt.
+  grp_led              Use keyboard LED to show alternative layout.
+  grp_led:num          NumLock LED shows alternative layout.
+  grp_led:caps         CapsLock LED shows alternative layout.
+  grp_led:scroll       ScrollLock LED shows alternative layout.
+  keypad               Numeric keypad layout selection
+  keypad:legacy        Legacy keypad
+  keypad:oss           Keypad with unicode additions (arrows and math operators)
+  keypad:future        Keypad with unicode additions (arrows and math operators). Math operators on default level.
+  keypad:legacy_wang   Legacy Wang 724 keypad
+  keypad:oss_wang      Wang 724 keypad with unicode additions (arrows and math operators)
+  keypad:future_wang   Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level.
+  keypad:phone_hex     ATM/phone-style hexadecimal keypad
+  kpdl                 Numeric keypad delete key behaviour
+  kpdl:dot             Legacy key with dot
+  kpdl:comma           Legacy key with comma
+  kpdl:dotoss          Four-level key with dot
+  kpdl:dotoss_latin9   Four-level key with dot, latin-9 restriction
+  kpdl:commaoss        Four-level key with comma
+  kpdl:momayyezoss     Four-level key with momayyez
+  kpdl:kposs           Four-level key with abstract separators
+  caps                 CapsLock key behavior
+  caps:internal        CapsLock uses internal capitalization. Shift "pauses" CapsLock.
+  caps:internal_nocancel CapsLock uses internal capitalization. Shift doesn't affect CapsLock.
+  caps:shift           CapsLock acts as Shift with locking. Shift "pauses" CapsLock.
+  caps:shift_nocancel  CapsLock acts as Shift with locking. Shift doesn't affect CapsLock.
+  caps:capslock        CapsLock toggles normal capitalization of alphabetic characters.
+  caps:swapescape      Swap ESC and CapsLock.
+  caps:shiftlock       CapsLock toggles Shift so all keys are affected.
+  altwin               Alt/Win key behavior
+  altwin:menu          Add the standard behavior to Menu key.
+  altwin:meta_alt      Alt and Meta are on the Alt keys.
+  altwin:ctrl_win      Control is mapped to the Win-keys (and the usual Ctrl keys).
+  altwin:meta_win      Meta is mapped to the Win-keys.
+  altwin:left_meta_win Meta is mapped to the left Win-key.
+  altwin:super_win     Super is mapped to the Win-keys.
+  altwin:hyper_win     Hyper is mapped to the Win-keys.
+  altwin:alt_super_win Alt is mapped to the right Win-key and Super to Menu.
+  altwin:swap_lalt_lwin Left Alt is swapped with left Win-key.
+  Compose key          Compose key position
+  compose:ralt         Right Alt is Compose.
+  compose:lwin         Left Win-key is Compose.
+  compose:rwin         Right Win-key is Compose.
+  compose:menu         Menu is Compose.
+  compose:rctrl        Right Ctrl is Compose.
+  compose:caps         Caps Lock is Compose.
+  compose:102          Less-than/Greater-than is Compose.
+  compat               Miscellaneous compatibility options
+  numpad:pc            Default numeric keypad keys.
+  numpad:mac           Numeric keypad keys work as with Mac.
+  numpad:microsoft     Shift with numeric keypad keys works as in MS Windows.
+  srvrkeys:none        Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.
+  apple:badmap         Swap keycodes of two keys when Mac keyboards are misdetected by kernel.
+  shift:breaks_caps    Shift cancels CapsLock.
+  eurosign             Adding the EuroSign to certain keys
+  eurosign:e           Add the EuroSign to the E key.
+  eurosign:2           Add the EuroSign to the 2 key.
+  eurosign:4           Add the EuroSign to the 4 key.
+  eurosign:5           Add the EuroSign to the 5 key.
+  nbsp                 Using space key to input non-breakable space character
+  nbsp:none            Space key outputs usual space at any level.
+  nbsp:level2          Space key outputs non-breakable space character at second level.
+  nbsp:level3          Space key outputs non-breakable space character at third level.
+  nbsp:level3s         Space key outputs non-breakable space character at third level, nothing at fourth level.
+  nbsp:level3n         Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level
+  nbsp:level4          Space key outputs non-breakable space character at fourth level.
+  nbsp:level4n         Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level
+  nbsp:level4nl        Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)
+  japan                Japanese keyboard options
+  japan:kana_lock      Kana Lock key is locking
+  japan:nicola_f_bs    NICOLA-F style Backspace
diff --git a/xorg-server/xkbdata.src/rules/base.m_g.part b/xorg-server/xkbdata.src/rules/base.m_g.part
new file mode 100644
index 000000000..7c0751d7b
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.m_g.part
@@ -0,0 +1,20 @@
+  microsoftelite	=	microsoft(elite)
+ $msmodels	=	microsoft(natural)
+  dell101	=	dell(dell101)
+  dellm65	=	dell(dellm65)
+  flexpro	=	keytronic(FlexPro)
+  hp6000	=	hp(omnibook)
+  omnikey101	=	northgate(omnikey101)
+ $pcmodels	=	pc(%m)
+ $pcgeometries	=	pc(%m)
+  everex	=	everex(STEPnote)
+  thinkpad	=	thinkpad(intl)
+  thinkpad60	=	thinkpad(60)
+  thinkpadz60	=	thinkpad(60)
+  winbook	=	winbook(XP5)
+  pc98		=	nec(pc98)
+ $macbooks      =       macintosh(%m)
+ $macs		=	macintosh(macintosh)
+  hhk		=	hhk(basic)
+  kinesis	=	kinesis(model100)
+  *		=       pc(pc104)
diff --git a/xorg-server/xkbdata.src/rules/base.m_k.part b/xorg-server/xkbdata.src/rules/base.m_k.part
new file mode 100644
index 000000000..a39d4c881
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.m_k.part
@@ -0,0 +1,16 @@
+  amiga		=	amiga(de)
+  ataritt	=	ataritt(de)
+  sun4		=	sun(type4_euro)
+  sun5		=	sun(type5_euro)
+  sun6		=	sun(type6_usb)
+  pc98		=	xfree98(pc98)
+  abnt2		=	xfree86(abnt2)
+  jp106		=	xfree86(jp106)
+  evdev		=	evdev
+  olpc		=	evdev
+  macintosh_hhk	=	macintosh(hhk)
+  macintosh_old	=	macintosh(old)
+ $macbooks	=	macintosh+macintosh(goodmap)
+ $macs   	=	macintosh
+  thinkpadz60	=	xfree86(thinkpadz60)
+  *		=	xfree86
diff --git a/xorg-server/xkbdata.src/rules/base.m_s.part b/xorg-server/xkbdata.src/rules/base.m_s.part
new file mode 100644
index 000000000..f066cc077
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.m_s.part
@@ -0,0 +1,29 @@
+  benqx730      =       +inet(benqx)
+  benqx800      =       +inet(benqx)
+  dellsk8125    =       +inet(dell)
+  dellsk8135    =       +inet(dell)
+  hpnx9020      =       +inet(hp5185)
+  logicd        =       +inet(logitech_base)
+  logicd_it     =       +inet(logitech_base)
+  logicd_nav    =       +inet(logitech_base)
+  logicd_opt    =       +inet(logitech_base)
+  logiultrax    =       +inet(logitech_base)
+  logiclx300    =       +inet(logiex110)
+  logii350      =       +inet(logiex110)
+  logimel       =       +inet(logiex110)
+  vsonku306     =       +inet(microsoftprooem)
+  $inetkbds     =       +inet(%m)
+  acer_tm_800   =       +inet(acer_laptop)
+  benqx730      =       +inet(benqx)
+  benqx800      =       +inet(benqx)
+  dell8125      =       +inet(dellusbmm)
+  dell8135      =       +inet(dellusbmm)
+  ltcd          =       +inet(logicda)
+  logicdit      =       +inet(logicd)
+  logicdo       =       +inet(logicd)
+  logicdp       =       +inet(logicd)
+  logicdpa      =       +inet(logicda)
+  logiciink     =       +inet(logicink)
+  $maclaptop    =       +inet(apple)+level3(enter_switch)
+  $macs	        =       +inet(apple)
+  thinkpadz60   =       +inet(thinkpad60)
diff --git a/xorg-server/xkbdata.src/rules/base.m_t.part b/xorg-server/xkbdata.src/rules/base.m_t.part
new file mode 100644
index 000000000..4548d2694
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.m_t.part
@@ -0,0 +1,2 @@
+  $macs		=	complete+numpad(mac)
+  *		=	complete
diff --git a/xorg-server/xkbdata.src/rules/base.ml1_c.part b/xorg-server/xkbdata.src/rules/base.ml1_c.part
new file mode 100644
index 000000000..f59e596d5
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.ml1_c.part
@@ -0,0 +1 @@
+  *		*		=	complete
diff --git a/xorg-server/xkbdata.src/rules/base.ml1_s.part b/xorg-server/xkbdata.src/rules/base.ml1_s.part
new file mode 100644
index 000000000..8e0eeef4f
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.ml1_s.part
@@ -0,0 +1,10 @@
+  ataritt	*			=	xfree68_vndr/ataritt(us)+%l[1]%(v[1])
+  amiga		*			=	xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
+  sun4		*			=	latin+sun_vndr/us(sun4)+%l[1]%(v[1])
+  sun5		*			=	latin+sun_vndr/us(sun5)+%l[1]%(v[1])
+  macintosh_old	us			=	macintosh_vndr/us(oldmac)
+  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
+  macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l[1]%(v[1])
+ $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l[1]%(v[1])
+  thinkpad	br			=	pc+%l[1](thinkpad)
+  *		*			=	pc+%l[1]%(v[1])
diff --git a/xorg-server/xkbdata.src/rules/base.ml_c.part b/xorg-server/xkbdata.src/rules/base.ml_c.part
new file mode 100644
index 000000000..ec8f02291
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.ml_c.part
@@ -0,0 +1,4 @@
+  pc98		nec_vndr/jp	=	pc98(basic)
+  *		jp		=	complete+japan
+  olpc         *               =       olpc
+  *		*		=	complete
diff --git a/xorg-server/xkbdata.src/rules/base.ml_g.part b/xorg-server/xkbdata.src/rules/base.ml_g.part
new file mode 100644
index 000000000..e66bb0b50
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.ml_g.part
@@ -0,0 +1 @@
+  thinkpad     us              =       thinkpad(us)
diff --git a/xorg-server/xkbdata.src/rules/base.ml_s.part b/xorg-server/xkbdata.src/rules/base.ml_s.part
new file mode 100644
index 000000000..570c5ef77
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.ml_s.part
@@ -0,0 +1,25 @@
+  ataritt	$nonlatin		=	xfree68_vndr/ataritt(us)+%l%(v):2
+  ataritt	*			=	xfree68_vndr/ataritt(us)+%l%(v)
+  amiga		$nonlatin		=	xfree68_vndr/amiga(usa1)+%l%(v):2
+  amiga		*			=	xfree68_vndr/amiga(usa1)+%l%(v)
+  classmate	us			=	pc+%l(classmate)
+  sun4		$nonlatin		=	latin+sun_vndr/us(sun4)+%l%(v):2
+  sun4		*			=	latin+sun_vndr/us(sun4)+%l%(v)
+  sun5		$nonlatin		=	latin+sun_vndr/us(sun5)+%l%(v):2
+  sun5		*			=	latin+sun_vndr/us(sun5)+%l%(v)
+  sun6		us			=	sun_vndr/us(type6)
+  sun6		en_US			=	sun_vndr/us(type6)+iso9995-3(basic)
+  sun6		*			=	sun_vndr/us(type6)+%l%(v)
+  pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
+  macintosh_old	us			=	macintosh_vndr/us(oldmac)
+  macintosh_old	en_US			=	macintosh_vndr/us(oldmac)
+  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v)
+  macintosh_old	$nonlatin		=	macintosh_vndr/us(oldmac)+%l%(v):2
+  macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
+ $macs		en_US			=	pc+macintosh_vndr/us(extended)
+ $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
+  olpc		$olpclayouts		=	olpc+%l%(m)
+  olpc		*			=	olpc+%l%(v)
+  thinkpad   	br			=	pc+br(thinkpad)
+  *	   	$nonlatin		=	pc+us+%l%(v):2
+  *		*			=	pc+%l%(v)
diff --git a/xorg-server/xkbdata.src/rules/base.mlv_s.part b/xorg-server/xkbdata.src/rules/base.mlv_s.part
new file mode 100644
index 000000000..df4eef24d
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.mlv_s.part
@@ -0,0 +1,3 @@
+  classmate	us		intl		=	pc+us(classmate-intl)
+  classmate	us		alt-intl	=	pc+us(classmate-alt-intl)
+  classmate	us		altgr-intl	=	pc+us(classmate-altgr-intl)
diff --git a/xorg-server/xkbdata.src/rules/base.o_c.part b/xorg-server/xkbdata.src/rules/base.o_c.part
new file mode 100644
index 000000000..9ce5410ed
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.o_c.part
@@ -0,0 +1,6 @@
+  grp_led:num		=	+lednum(group_lock)
+  grp_led:caps		=	+ledcaps(group_lock)
+  grp_led:scroll	=	+ledscroll(group_lock)
+  grp:caps_toggle	=	+ledcaps(group_lock)
+  japan:kana_lock	=	+japan(kana_lock)
+
diff --git a/xorg-server/xkbdata.src/rules/base.o_s.part b/xorg-server/xkbdata.src/rules/base.o_s.part
new file mode 100644
index 000000000..2e1e38cd2
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.o_s.part
@@ -0,0 +1,91 @@
+  altwin:menu		=	+altwin(menu)
+  altwin:meta_alt	=	+altwin(meta_alt)
+  altwin:ctrl_win	=	+altwin(ctrl_win)
+  altwin:meta_win	=	+altwin(meta_win)
+  altwin:left_meta_win	=	+altwin(left_meta_win)
+  altwin:super_win	=	+altwin(super_win)
+  altwin:hyper_win	=	+altwin(hyper_win)
+  altwin:alt_super_win	=	+altwin(alt_super_win)
+  altwin:swap_lalt_lwin	=	+altwin(swap_lalt_lwin)
+  grp:switch		=	+group(switch)
+  grp:lswitch		=	+group(lswitch)
+  grp:win_switch	=	+group(win_switch)
+  grp:lwin_switch	=	+group(lwin_switch)
+  grp:rwin_switch	=	+group(rwin_switch)
+  grp:toggle		=	+group(toggle)
+  grp:shifts_toggle	=	+group(shifts_toggle)
+  grp:ctrls_toggle	=	+group(ctrls_toggle)
+  grp:alts_toggle	=	+group(alts_toggle)
+  grp:ctrl_shift_toggle	=	+group(ctrl_shift_toggle)
+  grp:lctrl_lshift_toggle	=	+group(lctrl_lshift_toggle)
+  grp:caps_toggle	=	+capslock(grouplock)
+  grp:caps_switch       =       +capslock(groupshift)
+  grp:shift_caps_toggle	=	+group(shift_caps_toggle)
+  grp:shift_caps_switch	=	+group(shift_caps_switch)
+  grp:alt_caps_toggle   =       +group(alt_caps_toggle)
+  grp:ctrl_alt_toggle	=	+group(ctrl_alt_toggle)
+  grp:alt_shift_toggle	=	+group(alt_shift_toggle)
+  grp:menu_toggle	=	+group(menu_toggle)
+  grp:lwin_toggle	=	+group(lwin_toggle)
+  grp:rwin_toggle	=	+group(rwin_toggle)
+  grp:lshift_toggle	=	+group(lshift_toggle)
+  grp:rshift_toggle	=	+group(rshift_toggle)
+  grp:rctrl_switch	=	+group(rctrl_switch)
+  grp:lctrl_toggle	=	+group(lctrl_toggle)
+  grp:rctrl_toggle	=	+group(rctrl_toggle)
+  grp:lalt_toggle	=	+group(lalt_toggle)
+  lv3:switch		=	+level3(switch)
+  lv3:ralt_switch	=	+level3(ralt_switch)
+  lv3:ralt_switch_multikey	=	+level3(ralt_switch_multikey)
+  lv3:ralt_alt		=	+level3(ralt_alt)
+  lv3:lalt_switch	=	+level3(lalt_switch)
+  lv3:alt_switch	=	+level3(alt_switch)
+  lv3:menu_switch	=	+level3(menu_switch)
+  lv3:win_switch	=	+level3(win_switch)
+  lv3:lwin_switch	=	+level3(lwin_switch)
+  lv3:rwin_switch	=	+level3(rwin_switch)
+  caps:capslock		=	+capslock(capslock)
+  caps:shiftlock	=	+capslock(shiftlock)
+  caps:swapescape	=	+capslock(swapescape)
+  ctrl:nocaps		=	+ctrl(nocaps)
+  ctrl:swapcaps		=	+ctrl(swapcaps)
+  ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
+  ctrl:ctrl_aa		=	+ctrl(ctrl_aa)
+  ctrl:ctrl_ra		=	+ctrl(ctrl_ra)
+  compose:ralt		=	+compose(ralt)
+  compose:lwin		=	+compose(lwin)
+  compose:rwin		=	+compose(rwin)
+  compose:menu		=	+compose(menu)
+  compose:rctrl		=	+compose(rctrl)
+  compose:caps		=	+compose(caps)
+  compose:102		=	+compose(102)
+  srvrkeys:none		=	+srvr_ctrl(no_srvr_keys)
+  eurosign:e		=	+eurosign(e)
+  eurosign:2		=	+eurosign(2)
+  eurosign:4		=	+eurosign(4)
+  eurosign:5		=	+eurosign(5)
+  keypad:oss            =       +keypad(oss)
+  keypad:legacy         =	+keypad(legacy)
+  keypad:legacy_wang    =	+keypad(legacy_wang)
+  keypad:oss_wang       =	+keypad(oss_wang)
+  keypad:future         =	+keypad(future)
+  keypad:future_wang    =	+keypad(future_wang)
+  keypad:phone_hex      =	+keypad(phone_hex)
+  nbsp:none             =	+nbsp(none)
+  nbsp:level2           =	+nbsp(level2)
+  nbsp:level3           =	+nbsp(level3)
+  nbsp:level3s          =	+nbsp(level3s)
+  nbsp:level3n          =	+nbsp(level3n)
+  nbsp:level4           =	+nbsp(level4)
+  nbsp:level4n          =	+nbsp(level4n)
+  nbsp:level4nl         =	+nbsp(level4nl)
+  japan:nicola_f_bs     =	+jp(nicola_f_bs)
+  kpdl:dot              =	+kpdl(dot)
+  kpdl:comma            =	+kpdl(comma)
+  kpdl:dotoss           =	+kpdl(dotoss)
+  kpdl:dotoss_latin9    =	+kpdl(dotoss_latin9)
+  kpdl:commaoss         =	+kpdl(commaoss)
+  kpdl:momayyezoss      =	+kpdl(momayyezoss)
+  kpdl:kposs            =	+kpdl(kposs)
+  shift:breaks_caps     =	+shift(breaks_caps)
+
diff --git a/xorg-server/xkbdata.src/rules/base.o_t.part b/xorg-server/xkbdata.src/rules/base.o_t.part
new file mode 100644
index 000000000..440f9efe3
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.o_t.part
@@ -0,0 +1,7 @@
+  caps:internal			=	+caps(internal)
+  caps:internal_nocancel	=	+caps(internal_nocancel)
+  caps:shift			=	+caps(shift)
+  caps:shift_nocancel		=	+caps(shift_nocancel)
+  numpad:pc			=	+numpad(pc)
+  numpad:mac			=	+numpad(mac)
+  numpad:microsoft		=	+numpad(microsoft)
diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in
new file mode 100644
index 000000000..8d0aa921c
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.xml.in
@@ -0,0 +1,4699 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
+<xkbConfigRegistry>
+  <modelList>
+    <model>
+      <configItem>
+        <name>pc101</name>
+        <_description>Generic 101-key PC</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>pc102</name>
+        <_description>Generic 102-key (Intl) PC</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>pc104</name>
+        <_description>Generic 104-key PC</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>pc105</name>
+        <_description>Generic 105-key (Intl) PC</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dell101</name>
+        <_description>Dell 101-key PC</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>latitude</name>
+        <_description>Dell Latitude series laptop</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellm65</name>
+        <_description>Dell Precision M65</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>everex</name>
+        <_description>Everex STEPnote</_description>
+        <vendor>Everex</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>flexpro</name>
+        <_description>Keytronic FlexPro</_description>
+        <vendor>Keytronic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoft</name>
+        <_description>Microsoft Natural</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>omnikey101</name>
+        <_description>Northgate OmniKey 101</_description>
+        <vendor>Northgate</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>winbook</name>
+        <_description>Winbook Model XP5</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>jp106</name>
+        <_description>Japanese 106-key</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>pc98</name>
+        <_description>PC-98xx Series</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>a4techKB21</name>
+        <_description>A4Tech KB-21</_description>
+        <vendor>A4Tech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>a4techKBS8</name>
+        <_description>A4Tech KBS-8</_description>
+        <vendor>A4Tech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>a4_rfkb23</name>
+        <_description>A4Tech Wireless Desktop RFKB-23</_description>
+        <vendor>A4Tech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>abnt2</name>
+        <_description>Brazilian ABNT2</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>airkey</name>
+        <_description>Acer AirKey V</_description>
+        <vendor>Acer</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>acpi</name>
+        <_description>ACPI Standard</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>azonaRF2300</name>
+        <_description>Azona RF2300 wireless Internet Keyboard</_description>
+        <vendor>Azona</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>scorpius</name>
+        <_description>Advance Scorpius KI</_description>
+        <vendor>Scorpius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>brother</name>
+        <_description>Brother Internet Keyboard</_description>
+        <vendor>Brother</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc5113rf</name>
+        <_description>BTC 5113RF Multimedia</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc5126t</name>
+        <_description>BTC 5126T</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc6301urf</name>
+        <_description>BTC 6301URF</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc9000</name>
+        <_description>BTC 9000</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc9000a</name>
+        <_description>BTC 9000A</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc9001ah</name>
+        <_description>BTC 9001AH</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc5090</name>
+        <_description>BTC 5090</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc9019u</name>
+	<_description>BTC 9019U</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherryblue</name>
+        <_description>Cherry Blue Line CyBo@rd</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherryblueb</name>
+        <_description>Cherry CyMotion Master XPress</_description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherrybluea</name>
+        <_description>Cherry Blue Line CyBo@rd (alternate option)</_description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherrycyboard</name>
+        <_description>Cherry CyBo@rd USB-Hub</_description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>chicony</name>
+        <_description>Chicony Internet Keyboard</_description>
+        <vendor>Chicony</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>chicony0108</name>
+        <_description>Chicony KU-0108</_description>
+        <vendor>Chicony</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>chicony9885</name>
+        <_description>Chicony KB-9885</_description>
+        <vendor>Chicony</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>compaqeak8</name>
+        <_description>Compaq Easy Access Keyboard</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>compaqik7</name>
+        <_description>Compaq Internet Keyboard (7 keys)</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>compaqik13</name>
+        <_description>Compaq Internet Keyboard (13 keys)</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>compaqik18</name>
+        <_description>Compaq Internet Keyboard (18 keys)</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cymotionlinux</name>
+        <_description>Cherry CyMotion Master Linux</_description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>armada</name>
+        <_description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>presario</name>
+        <_description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>ipaq</name>
+        <_description>Compaq iPaq Keyboard</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dell</name>
+        <_description>Dell</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellsk8125</name>
+        <_description>Dell SK-8125</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellsk8135</name>
+        <_description>Dell SK-8135</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellusbmm</name>
+        <_description>Dell USB Multimedia Keyboard</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>inspiron</name>
+        <_description>Dell Laptop/notebook Inspiron 6xxx/8xxx</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>precision_m</name>
+        <_description>Dell Laptop/notebook Precision M series</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dexxa</name>
+        <_description>Dexxa Wireless Desktop Keyboard</_description>
+        <vendor>Dexxa</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>diamond</name>
+        <_description>Diamond 9801 / 9802 series</_description>
+        <vendor>Diamond</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dtk2000</name>
+        <_description>DTK2000</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>ennyah_dkb1008</name>
+        <_description>Ennyah DKB-1008</_description>
+        <vendor>Ennyah</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>fscaa1667g</name>
+        <_description>Fujitsu-Siemens Computers AMILO A1667G laptop</_description>
+        <vendor>Fujitsu-Siemens</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>genius</name>
+        <_description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910</_description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>geniuscomfy</name>
+        <_description>Genius Comfy KB-12e</_description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>geniuscomfy2</name>
+        <_description>Genius Comfy KB-21e-Scroll</_description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>geniuskb19e</name>
+        <_description>Genius KB-19e NB</_description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>gyration</name>
+        <_description>Gyration</_description>
+        <vendor>Gyration</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logitech_base</name>
+        <_description>Logitech Generic Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logitech_g15</name>
+        <_description>Logitech G15 extra keys via G15daemon</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpi6</name>
+        <_description>Hewlett-Packard Internet Keyboard</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp2501</name>
+        <_description>Hewlett-Packard SK-2501 Multimedia Keyboard</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp2505</name>
+        <_description>Hewlett-Packard SK-2505 Internet Keyboard</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpxe3gc</name>
+        <_description>Hewlett-Packard Omnibook XE3 GC</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpxe3gf</name>
+        <_description>Hewlett-Packard Omnibook XE3 GF</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpxt1000</name>
+        <_description>Hewlett-Packard Omnibook XT1000</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpzt11xx</name>
+        <_description>Hewlett-Packard Pavilion ZT11xx</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp500fa</name>
+        <_description>Hewlett-Packard Omnibook 500 FA</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp5xx</name>
+        <_description>Hewlett-Packard Omnibook 5xx</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp5181</name>
+        <_description>Hewlett-Packard Internet Keyboard 5181</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp5185</name>
+        <_description>Hewlett-Packard Internet Keyboard 5185</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpnx9020</name>
+        <_description>Hewlett-Packard nx9020</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp6000</name>
+        <_description>Hewlett-Packard Omnibook 6000/6100</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>honeywell_euroboard</name>
+        <_description>Honeywell Euroboard</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>rapidaccess</name>
+        <_description>IBM Rapid Access</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>rapidaccess2</name>
+        <_description>IBM Rapid Access II</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>rapidaccess2a</name>
+        <_description>IBM Rapid Access II (alternate option)</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>thinkpad</name>
+        <_description>IBM ThinkPad 560Z/600/600E/A22E</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>thinkpadintl</name>
+        <_description>IBM ThinkPad 560Z/600/600E/A22E, Intl</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>thinkpad60</name>
+        <_description>IBM ThinkPad R60/T60/R61/T61</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>thinkpadz60</name>
+        <_description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>ibm_spacesaver</name>
+        <_description>IBM Space Saver</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiaccess</name>
+        <_description>Logitech Access Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiclx300</name>
+        <_description>Logitech Cordless Desktop LX-300</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logii350</name>
+        <_description>Logitech Internet 350 Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logimel</name>
+        <_description>Logitech Media Elite Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd</name>
+        <_description>Logitech Cordless Desktop</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd_it</name>
+        <_description>Logitech Cordless Desktop iTouch</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd_nav</name>
+        <_description>Logitech Cordless Desktop Navigator</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd_opt</name>
+        <_description>Logitech Cordless Desktop Optical</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicda</name>
+        <_description>Logitech Cordless Desktop (alternate option)</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicdpa2</name>
+        <_description>Logitech Cordless Desktop Pro (alternate option2)</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicfn</name>
+        <_description>Logitech Cordless Freedom/Desktop Navigator</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicdn</name>
+        <_description>Logitech Cordless Desktop Navigator</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiitc</name>
+        <_description>Logitech iTouch Cordless Keyboard (model Y-RB6)</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiik</name>
+        <_description>Logitech Internet Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>itouch</name>
+        <_description>Logitech iTouch</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicink</name>
+        <_description>Logitech Internet Navigator Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiex110</name>
+        <_description>Logitech Cordless Desktop EX110</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiinkse</name>
+        <_description>Logitech iTouch Internet Navigator Keyboard SE</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiinkseusb</name>
+        <_description>Logitech iTouch Internet Navigator Keyboard SE (USB)</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiultrax</name>
+        <_description>Logitech Ultra-X Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiultraxc</name>
+        <_description>Logitech Ultra-X Cordless Media Desktop Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logidinovo</name>
+        <_description>Logitech diNovo Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logidinovoedge</name>
+        <_description>Logitech diNovo Edge Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>mx1998</name>
+        <_description>Memorex MX1998</_description>
+        <vendor>Memorex</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>mx2500</name>
+        <_description>Memorex MX2500 EZ-Access Keyboard</_description>
+        <vendor>Memorex</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>mx2750</name>
+        <_description>Memorex MX2750</_description>
+        <vendor>Memorex</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoft7000</name>
+        <_description>Microsoft Natural Wireless Ergonomic Keyboard 7000</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftinet</name>
+        <_description>Microsoft Internet Keyboard</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftpro</name>
+        <_description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftprousb</name>
+        <_description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftprooem</name>
+        <_description>Microsoft Natural Keyboard Pro OEM</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>vsonku306</name>
+        <_description>ViewSonic KU-306 Internet Keyboard</_description>
+        <vendor>ViewSonic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftprose</name>
+        <_description>Microsoft Internet Keyboard Pro, Swedish</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftoffice</name>
+        <_description>Microsoft Office Keyboard</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftmult</name> 
+        <_description>Microsoft Wireless Multimedia Keyboard 1.0A</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftelite</name> 
+        <_description>Microsoft Natural Keyboard Elite</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>oretec</name>
+        <_description>Ortek MCK-800 MM/Internet keyboard</_description>
+        <vendor>Ortek</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>propeller</name>
+        <_description>Propeller Voyager (KTEZ-1000)</_description>
+        <vendor>KeyTronic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>qtronix</name>
+        <_description>QTronix Scorpius 98N+</_description>
+        <vendor>QTronix</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>samsung4500</name>
+        <_description>Samsung SDM 4500P</_description>
+        <vendor>Samsung</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>samsung4510</name>
+        <_description>Samsung SDM 4510P</_description>
+        <vendor>Samsung</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sk1300</name>
+        <_description>SK-1300</_description>
+	<vendor>NEC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sk2500</name>
+        <_description>SK-2500</_description>
+	<vendor>NEC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sk6200</name>
+        <_description>SK-6200</_description>
+	<vendor>NEC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sk7100</name>
+        <_description>SK-7100</_description>
+	<vendor>NEC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sp_inet</name>
+        <_description>Super Power Multimedia Keyboard</_description>
+	<vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sven</name>
+        <_description>SVEN Ergonomic 2500</_description>
+	<vendor>SVEN</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sven303</name>
+        <_description>SVEN Slim 303</_description>
+	<vendor>SVEN</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>symplon</name>
+        <_description>Symplon PaceBook (tablet PC)</_description>
+	<vendor>Symplon</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>toshiba_s3000</name>
+        <_description>Toshiba Satellite S3000</_description>
+	<vendor>Toshiba</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>trust</name>
+        <_description>Trust Wireless Keyboard Classic</_description>
+	<vendor>Trust</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>trustda</name>
+        <_description>Trust Direct Access Keyboard</_description>
+	<vendor>Trust</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>yahoo</name>
+        <_description>Yahoo! Internet Keyboard</_description>
+	<vendor>Yahoo!</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macbook78</name>
+        <_description>MacBook/MacBook Pro</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macbook79</name>
+        <_description>MacBook/MacBook Pro (Intl)</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macintosh</name>
+        <_description>Macintosh</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macintosh_old</name>
+        <_description>Macintosh Old</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macintosh_hhk</name>
+        <_description>Happy Hacking Keyboard for Mac</_description>
+	<vendor>Fujitsu</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>acer_c300</name>
+        <_description>Acer C300</_description>
+	<vendor>Acer</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>acer_ferrari4k</name>
+        <_description>Acer Ferrari 4000</_description>
+	<vendor>Acer</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>acer_laptop</name>
+        <_description>Acer Laptop</_description>
+	<vendor>Acer</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>asus_laptop</name>
+        <_description>Asus Laptop</_description>
+	<vendor>Asus</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>apple</name>
+        <_description>Apple</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>apple_laptop</name>
+        <_description>Apple Laptop</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>silvercrest</name>
+        <_description>SILVERCREST Multimedia Wireless Keyboard</_description>
+	<vendor>Silvercrest</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>emachines</name>
+        <_description>Laptop/notebook eMachines m68xx</_description>
+	<vendor>eMachines</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>kr106</name>
+	<_description>Korean 106-key</_description>
+	<vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>evdev</name>
+	<_description>Evdev-managed keyboard</_description>
+	<vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>benqx</name>
+	<_description>BenQ X-Touch</_description>
+	<vendor>BenQ</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>benqx730</name>
+	<_description>BenQ X-Touch 730</_description>
+	<vendor>BenQ</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>benqx800</name>
+	<_description>BenQ X-Touch 800</_description>
+	<vendor>BenQ</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>hhk</name>
+	<_description>Happy Hacking Keyboard</_description>
+	<vendor>Fujitsu</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>classmate</name>
+	<_description>Classmate PC</_description>
+	<vendor>Intel</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>olpc</name>
+	<_description>OLPC</_description>
+	<vendor>OLPC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun6</name>
+        <_description>Sun Type 5/6</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+  </modelList>
+  <layoutList>
+    <layout>
+      <configItem>
+        <name>us</name>
+        <_shortDescription>USA</_shortDescription>
+        <_description>USA</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>chr</name>
+            <_description>Cherokee</_description>
+            <languageList><iso639Id>chr</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>euro</name>
+            <_description>With EuroSign on 5</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>intl</name>
+            <_description>International (with dead keys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>alt-intl</name>
+            <_description>Alternative international (former us_intl)</_description>
+          </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>colemak</name>
+            <_description>Colemak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-intl</name>
+            <_description>Dvorak international</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-l</name>
+            <_description>Left handed Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-r</name>
+            <_description>Right handed Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-classic</name>
+            <_description>Classic Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvp</name>
+            <_description>Programmer Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rus</name>
+            <_description>Russian phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>altgr-intl</name>
+            <_description>International (AltGr dead keys)</_description>
+            <languageList><iso639Id>eng</iso639Id>
+                          <iso639Id>fra</iso639Id>
+                          <iso639Id>ger</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>olpc2</name>
+            <_description>Group toggle on multiply/divide key</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ad</name>
+        <_shortDescription>And</_shortDescription>
+        <_description>Andorra</_description>
+        <languageList><iso639Id>cat</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>af</name>
+        <_shortDescription>Afg</_shortDescription>
+        <_description>Afghanistan</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ps</name>
+            <_description>Pashto</_description>
+            <languageList><iso639Id>pus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>uz</name>
+            <_description>Southern Uzbek</_description>
+            <languageList><iso639Id>uzb</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>olpc-ps</name>
+            <_description>OLPC Pashto</_description>
+            <languageList><iso639Id>pus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>olpc-fa</name>
+            <_description>OLPC Dari</_description>
+            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>olpc-uz</name>
+            <_description>OLPC Southern Uzbek</_description>
+            <languageList><iso639Id>uzb</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ara</name>
+        <_shortDescription>Ara</_shortDescription>
+        <_description>Arabic</_description>
+        <countryList>
+          <iso3166Id>AE</iso3166Id>
+          <iso3166Id>BH</iso3166Id>
+          <iso3166Id>DZ</iso3166Id>
+          <iso3166Id>EG</iso3166Id>
+          <iso3166Id>EH</iso3166Id>
+          <iso3166Id>JO</iso3166Id>
+          <iso3166Id>KW</iso3166Id>
+          <iso3166Id>LB</iso3166Id>
+          <iso3166Id>LY</iso3166Id>
+          <iso3166Id>MA</iso3166Id>
+          <iso3166Id>MR</iso3166Id>
+          <iso3166Id>OM</iso3166Id>
+          <iso3166Id>PS</iso3166Id>
+          <iso3166Id>QA</iso3166Id>
+          <iso3166Id>SA</iso3166Id>
+          <iso3166Id>SD</iso3166Id>
+          <iso3166Id>SY</iso3166Id>
+          <iso3166Id>TN</iso3166Id>
+          <iso3166Id>YE</iso3166Id>
+        </countryList>
+        <languageList><iso639Id>ara</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>azerty</name>
+            <_description>azerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>azerty_digits</name>
+            <_description>azerty/digits</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>digits</name>
+            <_description>digits</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty_digits</name>
+            <_description>qwerty/digits</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>buckwalter</name>
+            <_description>Buckwalter</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>al</name>
+        <_shortDescription>Alb</_shortDescription>
+        <_description>Albania</_description>
+        <languageList><iso639Id>alb</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>am</name>
+        <_shortDescription>Arm</_shortDescription>
+        <_description>Armenia</_description>
+        <languageList><iso639Id>hye</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>phonetic-alt</name>
+            <_description>Alternative Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>eastern</name>
+            <_description>Eastern</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>western</name>
+            <_description>Western</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>eastern-alt</name>
+            <_description>Alternative Eastern</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>az</name>
+        <_shortDescription>Aze</_shortDescription>
+        <_description>Azerbaijan</_description>
+        <languageList><iso639Id>aze</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>cyrillic</name>
+            <_description>Cyrillic</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>by</name>
+        <_shortDescription>Blr</_shortDescription>
+        <_description>Belarus</_description>
+        <languageList><iso639Id>bel</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>winkeys</name>
+            <_description>Winkeys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin</name>
+            <_description>Latin</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>be</name>
+        <_shortDescription>Bel</_shortDescription>
+        <_description>Belgium</_description>
+        <languageList><iso639Id>ger</iso639Id>
+                      <iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>iso-alternate</name>
+            <_description>ISO Alternate</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>wang</name>
+            <_description>Wang model 724 azerty</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>bd</name>
+        <_shortDescription>Ban</_shortDescription>
+        <_description>Bangladesh</_description>
+        <languageList><iso639Id>ben</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>probhat</name>
+            <_description>Probhat</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>in</name>
+        <_shortDescription>Ind</_shortDescription>
+        <_description>India</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ben</name>
+            <_description>Bengali</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ben_probhat</name>
+            <_description>Bengali Probhat</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>guj</name>
+            <_description>Gujarati</_description>
+            <languageList><iso639Id>guj</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>guru</name>
+            <_description>Gurmukhi</_description>
+            <languageList><iso639Id>pan</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>jhelum</name>
+            <_description>Gurmukhi Jhelum</_description>
+            <languageList><iso639Id>pan</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kan</name>
+            <_description>Kannada</_description>
+            <languageList><iso639Id>kan</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mal</name>
+            <_description>Malayalam</_description>
+            <languageList><iso639Id>mal</iso639Id></languageList>
+         </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>mal_lalitha</name>
+            <_description>Malayalam Lalitha</_description>
+            <languageList><iso639Id>mal</iso639Id></languageList>
+         </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ori</name>
+            <_description>Oriya</_description>
+            <languageList><iso639Id>ori</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_unicode</name>
+            <_description>Tamil Unicode</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_TAB</name>
+            <_description>Tamil TAB Typewriter</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_TSCII</name>
+            <_description>Tamil TSCII Typewriter</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam</name>
+            <_description>Tamil</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tel</name>
+            <_description>Telugu</_description>
+            <languageList><iso639Id>tel</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>urd</name>
+            <_description>Urdu</_description>
+            <languageList><iso639Id>urd</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>bolnagri</name>
+            <_description>Hindi Bolnagri</_description>
+            <languageList><iso639Id>hin</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ba</name>
+        <_shortDescription>Bih</_shortDescription>
+        <_description>Bosnia and Herzegovina</_description>
+        <languageList><iso639Id>bos</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description> Use guillemets for quotes</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicode</name>
+            <_description>Use Bosnian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicodeus</name>
+            <_description>US keyboard with Bosnian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Bosnian letters</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>br</name>
+        <_shortDescription>Bra</_shortDescription>
+        <_description>Brazil</_description>
+        <languageList><iso639Id>por</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo</name>
+            <_description>Nativo</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo-us</name>
+            <_description>Nativo for USA keyboards</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo-epo</name>
+            <_description>Nativo for Esperanto</_description>
+            <languageList><iso639Id>epo</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>bg</name>
+        <_shortDescription>Bgr</_shortDescription>
+        <_description>Bulgaria</_description>
+        <languageList><iso639Id>bul</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ma</name>
+        <_description>Morocco</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>french</name>
+            <_description>French</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh</name>
+            <_description>Tifinagh</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-alt</name>
+            <_description>Tifinagh Alternative</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-alt-phonetic</name>
+            <_description>Tifinagh Alternative Phonetic</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-extended</name>
+            <_description>Tifinagh Extended</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-phonetic</name>
+            <_description>Tifinagh Phonetic</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-extended-phonetic</name>
+            <_description>Tifinagh Extended Phonetic</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mm</name>
+        <_shortDescription>Mmr</_shortDescription>
+        <_description>Myanmar</_description>
+        <languageList><iso639Id>mya</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ca</name>
+        <_shortDescription>Can</_shortDescription>
+        <_description>Canada</_description>
+        <languageList><iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>fr-dvorak</name>
+            <_description>French Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr-legacy</name>
+            <_description>French (legacy)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>multix</name>
+            <_description>Multilingual</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>multi</name>
+            <_description>Multilingual, first part</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>multi-2gr</name>
+            <_description>Multilingual, second part</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ike</name>
+            <_description>Inuktitut</_description>
+            <languageList><iso639Id>iku</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>shs</name>
+            <_description>Secwepemctsin</_description>
+            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kut</name>
+            <_description>Ktunaxa</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>cd</name>
+        <_shortDescription>DRC</_shortDescription>
+        <_description>Congo, Democratic Republic of the</_description>
+        <languageList><iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>cn</name>
+        <_shortDescription>China</_shortDescription>
+        <_description>China</_description>
+        <languageList><iso639Id>chi</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>tib</name>
+            <_description>Tibetan</_description>
+            <languageList><iso639Id>tib</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tib_asciinum</name>
+            <_description>Tibetan (with ASCII numerals)</_description>
+            <languageList><iso639Id>tib</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>hr</name>
+        <_shortDescription>Hrv</_shortDescription>
+        <_description>Croatia</_description>
+        <languageList><iso639Id>scr</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description>Use guillemets for quotes</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicode</name>
+            <_description>Use Croatian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicodeus</name>
+            <_description>US keyboard with Croatian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Croatian letters</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>cz</name>
+        <_shortDescription>Cze</_shortDescription>
+        <_description>Czechia</_description>
+        <languageList><iso639Id>cze</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>bksl</name>
+            <_description>With &lt;\|&gt; key</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty_bksl</name>
+            <_description>qwerty, extended Backslash</_description>
+          </configItem>
+        </variant>
+	<variant>
+	  <configItem>
+	    <name>ucw</name>
+	    <_description>UCW layout (accented letters only)</_description>
+	 </configItem>
+	</variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>dk</name>
+        <_shortDescription>Dan</_shortDescription>
+        <_description>Denmark</_description>
+        <languageList><iso639Id>dan</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_nodeadkeys</name>
+            <_description>Macintosh, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>nl</name>
+        <_shortDescription>Nld</_shortDescription>
+        <_description>Netherlands</_description>
+        <languageList><iso639Id>nld</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>std</name>
+            <_description>Standard</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>bt</name>
+        <_shortDescription>Bhu</_shortDescription>
+        <_description>Bhutan</_description>
+        <languageList><iso639Id>dzo</iso639Id></languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ee</name>
+        <_shortDescription>Est</_shortDescription>
+        <_description>Estonia</_description>
+        <languageList><iso639Id>est</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Estonian letters</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ir</name>
+        <_shortDescription>Irn</_shortDescription>
+        <_description>Iran</_description>
+        <languageList><iso639Id>per</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>pro</name>
+            <_description>Pro</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>keypad</name>
+            <_description>Keypad</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>pro_keypad</name>
+            <_description>Pro Keypad</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <_description>Kurdish, Latin Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <_description>Kurdish, (F)</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <_description>Kurdish, Latin Alt-Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_ara</name>
+            <_description>Kurdish, Arabic-Latin</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>iq</name>
+        <_shortDescription>Irq</_shortDescription>
+        <_description>Iraq</_description>
+        <languageList><iso639Id>ara</iso639Id>
+                      <iso639Id>kur</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <_description>Kurdish, Latin Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <_description>Kurdish, (F)</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <_description>Kurdish, Latin Alt-Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_ara</name>
+            <_description>Kurdish, Arabic-Latin</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>fo</name>
+        <_shortDescription>Fao</_shortDescription>
+        <_description>Faroe Islands</_description>
+        <languageList><iso639Id>fao</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>fi</name>
+        <_shortDescription>Fin</_shortDescription>
+        <_description>Finland</_description>
+        <languageList><iso639Id>fin</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>smi</name>
+            <_description>Northern Saami</_description>
+            <languageList><iso639Id>smi</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>classic</name>
+            <_description>Classic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>fr</name>
+        <_shortDescription>Fra</_shortDescription>
+        <_description>France</_description>
+        <languageList><iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss</name>
+            <_description>Alternative</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss_latin9</name>
+            <_description>Alternative, latin-9 only</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss_nodeadkeys</name>
+            <_description>Alternative, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss_sundeadkeys</name>
+            <_description>Alternative, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin9</name>
+            <_description>(Legacy) Alternative</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin9_nodeadkeys</name>
+            <_description>(Legacy) Alternative, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin9_sundeadkeys</name>
+            <_description>(Legacy) Alternative, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>bepo</name>
+            <_description>Bepo, ergonomic, Dvorak way</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>bepo_latin9</name>
+            <_description>Bepo, ergonomic, Dvorak way, latin-9 only</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>geo</name>
+            <_description>Georgian AZERTY Tskapo</_description>
+            <languageList><iso639Id>geo</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>gh</name>
+        <_shortDescription>Gha</_shortDescription>
+        <_description>Ghana</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>generic</name>
+            <_description>Multilingual</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>akan</name>
+            <_description>Akan</_description>
+            <languageList><iso639Id>aka</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ewe</name>
+            <_description>Ewe</_description>
+            <languageList><iso639Id>ewe</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fula</name>
+            <_description>Fula</_description>
+            <languageList><iso639Id>ful</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ga</name>
+            <_description>Ga</_description>
+            <languageList><iso639Id>gaa</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>hausa</name>
+            <_description>Hausa</_description>
+            <languageList><iso639Id>hau</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>gn</name>
+        <_shortDescription>Gui</_shortDescription>
+        <_description>Guinea</_description>
+        <languageList><iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ge</name>
+        <_shortDescription>Geo</_shortDescription>
+        <_description>Georgia</_description>
+        <languageList><iso639Id>geo</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ergonomic</name>
+            <_description>Ergonomic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mess</name>
+            <_description>MESS</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ru</name>
+            <_description>Russian</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>os</name>
+            <_description>Ossetian</_description>
+            <languageList><iso639Id>oss</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>de</name>
+        <_shortDescription>Deu</_shortDescription>
+        <_description>Germany</_description>
+        <languageList><iso639Id>ger</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>deadacute</name>
+            <_description>Dead acute</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>deadgraveacute</name>
+            <_description>Dead grave acute</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ro</name>
+            <_description>Romanian keyboard with German letters</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ro_nodeadkeys</name>
+            <_description>Romanian keyboard with German letters, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>neo</name>
+            <_description>Neostyle</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_nodeadkeys</name>
+            <_description>Macintosh, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>gr</name>
+        <_shortDescription>Gre</_shortDescription>
+        <_description>Greece</_description>
+        <languageList><iso639Id>gre</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>simple</name>
+            <_description>Simple</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>extended</name>
+            <_description>Extended</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>polytonic</name>
+            <_description>Polytonic</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>hu</name>
+        <_shortDescription>Hun</_shortDescription>
+        <_description>Hungary</_description>
+        <languageList><iso639Id>hun</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>standard</name>
+            <_description>Standard</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
+          </configItem>
+        </variant>
+
+        <!-- 101 keys -->
+        <variant>
+          <configItem>
+            <name>101_qwertz_comma_dead</name>
+            <_description>101/qwertz/comma/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwertz_comma_nodead</name>
+            <_description>101/qwertz/comma/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwertz_dot_dead</name>
+            <_description>101/qwertz/dot/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwertz_dot_nodead</name>
+            <_description>101/qwertz/dot/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwerty_comma_dead</name>
+            <_description>101/qwerty/comma/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwerty_comma_nodead</name>
+            <_description>101/qwerty/comma/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwerty_dot_dead</name>
+            <_description>101/qwerty/dot/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwerty_dot_nodead</name>
+            <_description>101/qwerty/dot/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+
+
+        <!-- 102 keys -->
+        <variant>
+          <configItem>
+            <name>102_qwertz_comma_dead</name>
+            <_description>102/qwertz/comma/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwertz_comma_nodead</name>
+            <_description>102/qwertz/comma/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwertz_dot_dead</name>
+            <_description>102/qwertz/dot/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwertz_dot_nodead</name>
+            <_description>102/qwertz/dot/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwerty_comma_dead</name>
+            <_description>102/qwerty/comma/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwerty_comma_nodead</name>
+            <_description>102/qwerty/comma/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwerty_dot_dead</name>
+            <_description>102/qwerty/dot/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwerty_dot_nodead</name>
+            <_description>102/qwerty/dot/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>is</name>
+        <_shortDescription>Isl</_shortDescription>
+        <_description>Iceland</_description>
+        <languageList><iso639Id>ice</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>Sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>il</name>
+        <_shortDescription>Isr</_shortDescription>
+        <_description>Israel</_description>
+        <languageList><iso639Id>heb</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>lyx</name>
+            <_description>lyx</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>biblical</name>
+            <_description>Biblical Hebrew (Tiro)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>it</name>
+        <_shortDescription>Ita</_shortDescription>
+        <_description>Italy</_description>
+        <languageList><iso639Id>ita</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>geo</name>
+            <_description>Georgian</_description>
+            <languageList><iso639Id>geo</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>jp</name>
+        <_shortDescription>Jpn</_shortDescription>
+        <_description>Japan</_description>
+        <languageList><iso639Id>jpn</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>kana</name>
+            <_description>Kana</_description>
+          </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>OADG109A</name>
+            <_description>OADG 109A</_description>
+          </configItem>
+	</variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>kg</name>
+        <_shortDescription>Kir</_shortDescription>
+        <_description>Kyrgyzstan</_description>
+        <languageList><iso639Id>kir</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>kh</name>
+        <_shortDescription>Khm</_shortDescription>
+        <_description>Cambodia</_description>
+        <languageList><iso639Id>khm</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+	<name>kz</name>
+	<_shortDescription>Kaz</_shortDescription>
+	<_description>Kazakhstan</_description>
+        <languageList><iso639Id>kaz</iso639Id></languageList>
+      </configItem>
+      <variantList>
+	<variant>
+	  <configItem>
+	    <name>ruskaz</name>
+	    <_description>Russian with Kazakh</_description>
+            <languageList><iso639Id>kaz</iso639Id>
+                          <iso639Id>rus</iso639Id></languageList>
+	  </configItem>
+	</variant>
+	<variant>
+	  <configItem>
+	    <name>kazrus</name>
+	    <_description>Kazakh with Russian</_description>
+            <languageList><iso639Id>kaz</iso639Id>
+                          <iso639Id>rus</iso639Id></languageList>
+	  </configItem>
+	</variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>la</name>
+        <_shortDescription>Lao</_shortDescription>
+        <_description>Laos</_description>
+        <languageList><iso639Id>lao</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>latam</name>
+        <_shortDescription>LAm</_shortDescription>
+        <_description>Latin American</_description>
+        <countryList>
+          <iso3166Id>AR</iso3166Id>
+          <iso3166Id>BO</iso3166Id>
+          <iso3166Id>CL</iso3166Id>
+          <iso3166Id>CO</iso3166Id>
+          <iso3166Id>CR</iso3166Id>
+          <iso3166Id>CU</iso3166Id>
+          <iso3166Id>DO</iso3166Id>
+          <iso3166Id>EC</iso3166Id>
+          <iso3166Id>GT</iso3166Id>
+          <iso3166Id>HN</iso3166Id>
+          <iso3166Id>HT</iso3166Id>
+          <iso3166Id>MX</iso3166Id>
+          <iso3166Id>NI</iso3166Id>
+          <iso3166Id>PA</iso3166Id>
+          <iso3166Id>PE</iso3166Id>
+          <iso3166Id>PR</iso3166Id>
+          <iso3166Id>PY</iso3166Id>
+          <iso3166Id>UY</iso3166Id>
+          <iso3166Id>VE</iso3166Id>
+        </countryList>
+        <languageList><iso639Id>spa</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>lt</name>
+        <_shortDescription>Ltu</_shortDescription>
+        <_description>Lithuania</_description>
+        <languageList><iso639Id>lit</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>std</name>
+            <_description>Standard</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Lithuanian letters</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ibm</name>
+            <_description>IBM (LST 1205-92)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>lekp</name>
+            <_description>LEKP</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>lekpa</name>
+            <_description>LEKPa</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>balticplus</name>
+            <_description>Baltic+</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>lv</name>
+        <_shortDescription>Lav</_shortDescription>
+        <_description>Latvia</_description>
+        <languageList><iso639Id>lav</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>apostrophe</name>
+            <_description>Apostrophe (') variant</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tilde</name>
+            <_description>Tilde (~) variant</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fkey</name>
+            <_description>F-letter (F) variant</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mao</name>
+        <_shortDescription>Mao</_shortDescription>
+        <_description>Maori</_description>
+        <languageList><iso639Id>mao</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>me</name>
+        <_shortDescription>MNE</_shortDescription>
+        <_description>Montenegro</_description>
+        <languageList><iso639Id>srp</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>cyrillic</name>
+            <_description>Cyrillic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cyrillicyz</name>
+            <_description>Cyrillic, Z and ZHE swapped</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicode</name>
+            <_description>Latin unicode</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinyz</name>
+            <_description>Latin qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicodeyz</name>
+            <_description>Latin unicode qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cyrillicalternatequotes</name>
+            <_description>Cyrillic with guillemets</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinalternatequotes</name>
+            <_description>Latin with guillemets</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mk</name>
+        <_shortDescription>Mkd</_shortDescription>
+        <_description>Macedonia</_description>
+        <languageList><iso639Id>mkd</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mt</name>
+        <_shortDescription>Mlt</_shortDescription>
+        <_description>Malta</_description>
+        <languageList><iso639Id>mlt</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>Maltese keyboard with US layout</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mn</name>
+        <_shortDescription>Mng</_shortDescription>
+        <_description>Mongolia</_description>
+        <languageList><iso639Id>mng</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>no</name>
+        <_shortDescription>Nor</_shortDescription>
+        <_description>Norway</_description>
+        <languageList><iso639Id>nor</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>smi</name>
+            <_description>Northern Saami</_description>
+            <languageList><iso639Id>sme</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>smi_nodeadkeys</name>
+            <_description>Northern Saami, eliminate dead keys</_description>
+            <languageList><iso639Id>sme</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_nodeadkeys</name>
+            <_description>Macintosh, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>pl</name>
+        <_shortDescription>Pol</_shortDescription>
+        <_description>Poland</_description>
+        <languageList><iso639Id>pol</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>qwertz</name>
+            <_description>qwertz</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak_quotes</name>
+            <_description>Dvorak, Polish quotes on quotemark key</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak_altquotes</name>
+            <_description>Dvorak, Polish quotes on key "1/!"</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>csb</name>
+            <_description>Kashubian</_description>
+            <languageList><iso639Id>csb</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ru_phonetic_dvorak</name>
+            <_description>Russian phonetic Dvorak</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>pt</name>
+        <_shortDescription>Prt</_shortDescription>
+        <_description>Portugal</_description>
+        <languageList><iso639Id>por</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_nodeadkeys</name>
+            <_description>Macintosh, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_sundeadkeys</name>
+            <_description>Macintosh, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo</name>
+            <_description>Nativo</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo-us</name>
+            <_description>Nativo for USA keyboards</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo-epo</name>
+            <_description>Nativo for Esperanto</_description>
+            <languageList><iso639Id>epo</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ro</name>
+        <_shortDescription>Rou</_shortDescription>
+        <_description>Romania</_description>
+        <languageList><iso639Id>rum</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>cedilla</name>
+            <_description>Cedilla</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>std</name>
+            <_description>Standard</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>std_cedilla</name>
+            <_description>Standard (Cedilla)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>winkeys</name>
+            <_description>Winkeys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ru</name>
+        <_shortDescription>Rus</_shortDescription>
+        <_description>Russia</_description>
+        <languageList><iso639Id>rus</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>typewriter</name>
+            <_description>Typewriter</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>legacy</name>
+            <_description>Legacy</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tt</name>
+            <_description>Tatar</_description>
+            <languageList><iso639Id>tat</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>os_legacy</name>
+            <_description>Ossetian, legacy</_description>
+            <languageList><iso639Id>oss</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>os_winkeys</name>
+            <_description>Ossetian, Winkeys</_description>
+            <languageList><iso639Id>oss</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cv</name>
+            <_description>Chuvash</_description>
+            <languageList><iso639Id>chv</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cv_latin</name>
+            <_description>Chuvash Latin</_description>
+            <languageList><iso639Id>chv</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>udm</name>
+            <_description>Udmurt</_description>
+            <languageList><iso639Id>udm</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kom</name>
+            <_description>Komi</_description>
+            <languageList><iso639Id>kom</iso639Id></languageList>
+          </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>sah</name>
+            <_description>Yakut</_description>
+            <languageList><iso639Id>sah</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>rs</name>
+        <_shortDescription>SRB</_shortDescription>
+        <_description>Serbia</_description>
+        <languageList><iso639Id>srp</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>yz</name>
+            <_description>Z and ZHE swapped</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin</name>
+            <_description>Latin</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicode</name>
+            <_description>Latin Unicode</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinyz</name>
+            <_description>Latin qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicodeyz</name>
+            <_description>Latin Unicode qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description>With guillemets</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinalternatequotes</name>
+            <_description>Latin with guillemets</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>si</name>
+        <_shortDescription>Svn</_shortDescription>
+        <_description>Slovenia</_description>
+        <languageList><iso639Id>slv</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description>Use guillemets for quotes</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicode</name>
+            <_description>Use Slovenian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicodeus</name>
+            <_description>US keyboard with Slovenian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Slovenian letters</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>sk</name>
+        <_shortDescription>Svk</_shortDescription>
+        <_description>Slovakia</_description>
+        <languageList><iso639Id>slo</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>bksl</name>
+            <_description>Extended Backslash</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty_bksl</name>
+            <_description>qwerty, extended Backslash</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>es</name>
+        <_shortDescription>Esp</_shortDescription>
+        <_description>Spain</_description>
+        <languageList><iso639Id>spa</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ast</name>
+            <_description>Asturian variant with bottom-dot H and bottom-dot L</_description>
+            <languageList><iso639Id>ast</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cat</name>
+            <_description>Catalan variant with middle-dot L</_description>
+            <languageList><iso639Id>cat</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>se</name>
+        <_shortDescription>Swe</_shortDescription>
+        <_description>Sweden</_description>
+        <languageList><iso639Id>swe</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rus</name>
+            <_description>Russian phonetic</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rus_nodeadkeys</name>
+            <_description>Russian phonetic, eliminate dead keys</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>smi</name>
+            <_description>Northern Saami</_description>
+            <languageList><iso639Id>sme</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>svdvorak</name>
+            <_description>Svdvorak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ch</name>
+        <_shortDescription>Che</_shortDescription>
+        <_description>Switzerland</_description>
+        <languageList><iso639Id>ger</iso639Id>
+                      <iso639Id>gsw</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>de_nodeadkeys</name>
+            <_description>German, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>de_sundeadkeys</name>
+            <_description>German, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr</name>
+            <_description>French</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr_nodeadkeys</name>
+            <_description>French, eliminate dead keys</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr_sundeadkeys</name>
+            <_description>French, Sun dead keys</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr_mac</name>
+            <_description>French (Macintosh)</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>de_mac</name>
+            <_description>German (Macintosh)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>sy</name>
+        <_shortDescription>Syr</_shortDescription>
+        <_description>Syria</_description>
+        <languageList><iso639Id>syr</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>syc</name>
+            <_description>Syriac</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>syc_phonetic</name>
+            <_description>Syriac phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <_description>Kurdish, Latin Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <_description>Kurdish, (F)</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <_description>Kurdish, Latin Alt-Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>tj</name>
+        <_shortDescription>Tjk</_shortDescription>
+        <_description>Tajikistan</_description>
+        <languageList><iso639Id>tgk</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>lk</name>
+        <_shortDescription>SrL</_shortDescription>
+        <_description>Sri Lanka</_description>
+        <languageList><iso639Id>sin</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>tam_unicode</name>
+            <_description>Tamil Unicode</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_TAB</name>
+            <_description>Tamil TAB Typewriter</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>th</name>
+        <_shortDescription>Tha</_shortDescription>
+        <_description>Thailand</_description>
+        <languageList><iso639Id>tha</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>tis</name>
+            <_description>TIS-820.2538</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>pat</name>
+            <_description>Pattachote</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>tr</name>
+        <_shortDescription>Tur</_shortDescription>
+        <_description>Turkey</_description>
+        <languageList><iso639Id>tur</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>f</name>
+            <_description>(F)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>alt</name>
+            <_description>Alt-Q</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <_description>Kurdish, Latin Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <_description>Kurdish, (F)</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <_description>Kurdish, Latin Alt-Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>intl</name>
+            <_description>International (with dead keys)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ua</name>
+        <_shortDescription>Ukr</_shortDescription>
+        <_description>Ukraine</_description>
+        <languageList><iso639Id>ukr</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>typewriter</name>
+            <_description>Typewriter</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>winkeys</name>
+            <_description>Winkeys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicode</name>
+            <_description>Unicode</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rstu</name>
+<!-- RSTU 2019-91 -->
+            <_description>Standard RSTU</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rstu_ru</name>
+<!-- RSTU 2019-91 -->
+            <_description>Standard RSTU on Russian layout</_description>
+          </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>homophonic</name>
+            <_description>Homophonic</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>gb</name>
+        <_shortDescription>GBr</_shortDescription>
+        <_description>United Kingdom</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>intl</name>
+            <_description>International (with dead keys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorakukp</name>
+            <_description>Dvorak (UK Punctuation)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>colemak</name>
+            <_description>Colemak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>uz</name>
+        <_shortDescription>Uzb</_shortDescription>
+        <_description>Uzbekistan</_description>
+        <languageList><iso639Id>uzb</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>latin</name>
+            <_description>Latin</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>vn</name>
+        <_shortDescription>Vnm</_shortDescription>
+        <_description>Vietnam</_description>
+        <languageList><iso639Id>vie</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+       <configItem>
+        <name>kr</name>
+        <_shortDescription>Kor</_shortDescription>
+        <_description>Korea, Republic of</_description>
+        <languageList><iso639Id>kor</iso639Id></languageList>
+      </configItem>
+      <variantList>
+	<variant>
+	  <configItem>
+	    <name>kr104</name>
+	    <_description>101/104 key Compatible</_description>
+	  </configItem>
+	</variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>nec_vndr/jp</name>
+        <_shortDescription>Jpn</_shortDescription>
+        <_description>Japan (PC-98xx Series)</_description>
+        <countryList><iso3166Id>JP</iso3166Id></countryList>
+        <languageList><iso639Id>jpn</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ie</name>
+        <_shortDescription>Irl</_shortDescription>
+        <_description>Ireland</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>CloGaelach</name>
+            <_description>CloGaelach</_description>
+            <languageList><iso639Id>gla</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>UnicodeExpert</name>
+            <_description>UnicodeExpert</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ogam</name>
+            <_description>Ogham</_description>
+            <!-- No ISO code in ISO639 -->
+         </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ogam_is434</name>
+            <_description>Ogham IS434</_description>
+            <!-- No ISO code in ISO639 -->
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>pk</name>
+        <_shortDescription>Pak</_shortDescription>
+        <_description>Pakistan</_description>
+        <languageList><iso639Id>urd</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ara</name>
+            <_description>Arabic</_description>
+            <languageList><iso639Id>ara</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mv</name>
+        <_shortDescription>Mal</_shortDescription>
+        <_description>Maldives</_description>
+        <languageList><iso639Id>div</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+       <configItem>
+        <name>za</name>
+        <_shortDescription>Zar</_shortDescription>
+        <_description>South Africa</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>epo</name>
+        <_shortDescription>Epo</_shortDescription>
+	<_description>Esperanto</_description>
+        <languageList><iso639Id>epo</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>legacy</name>
+            <_description>displaced semicolon and quote (obsolete)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>np</name>
+        <_shortDescription>Nep</_shortDescription>
+	<_description>Nepal</_description>
+        <languageList><iso639Id>nep</iso639Id></languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ng</name>
+        <_shortDescription>Nig</_shortDescription>
+	<_description>Nigeria</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>igbo</name>
+            <_description>Igbo</_description>
+            <languageList><iso639Id>ibo</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>yoruba</name>
+            <_description>Yoruba</_description>
+            <languageList><iso639Id>yor</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>hausa</name>
+            <_description>Hausa</_description>
+            <languageList><iso639Id>hau</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>et</name>
+        <_shortDescription>Eth</_shortDescription>
+        <_description>Ethiopia</_description>
+        <languageList><iso639Id>amh</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>braille</name>
+        <_shortDescription>Brl</_shortDescription>
+        <_description>Braille</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>left_hand</name>
+            <_description>Left hand</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>right_hand</name>
+            <_description>Right hand</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+  </layoutList>
+  <optionList>
+    <group allowMultipleSelection="true">
+      <!-- The key combination used to switch between groups -->
+      <configItem>
+        <name>grp</name>
+        <_description>Layout switching</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>grp:switch</name>
+          <_description>R-Alt switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lswitch</name>
+          <_description>Left Alt key switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lwin_switch</name>
+          <_description>Left Win-key switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rwin_switch</name>
+          <_description>Right Win-key switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:win_switch</name>
+          <_description>Both Win-keys switch layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:caps_switch</name>
+          <_description>CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rctrl_switch</name>
+          <_description>Right Ctrl key switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:toggle</name>
+          <_description>Right Alt key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lalt_toggle</name>
+          <_description>Left Alt key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:caps_toggle</name>
+          <_description>CapsLock key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:shift_caps_toggle</name>
+          <_description>Shift+CapsLock changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:shift_caps_switch</name>
+          <_description>CapsLock switch to first layout, Shift+CapsLock switch to last layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:alt_caps_toggle</name>
+          <_description>Alt+CapsLock changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:shifts_toggle</name>
+          <_description>Both Shift keys together change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:alts_toggle</name>
+          <_description>Both Alt keys together change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:ctrls_toggle</name>
+          <_description>Both Ctrl keys together change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:ctrl_shift_toggle</name>
+          <_description>Ctrl+Shift change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lctrl_lshift_toggle</name>
+          <_description>LCtrl+LShift change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:ctrl_alt_toggle</name>
+          <_description>Alt+Ctrl change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:alt_shift_toggle</name>
+          <_description>Alt+Shift change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:menu_toggle</name>
+          <_description>Menu key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lwin_toggle</name>
+          <_description>Left Win-key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rwin_toggle</name>
+          <_description>Right Win-key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lshift_toggle</name>
+          <_description>Left Shift key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rshift_toggle</name>
+          <_description>Right Shift key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lctrl_toggle</name>
+          <_description>Left Ctrl key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rctrl_toggle</name>
+          <_description>Right Ctrl key changes layout.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <!-- The key combination used to choose the 3rd (and 4th, together with Shift)
+	   level of symbols -->
+      <configItem>
+        <name>lv3</name>
+        <_description>Third level choosers</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>lv3:switch</name>
+          <_description>Press Right Ctrl to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:menu_switch</name>
+          <_description>Press Menu key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:win_switch</name>
+          <_description>Press any of Win-keys to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:lwin_switch</name>
+          <_description>Press Left Win-key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:rwin_switch</name>
+          <_description>Press Right Win-key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:alt_switch</name>
+          <_description>Press any of Alt keys to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:lalt_switch</name>
+          <_description>Press Left Alt key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:ralt_switch</name>
+          <_description>Press Right Alt key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:ralt_switch_multikey</name>
+          <_description>Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:ralt_alt</name>
+          <_description>Right Alt key never chooses 3rd level.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- Tweaking the position of the "Ctrl" key -->
+      <configItem>
+        <name>ctrl</name>
+        <_description>Ctrl key position</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>ctrl:nocaps</name>
+          <_description>Make CapsLock an additional Ctrl.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:swapcaps</name>
+          <_description>Swap Ctrl and CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_ac</name>
+          <_description>Ctrl key at left of 'A'</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_aa</name>
+          <_description>Ctrl key at bottom left</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_ra</name>
+          <_description>Right Ctrl key works as Right Alt.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <!-- Using startard LEDs to indicate the alternative (not first) group(s) -->
+      <configItem>
+        <name>grp_led</name>
+        <_description>Use keyboard LED to show alternative layout.</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>grp_led:num</name>
+          <_description>NumLock LED shows alternative layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp_led:caps</name>
+          <_description>CapsLock LED shows alternative layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp_led:scroll</name>
+          <_description>ScrollLock LED shows alternative layout.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- Select a keypad type -->
+      <configItem>
+        <name>keypad</name>
+        <_description>Numeric keypad layout selection</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>keypad:legacy</name>
+          <_description>Legacy keypad</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:oss</name>
+          <_description>Keypad with unicode additions (arrows and math operators)</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:future</name>
+          <_description>Keypad with unicode additions (arrows and math operators). Math operators on default level.</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:legacy_wang</name>
+          <_description>Legacy Wang 724 keypad</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:oss_wang</name>
+          <_description>Wang 724 keypad with unicode additions (arrows and math operators)</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:future_wang</name>
+          <_description>Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level.</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:phone_hex</name>
+          <_description>ATM/phone-style hexadecimal keypad</_description>
+        </configItem>
+      </option>
+    </group>
+    <!-- This option should override the KPDL key defined in keypad; I hope it's declared in the right place -->
+    <group allowMultipleSelection="false">
+      <!-- Select a keypad KPDL variant -->
+      <configItem>
+        <name>kpdl</name>
+        <_description>Numeric keypad delete key behaviour</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <!-- Actually, with KP_DECIMAL, as the old keypad(dot) -->
+          <name>kpdl:dot</name>
+          <_description>Legacy key with dot</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:comma</name>
+          <!-- Actually, with KP_SEPARATOR, as the old keypad(comma) -->
+          <_description>Legacy key with comma</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:dotoss</name>
+          <_description>Four-level key with dot</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:dotoss_latin9</name>
+          <_description>Four-level key with dot, latin-9 restriction</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:commaoss</name>
+          <_description>Four-level key with comma</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:momayyezoss</name>
+          <_description>Four-level key with momayyez</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:kposs</name>
+          <!-- This assumes the KP_ abstract symbols are actually useful for some apps
+               The description needs to be rewritten -->
+          <_description>Four-level key with abstract separators</_description>
+       </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- CapsLock tweaks. 
+	   "Internal" capitalization means capitalization using some internal tables.
+	   Otherwise "as Shift" - means using next group. -->
+      <configItem>
+        <name>caps</name>
+        <_description>CapsLock key behavior</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>caps:internal</name>
+          <_description>CapsLock uses internal capitalization. Shift "pauses" CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:internal_nocancel</name>
+          <_description>CapsLock uses internal capitalization. Shift doesn't affect CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:shift</name>
+          <_description>CapsLock acts as Shift with locking. Shift "pauses" CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:shift_nocancel</name>
+          <_description>CapsLock acts as Shift with locking. Shift doesn't affect CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:capslock</name>
+          <_description>CapsLock toggles normal capitalization of alphabetic characters.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:swapescape</name>
+          <_description>Swap ESC and CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:shiftlock</name>
+          <_description>CapsLock toggles Shift so all keys are affected.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) -->
+      <configItem>
+        <name>altwin</name>
+        <_description>Alt/Win key behavior</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>altwin:menu</name>
+          <_description>Add the standard behavior to Menu key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:meta_alt</name>
+          <_description>Alt and Meta are on the Alt keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:ctrl_win</name>
+          <_description>Control is mapped to the Win-keys (and the usual Ctrl keys).</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:meta_win</name>
+          <_description>Meta is mapped to the Win-keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:left_meta_win</name>
+          <_description>Meta is mapped to the left Win-key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:super_win</name>
+          <_description>Super is mapped to the Win-keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:hyper_win</name>
+          <_description>Hyper is mapped to the Win-keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:alt_super_win</name>
+          <_description>Alt is mapped to the right Win-key and Super to Menu.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:swap_lalt_lwin</name>
+          <_description>Left Alt is swapped with left Win-key.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <!-- Tweaking the position of the "Compose" key: mapping to existing PC keys -->
+      <configItem>
+        <name>Compose key</name>
+        <_description>Compose key position</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>compose:ralt</name>
+          <_description>Right Alt is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:lwin</name>
+          <_description>Left Win-key is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:rwin</name>
+          <_description>Right Win-key is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:menu</name>
+          <_description>Menu is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:rctrl</name>
+          <_description>Right Ctrl is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:caps</name>
+          <_description>Caps Lock is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:102</name>
+          <_description>Less-than/Greater-than is Compose.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>compat</name>
+        <_description>Miscellaneous compatibility options</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>numpad:pc</name>
+          <_description>Default numeric keypad keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>numpad:mac</name>
+          <_description>Numeric keypad keys work as with Mac.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>numpad:microsoft</name>
+          <_description>Shift with numeric keypad keys works as in MS Windows.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>srvrkeys:none</name>
+          <_description>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>apple:badmap</name>
+          <_description>Swap keycodes of two keys when Mac keyboards are misdetected by kernel.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>shift:breaks_caps</name>
+          <_description>Shift cancels CapsLock.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <!-- Special shortcuts for the Euro character -->
+      <configItem>
+        <name>eurosign</name>
+        <_description>Adding the EuroSign to certain keys</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>eurosign:e</name>
+          <_description>Add the EuroSign to the E key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>eurosign:2</name>
+          <_description>Add the EuroSign to the 2 key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>eurosign:4</name>
+          <_description>Add the EuroSign to the 4 key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>eurosign:5</name>
+          <_description>Add the EuroSign to the 5 key.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- Let space output nobreakspace for the desired level -->
+      <configItem>
+        <name>nbsp</name>
+        <_description>Using space key to input non-breakable space character</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>nbsp:none</name>
+          <_description>Space key outputs usual space at any level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level2</name>
+          <_description>Space key outputs non-breakable space character at second level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level3</name>
+          <_description>Space key outputs non-breakable space character at third level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level3s</name>
+          <_description>Space key outputs non-breakable space character at third level, nothing at fourth level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level3n</name>
+          <_description>Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level4</name>
+          <_description>Space key outputs non-breakable space character at fourth level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level4n</name>
+          <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level4nl</name>
+          <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>japan</name>
+        <_description>Japanese keyboard options</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>japan:kana_lock</name>
+          <_description>Kana Lock key is locking</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>japan:nicola_f_bs</name>
+          <_description>NICOLA-F style Backspace</_description>
+       </configItem>
+      </option>
+    </group>
+  </optionList>
+</xkbConfigRegistry>
diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.am b/xorg-server/xkbdata.src/rules/compat/Makefile.am
new file mode 100644
index 000000000..331265ae1
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/compat/Makefile.am
@@ -0,0 +1,56 @@
+
+transform_files=layoutRename.lst variantRename.lst
+
+transform_scripts=ln_s.sh lnv_s.sh ml_s.sh mlv_s.sh ml1_s.sh ml1v_s.sh ml1v1_s.sh
+
+dist_parts=base.o_s.part
+
+scripts=base.l2_s.part base.l3_s.part base.l4_s.part \
+base.l2v2_s.part base.l3v3_s.part base.l4v4_s.part \
+base.ml_s.part base.ml1_s.part \
+base.mlv_s.part base.ml1v1_s.part \
+base.ml_s.part
+
+if USE_COMPAT_RULES
+
+noinst_SCRIPTS=$(scripts) $(dist_parts)
+
+else
+
+noinst_SCRIPTS=
+
+endif
+
+base.l2_s.part: ln_s.sh $(transform_files)
+	sh $< 2
+
+base.l3_s.part: ln_s.sh $(transform_files)
+	sh $< 3
+
+base.l4_s.part: ln_s.sh $(transform_files)
+	sh $< 4
+
+base.l2v2_s.part: lnv_s.sh $(transform_files)
+	sh $< 2
+
+base.l3v3_s.part: lnv_s.sh $(transform_files)
+	sh $< 3
+
+base.l4v4_s.part: lnv_s.sh $(transform_files)
+	sh $< 4
+
+base.ml_s.part: ml_s.sh $(transform_files)
+	sh $<
+
+base.ml1_s.part: ml1_s.sh $(transform_files)
+	sh $<
+
+base.mlv_s.part: mlv_s.sh $(transform_files)
+	sh $<
+
+base.ml1v1_s.part: ml1v1_s.sh $(transform_files)
+	sh $<
+
+EXTRA_DIST=base.lists.part $(transform_files) $(transform_scripts) $(dist_parts)
+
+CLEANFILES=$(scripts)
diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.in b/xorg-server/xkbdata.src/rules/compat/Makefile.in
new file mode 100644
index 000000000..10fa254b1
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/compat/Makefile.in
@@ -0,0 +1,377 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = rules/compat
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SCRIPTS = $(noinst_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+transform_files = layoutRename.lst variantRename.lst
+transform_scripts = ln_s.sh lnv_s.sh ml_s.sh mlv_s.sh ml1_s.sh ml1v_s.sh ml1v1_s.sh
+dist_parts = base.o_s.part
+scripts = base.l2_s.part base.l3_s.part base.l4_s.part \
+base.l2v2_s.part base.l3v3_s.part base.l4v4_s.part \
+base.ml_s.part base.ml1_s.part \
+base.mlv_s.part base.ml1v1_s.part \
+base.ml_s.part
+
+@USE_COMPAT_RULES_FALSE@noinst_SCRIPTS = 
+@USE_COMPAT_RULES_TRUE@noinst_SCRIPTS = $(scripts) $(dist_parts)
+EXTRA_DIST = base.lists.part $(transform_files) $(transform_scripts) $(dist_parts)
+CLEANFILES = $(scripts)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  rules/compat/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  rules/compat/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+
+base.l2_s.part: ln_s.sh $(transform_files)
+	sh $< 2
+
+base.l3_s.part: ln_s.sh $(transform_files)
+	sh $< 3
+
+base.l4_s.part: ln_s.sh $(transform_files)
+	sh $< 4
+
+base.l2v2_s.part: lnv_s.sh $(transform_files)
+	sh $< 2
+
+base.l3v3_s.part: lnv_s.sh $(transform_files)
+	sh $< 3
+
+base.l4v4_s.part: lnv_s.sh $(transform_files)
+	sh $< 4
+
+base.ml_s.part: ml_s.sh $(transform_files)
+	sh $<
+
+base.ml1_s.part: ml1_s.sh $(transform_files)
+	sh $<
+
+base.mlv_s.part: mlv_s.sh $(transform_files)
+	sh $<
+
+base.ml1v1_s.part: ml1v1_s.sh $(transform_files)
+	sh $<
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/rules/compat/base.lists.part b/xorg-server/xkbdata.src/rules/compat/base.lists.part
new file mode 100644
index 000000000..f1cf7ee22
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/compat/base.lists.part
@@ -0,0 +1,2 @@
+
+! $dvoraklayouts = br ca de ee es fr gb no pl se us
diff --git a/xorg-server/xkbdata.src/rules/compat/base.o_s.part b/xorg-server/xkbdata.src/rules/compat/base.o_s.part
new file mode 100644
index 000000000..8f1e9e452
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/compat/base.o_s.part
@@ -0,0 +1 @@
+  grp:shift_toggle	=	+group(shifts_toggle)
diff --git a/xorg-server/xkbdata.src/rules/compat/layoutRename.lst b/xorg-server/xkbdata.src/rules/compat/layoutRename.lst
new file mode 100644
index 000000000..cecda6d8a
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/compat/layoutRename.lst
@@ -0,0 +1,27 @@
+ar	ara
+ben	in(ben)
+bs	ba
+cs	rs
+cz_qwerty cz(qwerty)
+dev	in(deva)
+dvorak	us(dvorak)
+dzdwi	bt
+el	gr
+en_US	latin
+guj	in(guj)
+gur	in(guru)
+iu	ca(ike)
+lo	la
+kan	in(kan)
+mi	mao
+ml	in(mal)
+ogham	ie(ogam)
+ori	ie(ori)
+sapmi	no(smi)
+sr	srp
+syr	sy(syc)
+tel	in(tel)
+tml	in(tam)
+yu	srp
+fr-latin9 fr(latin9)
+us_intl	us(alt-intl)
diff --git a/xorg-server/xkbdata.src/rules/compat/ln_s.sh b/xorg-server/xkbdata.src/rules/compat/ln_s.sh
new file mode 100644
index 000000000..00c2f593c
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/compat/ln_s.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+variant=$1
+
+INDIR=`dirname $0`
+OUTFILE=base.l${variant}_s.part
+
+> $OUTFILE
+
+awk '{ 
+  printf "  %s		=	+%s%%(v['${variant}']):'${variant}'\n", $1, $2; 
+}' < $INDIR/layoutRename.lst >> $OUTFILE
+
+awk '{ 
+  printf "  %s(%s)	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4; 
+}' < $INDIR/variantRename.lst >> $OUTFILE
diff --git a/xorg-server/xkbdata.src/rules/compat/lnv_s.sh b/xorg-server/xkbdata.src/rules/compat/lnv_s.sh
new file mode 100644
index 000000000..ae699f95b
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/compat/lnv_s.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+variant=$1
+
+INDIR=`dirname $0`
+OUTFILE=base.l${variant}v${variant}_s.part
+
+> $OUTFILE
+
+awk '{ 
+  printf "  %s		%s	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4; 
+}' < $INDIR/variantRename.lst >> $OUTFILE
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
new file mode 100644
index 000000000..210d1b655
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+INDIR=`dirname $0`
+OUTFILE=base.ml1_s.part
+
+> $OUTFILE
+
+awk '{ 
+  printf "  *		%s			=	pc+%s%%(v[1])\n", $1, $2; 
+}' < $INDIR/layoutRename.lst >> $OUTFILE
+
+awk '{ 
+  printf "  *		%s(%s)			=	pc+%s(%s)\n", $1, $2, $3, $4; 
+}' < $INDIR/variantRename.lst >> $OUTFILE
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh
new file mode 100644
index 000000000..9edcb8e8c
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+INDIR=`dirname $0`
+OUTFILE=base.ml1v1_s.part
+
+> $OUTFILE
+
+awk '{ 
+  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
+}' < $INDIR/variantRename.lst >> $OUTFILE
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh
new file mode 100644
index 000000000..02ae5726d
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+INDIR=`dirname $0`
+OUTFILE=base.ml1v_s.part
+
+> $OUTFILE
+
+awk '{ 
+  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
+}' < $INDIR/variantRename.lst >> $OUTFILE
diff --git a/xorg-server/xkbdata.src/rules/compat/ml_s.sh b/xorg-server/xkbdata.src/rules/compat/ml_s.sh
new file mode 100644
index 000000000..f35087380
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/compat/ml_s.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+INDIR=`dirname $0`
+OUTFILE=base.ml_s.part
+
+> $OUTFILE
+
+awk '{ 
+  printf "  *		%s			=	pc+%s\n", $1, $2; 
+}' < $INDIR/layoutRename.lst >> $OUTFILE
+
+awk '{ 
+  printf "  *		%s(%s)			=	pc+%s(%s)\n", $1, $2, $3, $4; 
+}' < $INDIR/variantRename.lst >> $OUTFILE
diff --git a/xorg-server/xkbdata.src/rules/compat/mlv_s.sh b/xorg-server/xkbdata.src/rules/compat/mlv_s.sh
new file mode 100644
index 000000000..ea644dcab
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/compat/mlv_s.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+INDIR=`dirname $0`
+OUTFILE=base.mlv_s.part
+
+> $OUTFILE
+
+awk '{ 
+  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
+}' < $INDIR/variantRename.lst >> $OUTFILE
diff --git a/xorg-server/xkbdata.src/rules/compat/variantRename.lst b/xorg-server/xkbdata.src/rules/compat/variantRename.lst
new file mode 100644
index 000000000..e6a99e9de
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/compat/variantRename.lst
@@ -0,0 +1,47 @@
+ben	basic		in	ben
+ben	probhat		in	ben_probhat	
+dev	basic		in	deva
+dvorak	$dvoraklayouts	%v	dvorak
+dvorak	basic		us	dvorak
+dvorak	pl_basic	pl	dvorak
+dvorak	pl		pl	dvorak_quotes
+dvorak	pl_altquotes	pl	dvorak_altquotes
+dzdwi	basic		bt	basic
+fi	basic		fi	classic
+ge	azerty_tskapo	fr	geo
+guj	basic		in	guj
+gur	basic		in	guru
+ie	laptop		ie	basic
+ie	CloGaelachLaptop	ie	CloGaelach
+il	si1452		ie	basic
+iu	basic		ca	ike
+lo	basic		la	basic
+kan	basic		in	kan
+mal	basic		in	mal
+mal	mlplusnum	in	mal
+ogham	basic		ie	ogam
+ogham	laptop		ie	ogam
+ogham	is434		ie	ogam_is434
+ogham	is434laptop	ie	ogam_is434
+ori	basic		in	ori
+ro	de		ro	winkeys
+ro	us		ro	std
+ro	academic	ro	std
+ro	std_comma	ro	std
+ro	comma		ro	basic	
+ru	os		ru	os_legacy
+sapmi	basic		no	smi
+sapmi	nodeadkeys	no	smi_nodeadkeys
+sapmi	sefi		fi	smi
+sin	phonetic-static	in	sin_phonetic	
+syr	basic		sy	syc
+syr	phonetic	sy	syc_phonetic
+tam	INSCRIPT	in	tam
+tam	UNI		in	tam_unicode
+tam	TAB		in	tam_TAB
+tam	TSCII		in	tam_TSCII
+tel	basic		in	tel
+yu	basic		srp	latin
+yu	unicode		srp	latinunicode
+yu	yz		srp	latinyz
+yu	unicodeyz	srp	latinunicodeyz
diff --git a/xorg-server/xkbdata.src/rules/evdev b/xorg-server/xkbdata.src/rules/evdev
new file mode 100644
index 000000000..d58b15b1c
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/evdev
@@ -0,0 +1,953 @@
+// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY merge.sh FROM rules/*.part
+// $Xorg: xfree86,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
+
+//
+//  Rules for resolving XKB components for use with XFree86
+//  Copyright 1996 by Joseph Moss
+//
+//  2002 Modifier: Ivan Pascal      The XFree86 Project
+//  $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.79 2004/01/09 00:16:01 dawes Exp $
+//
+
+// If you want non-latin layouts implicitly include the en_US layout
+// uncomment lines below
+//! $nonlatin = am ara ben bd bg bt by cs deva ge gh gr guj guru il \
+//              in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \
+//              ru scc sy syr tel th tj tam ua uz
+
+// PC models
+! $pcmodels = pc101 pc102 pc104 pc105
+
+// Microsoft models (using MS geometry)
+! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose
+
+// PC geometries - they have special geometry but symbols are mostly pc105
+! $pcgeometries = abnt2 latitude jp106 kr106
+
+// Layouts that provide further specializations for the OLPC
+! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us 
+
+! $macbooks = macbook78 macbook79
+! $maclaptop = ibook powerbook macbook78 macbook79
+! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
+
+! $macvendorlayouts = ch de dk es fi fr gb is it latam nl no pt se us
+
+! $azerty = be fr
+! $qwertz = al cz de hr hu ro si sk 
+
+! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \
+              acer_c300 acer_ferrari4k acer_laptop \
+              acpi airkey \
+              apple armada asus_laptop azonaRF2300 \
+              benqx brother \
+              btc5113rf btc5126t btc6301urf btc9000 btc9000a btc9001ah btc5090 btc9019u \
+              cherryblue cherrybluea cherryblueb cherrycyboard \
+              chicony chicony0108 chicony9885 \
+              compaqeak8 compaqik7 compaqik13 compaqik18 \
+              cymotionlinux \
+              dell dellm65 inspiron precision_m dellusbmm dtk2000 \
+              emachines ennyah_dkb1008 evdev fscaa1667g \
+              genius geniuscomfy geniuscomfy2 geniuskb19e \
+              gyration honeywell_euroboard \
+              hp2501 hp2505 hp5xx hp500fa hp5181 hp5185 \
+              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
+              ibm_spacesaver ipaq inspiron intel latitude \
+              logiaccess logicda logicink \
+              logiex110 logiclx300 \
+              logiinkse logiinkseusb logiitc logiik \
+              logitech_base itouch logiultrax \
+              logitech_g15 \
+	      logidinovo logidinovoedge \
+              microsoft7000 microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
+              microsoftoffice microsoftmult \
+              mx1998 mx2500 mx2750 \
+              oretec \
+              presario propeller \
+              qtronix \
+              rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \
+              samsung4500 samsung4510 \
+              scorpius silvercrest \
+              sk1300 sk2500 sk6200 sk7100 sp_inet \
+              sven sven303 symplon \
+              toshiba_s3000 trust trustda \
+              yahoo
+
+// all layouts with 3rd and 4th groups
+! $threelevellayouts = al az \
+              be br bt \
+              ca ch cs cz \
+              de dk \
+              ee es \
+              fi fo fr \
+              gb gr \
+              hu \
+              ie ir is it \
+              kg \
+              latam \
+              lk lt \
+              mn mt \
+              nl no \
+              pl pt \
+              ro \
+              se sk \
+              tr \
+              us \
+              vn \
+              za
+
+
+! $dvoraklayouts = br ca de ee es fr gb no pl se us
+
+! model		=	keycodes
+  pc98		=	evdev(pc98)
+  abnt2		=	evdev(abnt2)
+  jp106		=	evdev(jp106)
+  *		=	evdev
+
+! layout[1]	=	keycodes
+  $azerty       =       +aliases(azerty)
+  $qwertz       =       +aliases(qwertz)
+  *             =       +aliases(qwerty)
+
+! layout	=	keycodes
+  $azerty       =       +aliases(azerty)
+  $qwertz       =       +aliases(qwertz)
+  *             =       +aliases(qwerty)
+
+! option	=	keycodes
+  apple:badmap		=	+macintosh(badmap)
+  apple:goodmap		=	+macintosh(goodmap)
+
+! model		layout	=	geometry
+  thinkpad     us              =       thinkpad(us)
+
+! model		=	geometry
+  microsoftelite	=	microsoft(elite)
+ $msmodels	=	microsoft(natural)
+  dell101	=	dell(dell101)
+  dellm65	=	dell(dellm65)
+  flexpro	=	keytronic(FlexPro)
+  hp6000	=	hp(omnibook)
+  omnikey101	=	northgate(omnikey101)
+ $pcmodels	=	pc(%m)
+ $pcgeometries	=	pc(%m)
+  everex	=	everex(STEPnote)
+  thinkpad	=	thinkpad(intl)
+  thinkpad60	=	thinkpad(60)
+  thinkpadz60	=	thinkpad(60)
+  winbook	=	winbook(XP5)
+  pc98		=	nec(pc98)
+ $macbooks      =       macintosh(%m)
+ $macs		=	macintosh(macintosh)
+  hhk		=	hhk(basic)
+  kinesis	=	kinesis(model100)
+  *		=       pc(pc104)
+
+! model		layout		variant		=	symbols
+  *		ben		basic		=	pc+in(ben)
+  *		ben		probhat		=	pc+in(ben_probhat)
+  *		dev		basic		=	pc+in(deva)
+  *		dvorak		$dvoraklayouts		=	pc+%v(dvorak)
+  *		dvorak		basic		=	pc+us(dvorak)
+  *		dvorak		pl_basic		=	pc+pl(dvorak)
+  *		dvorak		pl		=	pc+pl(dvorak_quotes)
+  *		dvorak		pl_altquotes		=	pc+pl(dvorak_altquotes)
+  *		dzdwi		basic		=	pc+bt(basic)
+  *		fi		basic		=	pc+fi(classic)
+  *		ge		azerty_tskapo		=	pc+fr(geo)
+  *		guj		basic		=	pc+in(guj)
+  *		gur		basic		=	pc+in(guru)
+  *		ie		laptop		=	pc+ie(basic)
+  *		ie		CloGaelachLaptop		=	pc+ie(CloGaelach)
+  *		il		si1452		=	pc+ie(basic)
+  *		iu		basic		=	pc+ca(ike)
+  *		lo		basic		=	pc+la(basic)
+  *		kan		basic		=	pc+in(kan)
+  *		mal		basic		=	pc+in(mal)
+  *		mal		mlplusnum		=	pc+in(mal)
+  *		ogham		basic		=	pc+ie(ogam)
+  *		ogham		laptop		=	pc+ie(ogam)
+  *		ogham		is434		=	pc+ie(ogam_is434)
+  *		ogham		is434laptop		=	pc+ie(ogam_is434)
+  *		ori		basic		=	pc+in(ori)
+  *		ro		de		=	pc+ro(winkeys)
+  *		ro		us		=	pc+ro(std)
+  *		ro		academic		=	pc+ro(std)
+  *		ro		std_comma		=	pc+ro(std)
+  *		ro		comma		=	pc+ro(basic)
+  *		ru		os		=	pc+ru(os_legacy)
+  *		sapmi		basic		=	pc+no(smi)
+  *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
+  *		sapmi		sefi		=	pc+fi(smi)
+  *		sin		phonetic-static		=	pc+in(sin_phonetic)
+  *		syr		basic		=	pc+sy(syc)
+  *		syr		phonetic		=	pc+sy(syc_phonetic)
+  *		tam		INSCRIPT		=	pc+in(tam)
+  *		tam		UNI		=	pc+in(tam_unicode)
+  *		tam		TAB		=	pc+in(tam_TAB)
+  *		tam		TSCII		=	pc+in(tam_TSCII)
+  *		tel		basic		=	pc+in(tel)
+  *		yu		basic		=	pc+srp(latin)
+  *		yu		unicode		=	pc+srp(latinunicode)
+  *		yu		yz		=	pc+srp(latinyz)
+  *		yu		unicodeyz		=	pc+srp(latinunicodeyz)
+  classmate	us		intl		=	pc+us(classmate-intl)
+  classmate	us		alt-intl	=	pc+us(classmate-alt-intl)
+  classmate	us		altgr-intl	=	pc+us(classmate-altgr-intl)
+
+! model		layout				=	symbols
+  *		ar			=	pc+ara
+  *		ben			=	pc+in(ben)
+  *		bs			=	pc+ba
+  *		cs			=	pc+rs
+  *		cz_qwerty			=	pc+cz(qwerty)
+  *		dev			=	pc+in(deva)
+  *		dvorak			=	pc+us(dvorak)
+  *		dzdwi			=	pc+bt
+  *		el			=	pc+gr
+  *		en_US			=	pc+latin
+  *		guj			=	pc+in(guj)
+  *		gur			=	pc+in(guru)
+  *		iu			=	pc+ca(ike)
+  *		lo			=	pc+la
+  *		kan			=	pc+in(kan)
+  *		mi			=	pc+mao
+  *		ml			=	pc+in(mal)
+  *		ogham			=	pc+ie(ogam)
+  *		ori			=	pc+ie(ori)
+  *		sapmi			=	pc+no(smi)
+  *		sr			=	pc+srp
+  *		syr			=	pc+sy(syc)
+  *		tel			=	pc+in(tel)
+  *		tml			=	pc+in(tam)
+  *		yu			=	pc+srp
+  *		fr-latin9			=	pc+fr(latin9)
+  *		us_intl			=	pc+us(alt-intl)
+  *		ben(basic)			=	pc+in(ben)
+  *		ben(probhat)			=	pc+in(ben_probhat)
+  *		dev(basic)			=	pc+in(deva)
+  *		dvorak($dvoraklayouts)			=	pc+%v(dvorak)
+  *		dvorak(basic)			=	pc+us(dvorak)
+  *		dvorak(pl_basic)			=	pc+pl(dvorak)
+  *		dvorak(pl)			=	pc+pl(dvorak_quotes)
+  *		dvorak(pl_altquotes)			=	pc+pl(dvorak_altquotes)
+  *		dzdwi(basic)			=	pc+bt(basic)
+  *		fi(basic)			=	pc+fi(classic)
+  *		ge(azerty_tskapo)			=	pc+fr(geo)
+  *		guj(basic)			=	pc+in(guj)
+  *		gur(basic)			=	pc+in(guru)
+  *		ie(laptop)			=	pc+ie(basic)
+  *		ie(CloGaelachLaptop)			=	pc+ie(CloGaelach)
+  *		il(si1452)			=	pc+ie(basic)
+  *		iu(basic)			=	pc+ca(ike)
+  *		lo(basic)			=	pc+la(basic)
+  *		kan(basic)			=	pc+in(kan)
+  *		mal(basic)			=	pc+in(mal)
+  *		mal(mlplusnum)			=	pc+in(mal)
+  *		ogham(basic)			=	pc+ie(ogam)
+  *		ogham(laptop)			=	pc+ie(ogam)
+  *		ogham(is434)			=	pc+ie(ogam_is434)
+  *		ogham(is434laptop)			=	pc+ie(ogam_is434)
+  *		ori(basic)			=	pc+in(ori)
+  *		ro(de)			=	pc+ro(winkeys)
+  *		ro(us)			=	pc+ro(std)
+  *		ro(academic)			=	pc+ro(std)
+  *		ro(std_comma)			=	pc+ro(std)
+  *		ro(comma)			=	pc+ro(basic)
+  *		ru(os)			=	pc+ru(os_legacy)
+  *		sapmi(basic)			=	pc+no(smi)
+  *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
+  *		sapmi(sefi)			=	pc+fi(smi)
+  *		sin(phonetic-static)			=	pc+in(sin_phonetic)
+  *		syr(basic)			=	pc+sy(syc)
+  *		syr(phonetic)			=	pc+sy(syc_phonetic)
+  *		tam(INSCRIPT)			=	pc+in(tam)
+  *		tam(UNI)			=	pc+in(tam_unicode)
+  *		tam(TAB)			=	pc+in(tam_TAB)
+  *		tam(TSCII)			=	pc+in(tam_TSCII)
+  *		tel(basic)			=	pc+in(tel)
+  *		yu(basic)			=	pc+srp(latin)
+  *		yu(unicode)			=	pc+srp(latinunicode)
+  *		yu(yz)			=	pc+srp(latinyz)
+  *		yu(unicodeyz)			=	pc+srp(latinunicodeyz)
+  ataritt	$nonlatin		=	xfree68_vndr/ataritt(us)+%l%(v):2
+  ataritt	*			=	xfree68_vndr/ataritt(us)+%l%(v)
+  amiga		$nonlatin		=	xfree68_vndr/amiga(usa1)+%l%(v):2
+  amiga		*			=	xfree68_vndr/amiga(usa1)+%l%(v)
+  classmate	us			=	pc+%l(classmate)
+  sun4		$nonlatin		=	latin+sun_vndr/us(sun4)+%l%(v):2
+  sun4		*			=	latin+sun_vndr/us(sun4)+%l%(v)
+  sun5		$nonlatin		=	latin+sun_vndr/us(sun5)+%l%(v):2
+  sun5		*			=	latin+sun_vndr/us(sun5)+%l%(v)
+  sun6		us			=	sun_vndr/us(type6)
+  sun6		en_US			=	sun_vndr/us(type6)+iso9995-3(basic)
+  sun6		*			=	sun_vndr/us(type6)+%l%(v)
+  pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
+  macintosh_old	us			=	macintosh_vndr/us(oldmac)
+  macintosh_old	en_US			=	macintosh_vndr/us(oldmac)
+  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v)
+  macintosh_old	$nonlatin		=	macintosh_vndr/us(oldmac)+%l%(v):2
+  macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
+ $macs		en_US			=	pc+macintosh_vndr/us(extended)
+ $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
+  olpc		$olpclayouts		=	olpc+%l%(m)
+  olpc		*			=	olpc+%l%(v)
+  thinkpad   	br			=	pc+br(thinkpad)
+  *	   	$nonlatin		=	pc+us+%l%(v):2
+  *		*			=	pc+%l%(v)
+
+! model		layout[1]			=	symbols
+  *		ar			=	pc+ara%(v[1])
+  *		ben			=	pc+in(ben)%(v[1])
+  *		bs			=	pc+ba%(v[1])
+  *		cs			=	pc+rs%(v[1])
+  *		cz_qwerty			=	pc+cz(qwerty)%(v[1])
+  *		dev			=	pc+in(deva)%(v[1])
+  *		dvorak			=	pc+us(dvorak)%(v[1])
+  *		dzdwi			=	pc+bt%(v[1])
+  *		el			=	pc+gr%(v[1])
+  *		en_US			=	pc+latin%(v[1])
+  *		guj			=	pc+in(guj)%(v[1])
+  *		gur			=	pc+in(guru)%(v[1])
+  *		iu			=	pc+ca(ike)%(v[1])
+  *		lo			=	pc+la%(v[1])
+  *		kan			=	pc+in(kan)%(v[1])
+  *		mi			=	pc+mao%(v[1])
+  *		ml			=	pc+in(mal)%(v[1])
+  *		ogham			=	pc+ie(ogam)%(v[1])
+  *		ori			=	pc+ie(ori)%(v[1])
+  *		sapmi			=	pc+no(smi)%(v[1])
+  *		sr			=	pc+srp%(v[1])
+  *		syr			=	pc+sy(syc)%(v[1])
+  *		tel			=	pc+in(tel)%(v[1])
+  *		tml			=	pc+in(tam)%(v[1])
+  *		yu			=	pc+srp%(v[1])
+  *		fr-latin9			=	pc+fr(latin9)%(v[1])
+  *		us_intl			=	pc+us(alt-intl)%(v[1])
+  *		ben(basic)			=	pc+in(ben)
+  *		ben(probhat)			=	pc+in(ben_probhat)
+  *		dev(basic)			=	pc+in(deva)
+  *		dvorak($dvoraklayouts)			=	pc+%v(dvorak)
+  *		dvorak(basic)			=	pc+us(dvorak)
+  *		dvorak(pl_basic)			=	pc+pl(dvorak)
+  *		dvorak(pl)			=	pc+pl(dvorak_quotes)
+  *		dvorak(pl_altquotes)			=	pc+pl(dvorak_altquotes)
+  *		dzdwi(basic)			=	pc+bt(basic)
+  *		fi(basic)			=	pc+fi(classic)
+  *		ge(azerty_tskapo)			=	pc+fr(geo)
+  *		guj(basic)			=	pc+in(guj)
+  *		gur(basic)			=	pc+in(guru)
+  *		ie(laptop)			=	pc+ie(basic)
+  *		ie(CloGaelachLaptop)			=	pc+ie(CloGaelach)
+  *		il(si1452)			=	pc+ie(basic)
+  *		iu(basic)			=	pc+ca(ike)
+  *		lo(basic)			=	pc+la(basic)
+  *		kan(basic)			=	pc+in(kan)
+  *		mal(basic)			=	pc+in(mal)
+  *		mal(mlplusnum)			=	pc+in(mal)
+  *		ogham(basic)			=	pc+ie(ogam)
+  *		ogham(laptop)			=	pc+ie(ogam)
+  *		ogham(is434)			=	pc+ie(ogam_is434)
+  *		ogham(is434laptop)			=	pc+ie(ogam_is434)
+  *		ori(basic)			=	pc+in(ori)
+  *		ro(de)			=	pc+ro(winkeys)
+  *		ro(us)			=	pc+ro(std)
+  *		ro(academic)			=	pc+ro(std)
+  *		ro(std_comma)			=	pc+ro(std)
+  *		ro(comma)			=	pc+ro(basic)
+  *		ru(os)			=	pc+ru(os_legacy)
+  *		sapmi(basic)			=	pc+no(smi)
+  *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
+  *		sapmi(sefi)			=	pc+fi(smi)
+  *		sin(phonetic-static)			=	pc+in(sin_phonetic)
+  *		syr(basic)			=	pc+sy(syc)
+  *		syr(phonetic)			=	pc+sy(syc_phonetic)
+  *		tam(INSCRIPT)			=	pc+in(tam)
+  *		tam(UNI)			=	pc+in(tam_unicode)
+  *		tam(TAB)			=	pc+in(tam_TAB)
+  *		tam(TSCII)			=	pc+in(tam_TSCII)
+  *		tel(basic)			=	pc+in(tel)
+  *		yu(basic)			=	pc+srp(latin)
+  *		yu(unicode)			=	pc+srp(latinunicode)
+  *		yu(yz)			=	pc+srp(latinyz)
+  *		yu(unicodeyz)			=	pc+srp(latinunicodeyz)
+  ataritt	*			=	xfree68_vndr/ataritt(us)+%l[1]%(v[1])
+  amiga		*			=	xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
+  sun4		*			=	latin+sun_vndr/us(sun4)+%l[1]%(v[1])
+  sun5		*			=	latin+sun_vndr/us(sun5)+%l[1]%(v[1])
+  macintosh_old	us			=	macintosh_vndr/us(oldmac)
+  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
+  macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l[1]%(v[1])
+ $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l[1]%(v[1])
+  thinkpad	br			=	pc+%l[1](thinkpad)
+  *		*			=	pc+%l[1]%(v[1])
+
+! model		layout[1]	variant[1]	=	symbols
+  *		ben		basic		=	pc+in(ben)
+  *		ben		probhat		=	pc+in(ben_probhat)
+  *		dev		basic		=	pc+in(deva)
+  *		dvorak		$dvoraklayouts		=	pc+%v(dvorak)
+  *		dvorak		basic		=	pc+us(dvorak)
+  *		dvorak		pl_basic		=	pc+pl(dvorak)
+  *		dvorak		pl		=	pc+pl(dvorak_quotes)
+  *		dvorak		pl_altquotes		=	pc+pl(dvorak_altquotes)
+  *		dzdwi		basic		=	pc+bt(basic)
+  *		fi		basic		=	pc+fi(classic)
+  *		ge		azerty_tskapo		=	pc+fr(geo)
+  *		guj		basic		=	pc+in(guj)
+  *		gur		basic		=	pc+in(guru)
+  *		ie		laptop		=	pc+ie(basic)
+  *		ie		CloGaelachLaptop		=	pc+ie(CloGaelach)
+  *		il		si1452		=	pc+ie(basic)
+  *		iu		basic		=	pc+ca(ike)
+  *		lo		basic		=	pc+la(basic)
+  *		kan		basic		=	pc+in(kan)
+  *		mal		basic		=	pc+in(mal)
+  *		mal		mlplusnum		=	pc+in(mal)
+  *		ogham		basic		=	pc+ie(ogam)
+  *		ogham		laptop		=	pc+ie(ogam)
+  *		ogham		is434		=	pc+ie(ogam_is434)
+  *		ogham		is434laptop		=	pc+ie(ogam_is434)
+  *		ori		basic		=	pc+in(ori)
+  *		ro		de		=	pc+ro(winkeys)
+  *		ro		us		=	pc+ro(std)
+  *		ro		academic		=	pc+ro(std)
+  *		ro		std_comma		=	pc+ro(std)
+  *		ro		comma		=	pc+ro(basic)
+  *		ru		os		=	pc+ru(os_legacy)
+  *		sapmi		basic		=	pc+no(smi)
+  *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
+  *		sapmi		sefi		=	pc+fi(smi)
+  *		sin		phonetic-static		=	pc+in(sin_phonetic)
+  *		syr		basic		=	pc+sy(syc)
+  *		syr		phonetic		=	pc+sy(syc_phonetic)
+  *		tam		INSCRIPT		=	pc+in(tam)
+  *		tam		UNI		=	pc+in(tam_unicode)
+  *		tam		TAB		=	pc+in(tam_TAB)
+  *		tam		TSCII		=	pc+in(tam_TSCII)
+  *		tel		basic		=	pc+in(tel)
+  *		yu		basic		=	pc+srp(latin)
+  *		yu		unicode		=	pc+srp(latinunicode)
+  *		yu		yz		=	pc+srp(latinyz)
+  *		yu		unicodeyz		=	pc+srp(latinunicodeyz)
+
+! layout[2]	=	symbols
+  ar		=	+ara%(v[2]):2
+  ben		=	+in(ben)%(v[2]):2
+  bs		=	+ba%(v[2]):2
+  cs		=	+rs%(v[2]):2
+  cz_qwerty		=	+cz(qwerty)%(v[2]):2
+  dev		=	+in(deva)%(v[2]):2
+  dvorak		=	+us(dvorak)%(v[2]):2
+  dzdwi		=	+bt%(v[2]):2
+  el		=	+gr%(v[2]):2
+  en_US		=	+latin%(v[2]):2
+  guj		=	+in(guj)%(v[2]):2
+  gur		=	+in(guru)%(v[2]):2
+  iu		=	+ca(ike)%(v[2]):2
+  lo		=	+la%(v[2]):2
+  kan		=	+in(kan)%(v[2]):2
+  mi		=	+mao%(v[2]):2
+  ml		=	+in(mal)%(v[2]):2
+  ogham		=	+ie(ogam)%(v[2]):2
+  ori		=	+ie(ori)%(v[2]):2
+  sapmi		=	+no(smi)%(v[2]):2
+  sr		=	+srp%(v[2]):2
+  syr		=	+sy(syc)%(v[2]):2
+  tel		=	+in(tel)%(v[2]):2
+  tml		=	+in(tam)%(v[2]):2
+  yu		=	+srp%(v[2]):2
+  fr-latin9		=	+fr(latin9)%(v[2]):2
+  us_intl		=	+us(alt-intl)%(v[2]):2
+  ben(basic)	=	+in(ben):2
+  ben(probhat)	=	+in(ben_probhat):2
+  dev(basic)	=	+in(deva):2
+  dvorak($dvoraklayouts)	=	+%v(dvorak):2
+  dvorak(basic)	=	+us(dvorak):2
+  dvorak(pl_basic)	=	+pl(dvorak):2
+  dvorak(pl)	=	+pl(dvorak_quotes):2
+  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):2
+  dzdwi(basic)	=	+bt(basic):2
+  fi(basic)	=	+fi(classic):2
+  ge(azerty_tskapo)	=	+fr(geo):2
+  guj(basic)	=	+in(guj):2
+  gur(basic)	=	+in(guru):2
+  ie(laptop)	=	+ie(basic):2
+  ie(CloGaelachLaptop)	=	+ie(CloGaelach):2
+  il(si1452)	=	+ie(basic):2
+  iu(basic)	=	+ca(ike):2
+  lo(basic)	=	+la(basic):2
+  kan(basic)	=	+in(kan):2
+  mal(basic)	=	+in(mal):2
+  mal(mlplusnum)	=	+in(mal):2
+  ogham(basic)	=	+ie(ogam):2
+  ogham(laptop)	=	+ie(ogam):2
+  ogham(is434)	=	+ie(ogam_is434):2
+  ogham(is434laptop)	=	+ie(ogam_is434):2
+  ori(basic)	=	+in(ori):2
+  ro(de)	=	+ro(winkeys):2
+  ro(us)	=	+ro(std):2
+  ro(academic)	=	+ro(std):2
+  ro(std_comma)	=	+ro(std):2
+  ro(comma)	=	+ro(basic):2
+  ru(os)	=	+ru(os_legacy):2
+  sapmi(basic)	=	+no(smi):2
+  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):2
+  sapmi(sefi)	=	+fi(smi):2
+  sin(phonetic-static)	=	+in(sin_phonetic):2
+  syr(basic)	=	+sy(syc):2
+  syr(phonetic)	=	+sy(syc_phonetic):2
+  tam(INSCRIPT)	=	+in(tam):2
+  tam(UNI)	=	+in(tam_unicode):2
+  tam(TAB)	=	+in(tam_TAB):2
+  tam(TSCII)	=	+in(tam_TSCII):2
+  tel(basic)	=	+in(tel):2
+  yu(basic)	=	+srp(latin):2
+  yu(unicode)	=	+srp(latinunicode):2
+  yu(yz)	=	+srp(latinyz):2
+  yu(unicodeyz)	=	+srp(latinunicodeyz):2
+  *		=	+%l[2]%(v[2]):2
+
+! layout[3]	=	symbols
+  ar		=	+ara%(v[3]):3
+  ben		=	+in(ben)%(v[3]):3
+  bs		=	+ba%(v[3]):3
+  cs		=	+rs%(v[3]):3
+  cz_qwerty		=	+cz(qwerty)%(v[3]):3
+  dev		=	+in(deva)%(v[3]):3
+  dvorak		=	+us(dvorak)%(v[3]):3
+  dzdwi		=	+bt%(v[3]):3
+  el		=	+gr%(v[3]):3
+  en_US		=	+latin%(v[3]):3
+  guj		=	+in(guj)%(v[3]):3
+  gur		=	+in(guru)%(v[3]):3
+  iu		=	+ca(ike)%(v[3]):3
+  lo		=	+la%(v[3]):3
+  kan		=	+in(kan)%(v[3]):3
+  mi		=	+mao%(v[3]):3
+  ml		=	+in(mal)%(v[3]):3
+  ogham		=	+ie(ogam)%(v[3]):3
+  ori		=	+ie(ori)%(v[3]):3
+  sapmi		=	+no(smi)%(v[3]):3
+  sr		=	+srp%(v[3]):3
+  syr		=	+sy(syc)%(v[3]):3
+  tel		=	+in(tel)%(v[3]):3
+  tml		=	+in(tam)%(v[3]):3
+  yu		=	+srp%(v[3]):3
+  fr-latin9		=	+fr(latin9)%(v[3]):3
+  us_intl		=	+us(alt-intl)%(v[3]):3
+  ben(basic)	=	+in(ben):3
+  ben(probhat)	=	+in(ben_probhat):3
+  dev(basic)	=	+in(deva):3
+  dvorak($dvoraklayouts)	=	+%v(dvorak):3
+  dvorak(basic)	=	+us(dvorak):3
+  dvorak(pl_basic)	=	+pl(dvorak):3
+  dvorak(pl)	=	+pl(dvorak_quotes):3
+  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):3
+  dzdwi(basic)	=	+bt(basic):3
+  fi(basic)	=	+fi(classic):3
+  ge(azerty_tskapo)	=	+fr(geo):3
+  guj(basic)	=	+in(guj):3
+  gur(basic)	=	+in(guru):3
+  ie(laptop)	=	+ie(basic):3
+  ie(CloGaelachLaptop)	=	+ie(CloGaelach):3
+  il(si1452)	=	+ie(basic):3
+  iu(basic)	=	+ca(ike):3
+  lo(basic)	=	+la(basic):3
+  kan(basic)	=	+in(kan):3
+  mal(basic)	=	+in(mal):3
+  mal(mlplusnum)	=	+in(mal):3
+  ogham(basic)	=	+ie(ogam):3
+  ogham(laptop)	=	+ie(ogam):3
+  ogham(is434)	=	+ie(ogam_is434):3
+  ogham(is434laptop)	=	+ie(ogam_is434):3
+  ori(basic)	=	+in(ori):3
+  ro(de)	=	+ro(winkeys):3
+  ro(us)	=	+ro(std):3
+  ro(academic)	=	+ro(std):3
+  ro(std_comma)	=	+ro(std):3
+  ro(comma)	=	+ro(basic):3
+  ru(os)	=	+ru(os_legacy):3
+  sapmi(basic)	=	+no(smi):3
+  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):3
+  sapmi(sefi)	=	+fi(smi):3
+  sin(phonetic-static)	=	+in(sin_phonetic):3
+  syr(basic)	=	+sy(syc):3
+  syr(phonetic)	=	+sy(syc_phonetic):3
+  tam(INSCRIPT)	=	+in(tam):3
+  tam(UNI)	=	+in(tam_unicode):3
+  tam(TAB)	=	+in(tam_TAB):3
+  tam(TSCII)	=	+in(tam_TSCII):3
+  tel(basic)	=	+in(tel):3
+  yu(basic)	=	+srp(latin):3
+  yu(unicode)	=	+srp(latinunicode):3
+  yu(yz)	=	+srp(latinyz):3
+  yu(unicodeyz)	=	+srp(latinunicodeyz):3
+  *		=	+%l[3]%(v[3]):3
+
+! layout[4]	=	symbols
+  ar		=	+ara%(v[4]):4
+  ben		=	+in(ben)%(v[4]):4
+  bs		=	+ba%(v[4]):4
+  cs		=	+rs%(v[4]):4
+  cz_qwerty		=	+cz(qwerty)%(v[4]):4
+  dev		=	+in(deva)%(v[4]):4
+  dvorak		=	+us(dvorak)%(v[4]):4
+  dzdwi		=	+bt%(v[4]):4
+  el		=	+gr%(v[4]):4
+  en_US		=	+latin%(v[4]):4
+  guj		=	+in(guj)%(v[4]):4
+  gur		=	+in(guru)%(v[4]):4
+  iu		=	+ca(ike)%(v[4]):4
+  lo		=	+la%(v[4]):4
+  kan		=	+in(kan)%(v[4]):4
+  mi		=	+mao%(v[4]):4
+  ml		=	+in(mal)%(v[4]):4
+  ogham		=	+ie(ogam)%(v[4]):4
+  ori		=	+ie(ori)%(v[4]):4
+  sapmi		=	+no(smi)%(v[4]):4
+  sr		=	+srp%(v[4]):4
+  syr		=	+sy(syc)%(v[4]):4
+  tel		=	+in(tel)%(v[4]):4
+  tml		=	+in(tam)%(v[4]):4
+  yu		=	+srp%(v[4]):4
+  fr-latin9		=	+fr(latin9)%(v[4]):4
+  us_intl		=	+us(alt-intl)%(v[4]):4
+  ben(basic)	=	+in(ben):4
+  ben(probhat)	=	+in(ben_probhat):4
+  dev(basic)	=	+in(deva):4
+  dvorak($dvoraklayouts)	=	+%v(dvorak):4
+  dvorak(basic)	=	+us(dvorak):4
+  dvorak(pl_basic)	=	+pl(dvorak):4
+  dvorak(pl)	=	+pl(dvorak_quotes):4
+  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):4
+  dzdwi(basic)	=	+bt(basic):4
+  fi(basic)	=	+fi(classic):4
+  ge(azerty_tskapo)	=	+fr(geo):4
+  guj(basic)	=	+in(guj):4
+  gur(basic)	=	+in(guru):4
+  ie(laptop)	=	+ie(basic):4
+  ie(CloGaelachLaptop)	=	+ie(CloGaelach):4
+  il(si1452)	=	+ie(basic):4
+  iu(basic)	=	+ca(ike):4
+  lo(basic)	=	+la(basic):4
+  kan(basic)	=	+in(kan):4
+  mal(basic)	=	+in(mal):4
+  mal(mlplusnum)	=	+in(mal):4
+  ogham(basic)	=	+ie(ogam):4
+  ogham(laptop)	=	+ie(ogam):4
+  ogham(is434)	=	+ie(ogam_is434):4
+  ogham(is434laptop)	=	+ie(ogam_is434):4
+  ori(basic)	=	+in(ori):4
+  ro(de)	=	+ro(winkeys):4
+  ro(us)	=	+ro(std):4
+  ro(academic)	=	+ro(std):4
+  ro(std_comma)	=	+ro(std):4
+  ro(comma)	=	+ro(basic):4
+  ru(os)	=	+ru(os_legacy):4
+  sapmi(basic)	=	+no(smi):4
+  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):4
+  sapmi(sefi)	=	+fi(smi):4
+  sin(phonetic-static)	=	+in(sin_phonetic):4
+  syr(basic)	=	+sy(syc):4
+  syr(phonetic)	=	+sy(syc_phonetic):4
+  tam(INSCRIPT)	=	+in(tam):4
+  tam(UNI)	=	+in(tam_unicode):4
+  tam(TAB)	=	+in(tam_TAB):4
+  tam(TSCII)	=	+in(tam_TSCII):4
+  tel(basic)	=	+in(tel):4
+  yu(basic)	=	+srp(latin):4
+  yu(unicode)	=	+srp(latinunicode):4
+  yu(yz)	=	+srp(latinyz):4
+  yu(unicodeyz)	=	+srp(latinunicodeyz):4
+  *		=	+%l[4]%(v[4]):4
+
+! layout[2]	variant[2]	=	symbols
+  ben		basic	=	+in(ben):2
+  ben		probhat	=	+in(ben_probhat):2
+  dev		basic	=	+in(deva):2
+  dvorak		$dvoraklayouts	=	+%v(dvorak):2
+  dvorak		basic	=	+us(dvorak):2
+  dvorak		pl_basic	=	+pl(dvorak):2
+  dvorak		pl	=	+pl(dvorak_quotes):2
+  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):2
+  dzdwi		basic	=	+bt(basic):2
+  fi		basic	=	+fi(classic):2
+  ge		azerty_tskapo	=	+fr(geo):2
+  guj		basic	=	+in(guj):2
+  gur		basic	=	+in(guru):2
+  ie		laptop	=	+ie(basic):2
+  ie		CloGaelachLaptop	=	+ie(CloGaelach):2
+  il		si1452	=	+ie(basic):2
+  iu		basic	=	+ca(ike):2
+  lo		basic	=	+la(basic):2
+  kan		basic	=	+in(kan):2
+  mal		basic	=	+in(mal):2
+  mal		mlplusnum	=	+in(mal):2
+  ogham		basic	=	+ie(ogam):2
+  ogham		laptop	=	+ie(ogam):2
+  ogham		is434	=	+ie(ogam_is434):2
+  ogham		is434laptop	=	+ie(ogam_is434):2
+  ori		basic	=	+in(ori):2
+  ro		de	=	+ro(winkeys):2
+  ro		us	=	+ro(std):2
+  ro		academic	=	+ro(std):2
+  ro		std_comma	=	+ro(std):2
+  ro		comma	=	+ro(basic):2
+  ru		os	=	+ru(os_legacy):2
+  sapmi		basic	=	+no(smi):2
+  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):2
+  sapmi		sefi	=	+fi(smi):2
+  sin		phonetic-static	=	+in(sin_phonetic):2
+  syr		basic	=	+sy(syc):2
+  syr		phonetic	=	+sy(syc_phonetic):2
+  tam		INSCRIPT	=	+in(tam):2
+  tam		UNI	=	+in(tam_unicode):2
+  tam		TAB	=	+in(tam_TAB):2
+  tam		TSCII	=	+in(tam_TSCII):2
+  tel		basic	=	+in(tel):2
+  yu		basic	=	+srp(latin):2
+  yu		unicode	=	+srp(latinunicode):2
+  yu		yz	=	+srp(latinyz):2
+  yu		unicodeyz	=	+srp(latinunicodeyz):2
+
+! layout[3]	variant[3]	=	symbols
+  ben		basic	=	+in(ben):3
+  ben		probhat	=	+in(ben_probhat):3
+  dev		basic	=	+in(deva):3
+  dvorak		$dvoraklayouts	=	+%v(dvorak):3
+  dvorak		basic	=	+us(dvorak):3
+  dvorak		pl_basic	=	+pl(dvorak):3
+  dvorak		pl	=	+pl(dvorak_quotes):3
+  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):3
+  dzdwi		basic	=	+bt(basic):3
+  fi		basic	=	+fi(classic):3
+  ge		azerty_tskapo	=	+fr(geo):3
+  guj		basic	=	+in(guj):3
+  gur		basic	=	+in(guru):3
+  ie		laptop	=	+ie(basic):3
+  ie		CloGaelachLaptop	=	+ie(CloGaelach):3
+  il		si1452	=	+ie(basic):3
+  iu		basic	=	+ca(ike):3
+  lo		basic	=	+la(basic):3
+  kan		basic	=	+in(kan):3
+  mal		basic	=	+in(mal):3
+  mal		mlplusnum	=	+in(mal):3
+  ogham		basic	=	+ie(ogam):3
+  ogham		laptop	=	+ie(ogam):3
+  ogham		is434	=	+ie(ogam_is434):3
+  ogham		is434laptop	=	+ie(ogam_is434):3
+  ori		basic	=	+in(ori):3
+  ro		de	=	+ro(winkeys):3
+  ro		us	=	+ro(std):3
+  ro		academic	=	+ro(std):3
+  ro		std_comma	=	+ro(std):3
+  ro		comma	=	+ro(basic):3
+  ru		os	=	+ru(os_legacy):3
+  sapmi		basic	=	+no(smi):3
+  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):3
+  sapmi		sefi	=	+fi(smi):3
+  sin		phonetic-static	=	+in(sin_phonetic):3
+  syr		basic	=	+sy(syc):3
+  syr		phonetic	=	+sy(syc_phonetic):3
+  tam		INSCRIPT	=	+in(tam):3
+  tam		UNI	=	+in(tam_unicode):3
+  tam		TAB	=	+in(tam_TAB):3
+  tam		TSCII	=	+in(tam_TSCII):3
+  tel		basic	=	+in(tel):3
+  yu		basic	=	+srp(latin):3
+  yu		unicode	=	+srp(latinunicode):3
+  yu		yz	=	+srp(latinyz):3
+  yu		unicodeyz	=	+srp(latinunicodeyz):3
+
+! layout[4]	variant[4]	=	symbols
+  ben		basic	=	+in(ben):4
+  ben		probhat	=	+in(ben_probhat):4
+  dev		basic	=	+in(deva):4
+  dvorak		$dvoraklayouts	=	+%v(dvorak):4
+  dvorak		basic	=	+us(dvorak):4
+  dvorak		pl_basic	=	+pl(dvorak):4
+  dvorak		pl	=	+pl(dvorak_quotes):4
+  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):4
+  dzdwi		basic	=	+bt(basic):4
+  fi		basic	=	+fi(classic):4
+  ge		azerty_tskapo	=	+fr(geo):4
+  guj		basic	=	+in(guj):4
+  gur		basic	=	+in(guru):4
+  ie		laptop	=	+ie(basic):4
+  ie		CloGaelachLaptop	=	+ie(CloGaelach):4
+  il		si1452	=	+ie(basic):4
+  iu		basic	=	+ca(ike):4
+  lo		basic	=	+la(basic):4
+  kan		basic	=	+in(kan):4
+  mal		basic	=	+in(mal):4
+  mal		mlplusnum	=	+in(mal):4
+  ogham		basic	=	+ie(ogam):4
+  ogham		laptop	=	+ie(ogam):4
+  ogham		is434	=	+ie(ogam_is434):4
+  ogham		is434laptop	=	+ie(ogam_is434):4
+  ori		basic	=	+in(ori):4
+  ro		de	=	+ro(winkeys):4
+  ro		us	=	+ro(std):4
+  ro		academic	=	+ro(std):4
+  ro		std_comma	=	+ro(std):4
+  ro		comma	=	+ro(basic):4
+  ru		os	=	+ru(os_legacy):4
+  sapmi		basic	=	+no(smi):4
+  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):4
+  sapmi		sefi	=	+fi(smi):4
+  sin		phonetic-static	=	+in(sin_phonetic):4
+  syr		basic	=	+sy(syc):4
+  syr		phonetic	=	+sy(syc_phonetic):4
+  tam		INSCRIPT	=	+in(tam):4
+  tam		UNI	=	+in(tam_unicode):4
+  tam		TAB	=	+in(tam_TAB):4
+  tam		TSCII	=	+in(tam_TSCII):4
+  tel		basic	=	+in(tel):4
+  yu		basic	=	+srp(latin):4
+  yu		unicode	=	+srp(latinunicode):4
+  yu		yz	=	+srp(latinyz):4
+  yu		unicodeyz	=	+srp(latinunicodeyz):4
+
+! model		=	symbols
+  *     =       +inet(evdev)
+
+! model		layout		=	compat
+  pc98		nec_vndr/jp	=	pc98(basic)
+  *		jp		=	complete+japan
+  olpc         *               =       olpc
+  *		*		=	complete
+
+! model		layout[1]	=	compat
+  *		*		=	complete
+
+! model		=	types
+  $macs		=	complete+numpad(mac)
+  *		=	complete
+
+! layout	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
+
+! layout[1]	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
+
+! layout[2]	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
+
+! layout[3]	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
+
+! layout[4]	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
+
+! option	=	symbols
+  grp:shift_toggle	=	+group(shifts_toggle)
+  altwin:menu		=	+altwin(menu)
+  altwin:meta_alt	=	+altwin(meta_alt)
+  altwin:ctrl_win	=	+altwin(ctrl_win)
+  altwin:meta_win	=	+altwin(meta_win)
+  altwin:left_meta_win	=	+altwin(left_meta_win)
+  altwin:super_win	=	+altwin(super_win)
+  altwin:hyper_win	=	+altwin(hyper_win)
+  altwin:alt_super_win	=	+altwin(alt_super_win)
+  altwin:swap_lalt_lwin	=	+altwin(swap_lalt_lwin)
+  grp:switch		=	+group(switch)
+  grp:lswitch		=	+group(lswitch)
+  grp:win_switch	=	+group(win_switch)
+  grp:lwin_switch	=	+group(lwin_switch)
+  grp:rwin_switch	=	+group(rwin_switch)
+  grp:toggle		=	+group(toggle)
+  grp:shifts_toggle	=	+group(shifts_toggle)
+  grp:ctrls_toggle	=	+group(ctrls_toggle)
+  grp:alts_toggle	=	+group(alts_toggle)
+  grp:ctrl_shift_toggle	=	+group(ctrl_shift_toggle)
+  grp:lctrl_lshift_toggle	=	+group(lctrl_lshift_toggle)
+  grp:caps_toggle	=	+capslock(grouplock)
+  grp:caps_switch       =       +capslock(groupshift)
+  grp:shift_caps_toggle	=	+group(shift_caps_toggle)
+  grp:shift_caps_switch	=	+group(shift_caps_switch)
+  grp:alt_caps_toggle   =       +group(alt_caps_toggle)
+  grp:ctrl_alt_toggle	=	+group(ctrl_alt_toggle)
+  grp:alt_shift_toggle	=	+group(alt_shift_toggle)
+  grp:menu_toggle	=	+group(menu_toggle)
+  grp:lwin_toggle	=	+group(lwin_toggle)
+  grp:rwin_toggle	=	+group(rwin_toggle)
+  grp:lshift_toggle	=	+group(lshift_toggle)
+  grp:rshift_toggle	=	+group(rshift_toggle)
+  grp:rctrl_switch	=	+group(rctrl_switch)
+  grp:lctrl_toggle	=	+group(lctrl_toggle)
+  grp:rctrl_toggle	=	+group(rctrl_toggle)
+  grp:lalt_toggle	=	+group(lalt_toggle)
+  lv3:switch		=	+level3(switch)
+  lv3:ralt_switch	=	+level3(ralt_switch)
+  lv3:ralt_switch_multikey	=	+level3(ralt_switch_multikey)
+  lv3:ralt_alt		=	+level3(ralt_alt)
+  lv3:lalt_switch	=	+level3(lalt_switch)
+  lv3:alt_switch	=	+level3(alt_switch)
+  lv3:menu_switch	=	+level3(menu_switch)
+  lv3:win_switch	=	+level3(win_switch)
+  lv3:lwin_switch	=	+level3(lwin_switch)
+  lv3:rwin_switch	=	+level3(rwin_switch)
+  caps:capslock		=	+capslock(capslock)
+  caps:shiftlock	=	+capslock(shiftlock)
+  caps:swapescape	=	+capslock(swapescape)
+  ctrl:nocaps		=	+ctrl(nocaps)
+  ctrl:swapcaps		=	+ctrl(swapcaps)
+  ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
+  ctrl:ctrl_aa		=	+ctrl(ctrl_aa)
+  ctrl:ctrl_ra		=	+ctrl(ctrl_ra)
+  compose:ralt		=	+compose(ralt)
+  compose:lwin		=	+compose(lwin)
+  compose:rwin		=	+compose(rwin)
+  compose:menu		=	+compose(menu)
+  compose:rctrl		=	+compose(rctrl)
+  compose:caps		=	+compose(caps)
+  compose:102		=	+compose(102)
+  srvrkeys:none		=	+srvr_ctrl(no_srvr_keys)
+  eurosign:e		=	+eurosign(e)
+  eurosign:2		=	+eurosign(2)
+  eurosign:4		=	+eurosign(4)
+  eurosign:5		=	+eurosign(5)
+  keypad:oss            =       +keypad(oss)
+  keypad:legacy         =	+keypad(legacy)
+  keypad:legacy_wang    =	+keypad(legacy_wang)
+  keypad:oss_wang       =	+keypad(oss_wang)
+  keypad:future         =	+keypad(future)
+  keypad:future_wang    =	+keypad(future_wang)
+  keypad:phone_hex      =	+keypad(phone_hex)
+  nbsp:none             =	+nbsp(none)
+  nbsp:level2           =	+nbsp(level2)
+  nbsp:level3           =	+nbsp(level3)
+  nbsp:level3s          =	+nbsp(level3s)
+  nbsp:level3n          =	+nbsp(level3n)
+  nbsp:level4           =	+nbsp(level4)
+  nbsp:level4n          =	+nbsp(level4n)
+  nbsp:level4nl         =	+nbsp(level4nl)
+  japan:nicola_f_bs     =	+jp(nicola_f_bs)
+  kpdl:dot              =	+kpdl(dot)
+  kpdl:comma            =	+kpdl(comma)
+  kpdl:dotoss           =	+kpdl(dotoss)
+  kpdl:dotoss_latin9    =	+kpdl(dotoss_latin9)
+  kpdl:commaoss         =	+kpdl(commaoss)
+  kpdl:momayyezoss      =	+kpdl(momayyezoss)
+  kpdl:kposs            =	+kpdl(kposs)
+  shift:breaks_caps     =	+shift(breaks_caps)
+
+
+! option	=	compat
+  grp_led:num		=	+lednum(group_lock)
+  grp_led:caps		=	+ledcaps(group_lock)
+  grp_led:scroll	=	+ledscroll(group_lock)
+  grp:caps_toggle	=	+ledcaps(group_lock)
+  japan:kana_lock	=	+japan(kana_lock)
+
+
+! option	=	types
+  caps:internal			=	+caps(internal)
+  caps:internal_nocancel	=	+caps(internal_nocancel)
+  caps:shift			=	+caps(shift)
+  caps:shift_nocancel		=	+caps(shift_nocancel)
+  numpad:pc			=	+numpad(pc)
+  numpad:mac			=	+numpad(mac)
+  numpad:microsoft		=	+numpad(microsoft)
diff --git a/xorg-server/xkbdata.src/rules/evdev.lst b/xorg-server/xkbdata.src/rules/evdev.lst
new file mode 100644
index 000000000..17742b8e6
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/evdev.lst
@@ -0,0 +1,683 @@
+! model
+  pc101           Generic 101-key PC
+  pc102           Generic 102-key (Intl) PC
+  pc104           Generic 104-key PC
+  pc105           Generic 105-key (Intl) PC
+  dell101         Dell 101-key PC
+  latitude        Dell Latitude series laptop
+  dellm65         Dell Precision M65
+  everex          Everex STEPnote
+  flexpro         Keytronic FlexPro
+  microsoft       Microsoft Natural
+  omnikey101      Northgate OmniKey 101
+  winbook         Winbook Model XP5
+  jp106           Japanese 106-key
+  pc98            PC-98xx Series
+  a4techKB21      A4Tech KB-21
+  a4techKBS8      A4Tech KBS-8
+  a4_rfkb23       A4Tech Wireless Desktop RFKB-23
+  abnt2           Brazilian ABNT2
+  airkey          Acer AirKey V
+  acpi            ACPI Standard
+  azonaRF2300     Azona RF2300 wireless Internet Keyboard
+  scorpius        Advance Scorpius KI
+  brother         Brother Internet Keyboard
+  btc5113rf       BTC 5113RF Multimedia
+  btc5126t        BTC 5126T
+  btc6301urf      BTC 6301URF
+  btc9000         BTC 9000
+  btc9000a        BTC 9000A
+  btc9001ah       BTC 9001AH
+  btc5090         BTC 5090
+  btc9019u        BTC 9019U
+  cherryblue      Cherry Blue Line CyBo@rd
+  cherryblueb     Cherry CyMotion Master XPress
+  cherrybluea     Cherry Blue Line CyBo@rd (alternate option)
+  cherrycyboard   Cherry CyBo@rd USB-Hub
+  chicony         Chicony Internet Keyboard
+  chicony0108     Chicony KU-0108
+  chicony9885     Chicony KB-9885
+  compaqeak8      Compaq Easy Access Keyboard
+  compaqik7       Compaq Internet Keyboard (7 keys)
+  compaqik13      Compaq Internet Keyboard (13 keys)
+  compaqik18      Compaq Internet Keyboard (18 keys)
+  cymotionlinux   Cherry CyMotion Master Linux
+  armada          Laptop/notebook Compaq (eg. Armada) Laptop Keyboard
+  presario        Laptop/notebook Compaq (eg. Presario) Internet Keyboard
+  ipaq            Compaq iPaq Keyboard
+  dell            Dell
+  dellsk8125      Dell SK-8125
+  dellsk8135      Dell SK-8135
+  dellusbmm       Dell USB Multimedia Keyboard
+  inspiron        Dell Laptop/notebook Inspiron 6xxx/8xxx
+  precision_m     Dell Laptop/notebook Precision M series
+  dexxa           Dexxa Wireless Desktop Keyboard
+  diamond         Diamond 9801 / 9802 series
+  dtk2000         DTK2000
+  ennyah_dkb1008  Ennyah DKB-1008
+  fscaa1667g      Fujitsu-Siemens Computers AMILO A1667G laptop
+  genius          Genius Comfy KB-16M / Genius MM Keyboard KWD-910
+  geniuscomfy     Genius Comfy KB-12e
+  geniuscomfy2    Genius Comfy KB-21e-Scroll
+  geniuskb19e     Genius KB-19e NB
+  gyration        Gyration
+  logitech_base   Logitech Generic Keyboard
+  logitech_g15    Logitech G15 extra keys via G15daemon
+  hpi6            Hewlett-Packard Internet Keyboard
+  hp2501          Hewlett-Packard SK-2501 Multimedia Keyboard
+  hp2505          Hewlett-Packard SK-2505 Internet Keyboard
+  hpxe3gc         Hewlett-Packard Omnibook XE3 GC
+  hpxe3gf         Hewlett-Packard Omnibook XE3 GF
+  hpxt1000        Hewlett-Packard Omnibook XT1000
+  hpzt11xx        Hewlett-Packard Pavilion ZT11xx
+  hp500fa         Hewlett-Packard Omnibook 500 FA
+  hp5xx           Hewlett-Packard Omnibook 5xx
+  hp5181          Hewlett-Packard Internet Keyboard 5181
+  hp5185          Hewlett-Packard Internet Keyboard 5185
+  hpnx9020        Hewlett-Packard nx9020
+  hp6000          Hewlett-Packard Omnibook 6000/6100
+  honeywell_euroboard Honeywell Euroboard
+  rapidaccess     IBM Rapid Access
+  rapidaccess2    IBM Rapid Access II
+  rapidaccess2a   IBM Rapid Access II (alternate option)
+  thinkpad        IBM ThinkPad 560Z/600/600E/A22E
+  thinkpadintl    IBM ThinkPad 560Z/600/600E/A22E, Intl
+  thinkpad60      IBM ThinkPad R60/T60/R61/T61
+  thinkpadz60     IBM ThinkPad Z60m/Z60t/Z61m/Z61t
+  ibm_spacesaver  IBM Space Saver
+  logiaccess      Logitech Access Keyboard
+  logiclx300      Logitech Cordless Desktop LX-300
+  logii350        Logitech Internet 350 Keyboard
+  logimel         Logitech Media Elite Keyboard
+  logicd          Logitech Cordless Desktop
+  logicd_it       Logitech Cordless Desktop iTouch
+  logicd_nav      Logitech Cordless Desktop Navigator
+  logicd_opt      Logitech Cordless Desktop Optical
+  logicda         Logitech Cordless Desktop (alternate option)
+  logicdpa2       Logitech Cordless Desktop Pro (alternate option2)
+  logicfn         Logitech Cordless Freedom/Desktop Navigator
+  logicdn         Logitech Cordless Desktop Navigator
+  logiitc         Logitech iTouch Cordless Keyboard (model Y-RB6)
+  logiik          Logitech Internet Keyboard
+  itouch          Logitech iTouch
+  logicink        Logitech Internet Navigator Keyboard
+  logiex110       Logitech Cordless Desktop EX110
+  logiinkse       Logitech iTouch Internet Navigator Keyboard SE
+  logiinkseusb    Logitech iTouch Internet Navigator Keyboard SE (USB)
+  logiultrax      Logitech Ultra-X Keyboard
+  logiultraxc     Logitech Ultra-X Cordless Media Desktop Keyboard
+  logidinovo      Logitech diNovo Keyboard
+  logidinovoedge  Logitech diNovo Edge Keyboard
+  mx1998          Memorex MX1998
+  mx2500          Memorex MX2500 EZ-Access Keyboard
+  mx2750          Memorex MX2750
+  microsoft7000   Microsoft Natural Wireless Ergonomic Keyboard 7000
+  microsoftinet   Microsoft Internet Keyboard
+  microsoftpro    Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
+  microsoftprousb Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro
+  microsoftprooem Microsoft Natural Keyboard Pro OEM
+  vsonku306       ViewSonic KU-306 Internet Keyboard
+  microsoftprose  Microsoft Internet Keyboard Pro, Swedish
+  microsoftoffice Microsoft Office Keyboard
+  microsoftmult   Microsoft Wireless Multimedia Keyboard 1.0A
+  microsoftelite  Microsoft Natural Keyboard Elite
+  oretec          Ortek MCK-800 MM/Internet keyboard
+  propeller       Propeller Voyager (KTEZ-1000)
+  qtronix         QTronix Scorpius 98N+
+  samsung4500     Samsung SDM 4500P
+  samsung4510     Samsung SDM 4510P
+  sk1300          SK-1300
+  sk2500          SK-2500
+  sk6200          SK-6200
+  sk7100          SK-7100
+  sp_inet         Super Power Multimedia Keyboard
+  sven            SVEN Ergonomic 2500
+  sven303         SVEN Slim 303
+  symplon         Symplon PaceBook (tablet PC)
+  toshiba_s3000   Toshiba Satellite S3000
+  trust           Trust Wireless Keyboard Classic
+  trustda         Trust Direct Access Keyboard
+  yahoo           Yahoo! Internet Keyboard
+  macbook78       MacBook/MacBook Pro
+  macbook79       MacBook/MacBook Pro (Intl)
+  macintosh       Macintosh
+  macintosh_old   Macintosh Old
+  macintosh_hhk   Happy Hacking Keyboard for Mac
+  acer_c300       Acer C300
+  acer_ferrari4k  Acer Ferrari 4000
+  acer_laptop     Acer Laptop
+  asus_laptop     Asus Laptop
+  apple           Apple
+  apple_laptop    Apple Laptop
+  silvercrest     SILVERCREST Multimedia Wireless Keyboard
+  emachines       Laptop/notebook eMachines m68xx
+  kr106           Korean 106-key
+  evdev           Evdev-managed keyboard
+  benqx           BenQ X-Touch
+  benqx730        BenQ X-Touch 730
+  benqx800        BenQ X-Touch 800
+  hhk             Happy Hacking Keyboard
+  classmate       Classmate PC
+  olpc            OLPC
+  sun6            Sun Type 5/6
+
+! layout
+  us              USA
+  ad              Andorra
+  af              Afghanistan
+  ara             Arabic
+  al              Albania
+  am              Armenia
+  az              Azerbaijan
+  by              Belarus
+  be              Belgium
+  bd              Bangladesh
+  in              India
+  ba              Bosnia and Herzegovina
+  br              Brazil
+  bg              Bulgaria
+  ma              Morocco
+  mm              Myanmar
+  ca              Canada
+  cd              Congo, Democratic Republic of the
+  cn              China
+  hr              Croatia
+  cz              Czechia
+  dk              Denmark
+  nl              Netherlands
+  bt              Bhutan
+  ee              Estonia
+  ir              Iran
+  iq              Iraq
+  fo              Faroe Islands
+  fi              Finland
+  fr              France
+  gh              Ghana
+  gn              Guinea
+  ge              Georgia
+  de              Germany
+  gr              Greece
+  hu              Hungary
+  is              Iceland
+  il              Israel
+  it              Italy
+  jp              Japan
+  kg              Kyrgyzstan
+  kh              Cambodia
+  kz              Kazakhstan
+  la              Laos
+  latam           Latin American
+  lt              Lithuania
+  lv              Latvia
+  mao             Maori
+  me              Montenegro
+  mk              Macedonia
+  mt              Malta
+  mn              Mongolia
+  no              Norway
+  pl              Poland
+  pt              Portugal
+  ro              Romania
+  ru              Russia
+  rs              Serbia
+  si              Slovenia
+  sk              Slovakia
+  es              Spain
+  se              Sweden
+  ch              Switzerland
+  sy              Syria
+  tj              Tajikistan
+  lk              Sri Lanka
+  th              Thailand
+  tr              Turkey
+  ua              Ukraine
+  gb              United Kingdom
+  uz              Uzbekistan
+  vn              Vietnam
+  kr              Korea, Republic of
+  nec_vndr/jp     Japan (PC-98xx Series)
+  ie              Ireland
+  pk              Pakistan
+  mv              Maldives
+  za              South Africa
+  epo             Esperanto
+  np              Nepal
+  ng              Nigeria
+  et              Ethiopia
+  braille         Braille
+
+! variant
+  chr             us: Cherokee
+  euro            us: With EuroSign on 5
+  intl            us: International (with dead keys)
+  alt-intl        us: Alternative international (former us_intl)
+  colemak         us: Colemak
+  dvorak          us: Dvorak
+  dvorak-intl     us: Dvorak international
+  dvorak-l        us: Left handed Dvorak
+  dvorak-r        us: Right handed Dvorak
+  dvorak-classic  us: Classic Dvorak
+  dvp             us: Programmer Dvorak
+  rus             us: Russian phonetic
+  mac             us: Macintosh
+  altgr-intl      us: International (AltGr dead keys)
+  olpc2           us: Group toggle on multiply/divide key
+  ps              af: Pashto
+  uz              af: Southern Uzbek
+  olpc-ps         af: OLPC Pashto
+  olpc-fa         af: OLPC Dari
+  olpc-uz         af: OLPC Southern Uzbek
+  azerty          ara: azerty
+  azerty_digits   ara: azerty/digits
+  digits          ara: digits
+  qwerty          ara: qwerty
+  qwerty_digits   ara: qwerty/digits
+  buckwalter      ara: Buckwalter
+  phonetic        am: Phonetic
+  phonetic-alt    am: Alternative Phonetic
+  eastern         am: Eastern
+  western         am: Western
+  eastern-alt     am: Alternative Eastern
+  cyrillic        az: Cyrillic
+  winkeys         by: Winkeys
+  latin           by: Latin
+  iso-alternate   be: ISO Alternate
+  nodeadkeys      be: Eliminate dead keys
+  sundeadkeys     be: Sun dead keys
+  wang            be: Wang model 724 azerty
+  probhat         bd: Probhat
+  ben             in: Bengali
+  ben_probhat     in: Bengali Probhat
+  guj             in: Gujarati
+  guru            in: Gurmukhi
+  jhelum          in: Gurmukhi Jhelum
+  kan             in: Kannada
+  mal             in: Malayalam
+  mal_lalitha     in: Malayalam Lalitha
+  ori             in: Oriya
+  tam_unicode     in: Tamil Unicode
+  tam_TAB         in: Tamil TAB Typewriter
+  tam_TSCII       in: Tamil TSCII Typewriter
+  tam             in: Tamil
+  tel             in: Telugu
+  urd             in: Urdu
+  bolnagri        in: Hindi Bolnagri
+  alternatequotes ba: Use guillemets for quotes
+  unicode         ba: Use Bosnian digraphs
+  unicodeus       ba: US keyboard with Bosnian digraphs
+  us              ba: US keyboard with Bosnian letters
+  nodeadkeys      br: Eliminate dead keys
+  dvorak          br: Dvorak
+  nativo          br: Nativo
+  nativo-us       br: Nativo for USA keyboards
+  nativo-epo      br: Nativo for Esperanto
+  phonetic        bg: Phonetic
+  french          ma: French
+  tifinagh        ma: Tifinagh
+  tifinagh-alt    ma: Tifinagh Alternative
+  tifinagh-alt-phonetic ma: Tifinagh Alternative Phonetic
+  tifinagh-extended ma: Tifinagh Extended
+  tifinagh-phonetic ma: Tifinagh Phonetic
+  tifinagh-extended-phonetic ma: Tifinagh Extended Phonetic
+  fr-dvorak       ca: French Dvorak
+  fr-legacy       ca: French (legacy)
+  multix          ca: Multilingual
+  multi           ca: Multilingual, first part
+  multi-2gr       ca: Multilingual, second part
+  ike             ca: Inuktitut
+  shs             ca: Secwepemctsin
+  kut             ca: Ktunaxa
+  tib             cn: Tibetan
+  tib_asciinum    cn: Tibetan (with ASCII numerals)
+  alternatequotes hr: Use guillemets for quotes
+  unicode         hr: Use Croatian digraphs
+  unicodeus       hr: US keyboard with Croatian digraphs
+  us              hr: US keyboard with Croatian letters
+  bksl            cz: With &lt;\|&gt; key
+  qwerty          cz: qwerty
+  qwerty_bksl     cz: qwerty, extended Backslash
+  ucw             cz: UCW layout (accented letters only)
+  nodeadkeys      dk: Eliminate dead keys
+  mac             dk: Macintosh
+  mac_nodeadkeys  dk: Macintosh, eliminate dead keys
+  dvorak          dk: Dvorak
+  sundeadkeys     nl: Sun dead keys
+  mac             nl: Macintosh
+  std             nl: Standard
+  nodeadkeys      ee: Eliminate dead keys
+  dvorak          ee: Dvorak
+  us              ee: US keyboard with Estonian letters
+  pro             ir: Pro
+  keypad          ir: Keypad
+  pro_keypad      ir: Pro Keypad
+  ku              ir: Kurdish, Latin Q
+  ku_f            ir: Kurdish, (F)
+  ku_alt          ir: Kurdish, Latin Alt-Q
+  ku_ara          ir: Kurdish, Arabic-Latin
+  ku              iq: Kurdish, Latin Q
+  ku_f            iq: Kurdish, (F)
+  ku_alt          iq: Kurdish, Latin Alt-Q
+  ku_ara          iq: Kurdish, Arabic-Latin
+  nodeadkeys      fo: Eliminate dead keys
+  nodeadkeys      fi: Eliminate dead keys
+  smi             fi: Northern Saami
+  classic         fi: Classic
+  mac             fi: Macintosh
+  nodeadkeys      fr: Eliminate dead keys
+  sundeadkeys     fr: Sun dead keys
+  oss             fr: Alternative
+  oss_latin9      fr: Alternative, latin-9 only
+  oss_nodeadkeys  fr: Alternative, eliminate dead keys
+  oss_sundeadkeys fr: Alternative, Sun dead keys
+  latin9          fr: (Legacy) Alternative
+  latin9_nodeadkeys fr: (Legacy) Alternative, eliminate dead keys
+  latin9_sundeadkeys fr: (Legacy) Alternative, Sun dead keys
+  bepo            fr: Bepo, ergonomic, Dvorak way
+  bepo_latin9     fr: Bepo, ergonomic, Dvorak way, latin-9 only
+  dvorak          fr: Dvorak
+  mac             fr: Macintosh
+  geo             fr: Georgian AZERTY Tskapo
+  generic         gh: Multilingual
+  akan            gh: Akan
+  ewe             gh: Ewe
+  fula            gh: Fula
+  ga              gh: Ga
+  hausa           gh: Hausa
+  ergonomic       ge: Ergonomic
+  mess            ge: MESS
+  ru              ge: Russian
+  os              ge: Ossetian
+  deadacute       de: Dead acute
+  deadgraveacute  de: Dead grave acute
+  nodeadkeys      de: Eliminate dead keys
+  ro              de: Romanian keyboard with German letters
+  ro_nodeadkeys   de: Romanian keyboard with German letters, eliminate dead keys
+  dvorak          de: Dvorak
+  sundeadkeys     de: Sun dead keys
+  neo             de: Neostyle
+  mac             de: Macintosh
+  mac_nodeadkeys  de: Macintosh, eliminate dead keys
+  simple          gr: Simple
+  extended        gr: Extended
+  nodeadkeys      gr: Eliminate dead keys
+  polytonic       gr: Polytonic
+  standard        hu: Standard
+  nodeadkeys      hu: Eliminate dead keys
+  qwerty          hu: qwerty
+  101_qwertz_comma_dead hu: 101/qwertz/comma/Dead keys
+  101_qwertz_comma_nodead hu: 101/qwertz/comma/Eliminate dead keys
+  101_qwertz_dot_dead hu: 101/qwertz/dot/Dead keys
+  101_qwertz_dot_nodead hu: 101/qwertz/dot/Eliminate dead keys
+  101_qwerty_comma_dead hu: 101/qwerty/comma/Dead keys
+  101_qwerty_comma_nodead hu: 101/qwerty/comma/Eliminate dead keys
+  101_qwerty_dot_dead hu: 101/qwerty/dot/Dead keys
+  101_qwerty_dot_nodead hu: 101/qwerty/dot/Eliminate dead keys
+  102_qwertz_comma_dead hu: 102/qwertz/comma/Dead keys
+  102_qwertz_comma_nodead hu: 102/qwertz/comma/Eliminate dead keys
+  102_qwertz_dot_dead hu: 102/qwertz/dot/Dead keys
+  102_qwertz_dot_nodead hu: 102/qwertz/dot/Eliminate dead keys
+  102_qwerty_comma_dead hu: 102/qwerty/comma/Dead keys
+  102_qwerty_comma_nodead hu: 102/qwerty/comma/Eliminate dead keys
+  102_qwerty_dot_dead hu: 102/qwerty/dot/Dead keys
+  102_qwerty_dot_nodead hu: 102/qwerty/dot/Eliminate dead keys
+  Sundeadkeys     is: Sun dead keys
+  nodeadkeys      is: Eliminate dead keys
+  mac             is: Macintosh
+  dvorak          is: Dvorak
+  lyx             il: lyx
+  phonetic        il: Phonetic
+  biblical        il: Biblical Hebrew (Tiro)
+  nodeadkeys      it: Eliminate dead keys
+  mac             it: Macintosh
+  geo             it: Georgian
+  kana            jp: Kana
+  OADG109A        jp: OADG 109A
+  ruskaz          kz: Russian with Kazakh
+  kazrus          kz: Kazakh with Russian
+  nodeadkeys      latam: Eliminate dead keys
+  sundeadkeys     latam: Sun dead keys
+  std             lt: Standard
+  us              lt: US keyboard with Lithuanian letters
+  ibm             lt: IBM (LST 1205-92)
+  lekp            lt: LEKP
+  lekpa           lt: LEKPa
+  balticplus      lt: Baltic+
+  apostrophe      lv: Apostrophe (') variant
+  tilde           lv: Tilde (~) variant
+  fkey            lv: F-letter (F) variant
+  cyrillic        me: Cyrillic
+  cyrillicyz      me: Cyrillic, Z and ZHE swapped
+  latinunicode    me: Latin unicode
+  latinyz         me: Latin qwerty
+  latinunicodeyz  me: Latin unicode qwerty
+  cyrillicalternatequotes me: Cyrillic with guillemets
+  latinalternatequotes me: Latin with guillemets
+  nodeadkeys      mk: Eliminate dead keys
+  us              mt: Maltese keyboard with US layout
+  nodeadkeys      no: Eliminate dead keys
+  dvorak          no: Dvorak
+  smi             no: Northern Saami
+  smi_nodeadkeys  no: Northern Saami, eliminate dead keys
+  mac             no: Macintosh
+  mac_nodeadkeys  no: Macintosh, eliminate dead keys
+  qwertz          pl: qwertz
+  dvorak          pl: Dvorak
+  dvorak_quotes   pl: Dvorak, Polish quotes on quotemark key
+  dvorak_altquotes pl: Dvorak, Polish quotes on key "1/!"
+  csb             pl: Kashubian
+  ru_phonetic_dvorak pl: Russian phonetic Dvorak
+  nodeadkeys      pt: Eliminate dead keys
+  sundeadkeys     pt: Sun dead keys
+  mac             pt: Macintosh
+  mac_nodeadkeys  pt: Macintosh, eliminate dead keys
+  mac_sundeadkeys pt: Macintosh, Sun dead keys
+  nativo          pt: Nativo
+  nativo-us       pt: Nativo for USA keyboards
+  nativo-epo      pt: Nativo for Esperanto
+  cedilla         ro: Cedilla
+  std             ro: Standard
+  std_cedilla     ro: Standard (Cedilla)
+  winkeys         ro: Winkeys
+  phonetic        ru: Phonetic
+  typewriter      ru: Typewriter
+  legacy          ru: Legacy
+  tt              ru: Tatar
+  os_legacy       ru: Ossetian, legacy
+  os_winkeys      ru: Ossetian, Winkeys
+  cv              ru: Chuvash
+  cv_latin        ru: Chuvash Latin
+  udm             ru: Udmurt
+  kom             ru: Komi
+  sah             ru: Yakut
+  yz              rs: Z and ZHE swapped
+  latin           rs: Latin
+  latinunicode    rs: Latin Unicode
+  latinyz         rs: Latin qwerty
+  latinunicodeyz  rs: Latin Unicode qwerty
+  alternatequotes rs: With guillemets
+  latinalternatequotes rs: Latin with guillemets
+  alternatequotes si: Use guillemets for quotes
+  unicode         si: Use Slovenian digraphs
+  unicodeus       si: US keyboard with Slovenian digraphs
+  us              si: US keyboard with Slovenian letters
+  bksl            sk: Extended Backslash
+  qwerty          sk: qwerty
+  qwerty_bksl     sk: qwerty, extended Backslash
+  nodeadkeys      es: Eliminate dead keys
+  sundeadkeys     es: Sun dead keys
+  dvorak          es: Dvorak
+  ast             es: Asturian variant with bottom-dot H and bottom-dot L
+  cat             es: Catalan variant with middle-dot L
+  mac             es: Macintosh
+  nodeadkeys      se: Eliminate dead keys
+  dvorak          se: Dvorak
+  rus             se: Russian phonetic
+  rus_nodeadkeys  se: Russian phonetic, eliminate dead keys
+  smi             se: Northern Saami
+  mac             se: Macintosh
+  svdvorak        se: Svdvorak
+  de_nodeadkeys   ch: German, eliminate dead keys
+  de_sundeadkeys  ch: German, Sun dead keys
+  fr              ch: French
+  fr_nodeadkeys   ch: French, eliminate dead keys
+  fr_sundeadkeys  ch: French, Sun dead keys
+  fr_mac          ch: French (Macintosh)
+  de_mac          ch: German (Macintosh)
+  syc             sy: Syriac
+  syc_phonetic    sy: Syriac phonetic
+  ku              sy: Kurdish, Latin Q
+  ku_f            sy: Kurdish, (F)
+  ku_alt          sy: Kurdish, Latin Alt-Q
+  tam_unicode     lk: Tamil Unicode
+  tam_TAB         lk: Tamil TAB Typewriter
+  tis             th: TIS-820.2538
+  pat             th: Pattachote
+  f               tr: (F)
+  alt             tr: Alt-Q
+  sundeadkeys     tr: Sun dead keys
+  ku              tr: Kurdish, Latin Q
+  ku_f            tr: Kurdish, (F)
+  ku_alt          tr: Kurdish, Latin Alt-Q
+  intl            tr: International (with dead keys)
+  phonetic        ua: Phonetic
+  typewriter      ua: Typewriter
+  winkeys         ua: Winkeys
+  unicode         ua: Unicode
+  rstu            ua: Standard RSTU
+  rstu_ru         ua: Standard RSTU on Russian layout
+  homophonic      ua: Homophonic
+  intl            gb: International (with dead keys)
+  dvorak          gb: Dvorak
+  dvorakukp       gb: Dvorak (UK Punctuation)
+  mac             gb: Macintosh
+  colemak         gb: Colemak
+  latin           uz: Latin
+  kr104           kr: 101/104 key Compatible
+  CloGaelach      ie: CloGaelach
+  UnicodeExpert   ie: UnicodeExpert
+  ogam            ie: Ogham
+  ogam_is434      ie: Ogham IS434
+  ara             pk: Arabic
+  legacy          epo: displaced semicolon and quote (obsolete)
+  igbo            ng: Igbo
+  yoruba          ng: Yoruba
+  hausa           ng: Hausa
+  left_hand       braille: Left hand
+  right_hand      braille: Right hand
+
+! option
+  grp                  Layout switching
+  grp:switch           R-Alt switches layout while pressed.
+  grp:lswitch          Left Alt key switches layout while pressed.
+  grp:lwin_switch      Left Win-key switches layout while pressed.
+  grp:rwin_switch      Right Win-key switches layout while pressed.
+  grp:win_switch       Both Win-keys switch layout while pressed.
+  grp:caps_switch      CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.
+  grp:rctrl_switch     Right Ctrl key switches layout while pressed.
+  grp:toggle           Right Alt key changes layout.
+  grp:lalt_toggle      Left Alt key changes layout.
+  grp:caps_toggle      CapsLock key changes layout.
+  grp:shift_caps_toggle Shift+CapsLock changes layout.
+  grp:shift_caps_switch CapsLock switch to first layout, Shift+CapsLock switch to last layout.
+  grp:alt_caps_toggle  Alt+CapsLock changes layout.
+  grp:shifts_toggle    Both Shift keys together change layout.
+  grp:alts_toggle      Both Alt keys together change layout.
+  grp:ctrls_toggle     Both Ctrl keys together change layout.
+  grp:ctrl_shift_toggle Ctrl+Shift change layout.
+  grp:lctrl_lshift_toggle LCtrl+LShift change layout.
+  grp:ctrl_alt_toggle  Alt+Ctrl change layout.
+  grp:alt_shift_toggle Alt+Shift change layout.
+  grp:menu_toggle      Menu key changes layout.
+  grp:lwin_toggle      Left Win-key changes layout.
+  grp:rwin_toggle      Right Win-key changes layout.
+  grp:lshift_toggle    Left Shift key changes layout.
+  grp:rshift_toggle    Right Shift key changes layout.
+  grp:lctrl_toggle     Left Ctrl key changes layout.
+  grp:rctrl_toggle     Right Ctrl key changes layout.
+  lv3                  Third level choosers
+  lv3:switch           Press Right Ctrl to choose 3rd level.
+  lv3:menu_switch      Press Menu key to choose 3rd level.
+  lv3:win_switch       Press any of Win-keys to choose 3rd level.
+  lv3:lwin_switch      Press Left Win-key to choose 3rd level.
+  lv3:rwin_switch      Press Right Win-key to choose 3rd level.
+  lv3:alt_switch       Press any of Alt keys to choose 3rd level.
+  lv3:lalt_switch      Press Left Alt key to choose 3rd level.
+  lv3:ralt_switch      Press Right Alt key to choose 3rd level.
+  lv3:ralt_switch_multikey Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.
+  lv3:ralt_alt         Right Alt key never chooses 3rd level.
+  ctrl                 Ctrl key position
+  ctrl:nocaps          Make CapsLock an additional Ctrl.
+  ctrl:swapcaps        Swap Ctrl and CapsLock.
+  ctrl:ctrl_ac         Ctrl key at left of 'A'
+  ctrl:ctrl_aa         Ctrl key at bottom left
+  ctrl:ctrl_ra         Right Ctrl key works as Right Alt.
+  grp_led              Use keyboard LED to show alternative layout.
+  grp_led:num          NumLock LED shows alternative layout.
+  grp_led:caps         CapsLock LED shows alternative layout.
+  grp_led:scroll       ScrollLock LED shows alternative layout.
+  keypad               Numeric keypad layout selection
+  keypad:legacy        Legacy keypad
+  keypad:oss           Keypad with unicode additions (arrows and math operators)
+  keypad:future        Keypad with unicode additions (arrows and math operators). Math operators on default level.
+  keypad:legacy_wang   Legacy Wang 724 keypad
+  keypad:oss_wang      Wang 724 keypad with unicode additions (arrows and math operators)
+  keypad:future_wang   Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level.
+  keypad:phone_hex     ATM/phone-style hexadecimal keypad
+  kpdl                 Numeric keypad delete key behaviour
+  kpdl:dot             Legacy key with dot
+  kpdl:comma           Legacy key with comma
+  kpdl:dotoss          Four-level key with dot
+  kpdl:dotoss_latin9   Four-level key with dot, latin-9 restriction
+  kpdl:commaoss        Four-level key with comma
+  kpdl:momayyezoss     Four-level key with momayyez
+  kpdl:kposs           Four-level key with abstract separators
+  caps                 CapsLock key behavior
+  caps:internal        CapsLock uses internal capitalization. Shift "pauses" CapsLock.
+  caps:internal_nocancel CapsLock uses internal capitalization. Shift doesn't affect CapsLock.
+  caps:shift           CapsLock acts as Shift with locking. Shift "pauses" CapsLock.
+  caps:shift_nocancel  CapsLock acts as Shift with locking. Shift doesn't affect CapsLock.
+  caps:capslock        CapsLock toggles normal capitalization of alphabetic characters.
+  caps:swapescape      Swap ESC and CapsLock.
+  caps:shiftlock       CapsLock toggles Shift so all keys are affected.
+  altwin               Alt/Win key behavior
+  altwin:menu          Add the standard behavior to Menu key.
+  altwin:meta_alt      Alt and Meta are on the Alt keys.
+  altwin:ctrl_win      Control is mapped to the Win-keys (and the usual Ctrl keys).
+  altwin:meta_win      Meta is mapped to the Win-keys.
+  altwin:left_meta_win Meta is mapped to the left Win-key.
+  altwin:super_win     Super is mapped to the Win-keys.
+  altwin:hyper_win     Hyper is mapped to the Win-keys.
+  altwin:alt_super_win Alt is mapped to the right Win-key and Super to Menu.
+  altwin:swap_lalt_lwin Left Alt is swapped with left Win-key.
+  Compose key          Compose key position
+  compose:ralt         Right Alt is Compose.
+  compose:lwin         Left Win-key is Compose.
+  compose:rwin         Right Win-key is Compose.
+  compose:menu         Menu is Compose.
+  compose:rctrl        Right Ctrl is Compose.
+  compose:caps         Caps Lock is Compose.
+  compose:102          Less-than/Greater-than is Compose.
+  compat               Miscellaneous compatibility options
+  numpad:pc            Default numeric keypad keys.
+  numpad:mac           Numeric keypad keys work as with Mac.
+  numpad:microsoft     Shift with numeric keypad keys works as in MS Windows.
+  srvrkeys:none        Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.
+  apple:badmap         Swap keycodes of two keys when Mac keyboards are misdetected by kernel.
+  shift:breaks_caps    Shift cancels CapsLock.
+  eurosign             Adding the EuroSign to certain keys
+  eurosign:e           Add the EuroSign to the E key.
+  eurosign:2           Add the EuroSign to the 2 key.
+  eurosign:4           Add the EuroSign to the 4 key.
+  eurosign:5           Add the EuroSign to the 5 key.
+  nbsp                 Using space key to input non-breakable space character
+  nbsp:none            Space key outputs usual space at any level.
+  nbsp:level2          Space key outputs non-breakable space character at second level.
+  nbsp:level3          Space key outputs non-breakable space character at third level.
+  nbsp:level3s         Space key outputs non-breakable space character at third level, nothing at fourth level.
+  nbsp:level3n         Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level
+  nbsp:level4          Space key outputs non-breakable space character at fourth level.
+  nbsp:level4n         Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level
+  nbsp:level4nl        Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)
+  japan                Japanese keyboard options
+  japan:kana_lock      Kana Lock key is locking
+  japan:nicola_f_bs    NICOLA-F style Backspace
diff --git a/xorg-server/xkbdata.src/rules/evdev.m_k.part b/xorg-server/xkbdata.src/rules/evdev.m_k.part
new file mode 100644
index 000000000..9bae15336
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/evdev.m_k.part
@@ -0,0 +1,4 @@
+  pc98		=	evdev(pc98)
+  abnt2		=	evdev(abnt2)
+  jp106		=	evdev(jp106)
+  *		=	evdev
diff --git a/xorg-server/xkbdata.src/rules/evdev.m_s.part b/xorg-server/xkbdata.src/rules/evdev.m_s.part
new file mode 100644
index 000000000..fd6590d9d
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/evdev.m_s.part
@@ -0,0 +1 @@
+  *     =       +inet(evdev)
diff --git a/xorg-server/xkbdata.src/rules/evdev.xml.in b/xorg-server/xkbdata.src/rules/evdev.xml.in
new file mode 100644
index 000000000..8d0aa921c
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/evdev.xml.in
@@ -0,0 +1,4699 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
+<xkbConfigRegistry>
+  <modelList>
+    <model>
+      <configItem>
+        <name>pc101</name>
+        <_description>Generic 101-key PC</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>pc102</name>
+        <_description>Generic 102-key (Intl) PC</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>pc104</name>
+        <_description>Generic 104-key PC</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>pc105</name>
+        <_description>Generic 105-key (Intl) PC</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dell101</name>
+        <_description>Dell 101-key PC</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>latitude</name>
+        <_description>Dell Latitude series laptop</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellm65</name>
+        <_description>Dell Precision M65</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>everex</name>
+        <_description>Everex STEPnote</_description>
+        <vendor>Everex</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>flexpro</name>
+        <_description>Keytronic FlexPro</_description>
+        <vendor>Keytronic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoft</name>
+        <_description>Microsoft Natural</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>omnikey101</name>
+        <_description>Northgate OmniKey 101</_description>
+        <vendor>Northgate</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>winbook</name>
+        <_description>Winbook Model XP5</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>jp106</name>
+        <_description>Japanese 106-key</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>pc98</name>
+        <_description>PC-98xx Series</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>a4techKB21</name>
+        <_description>A4Tech KB-21</_description>
+        <vendor>A4Tech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>a4techKBS8</name>
+        <_description>A4Tech KBS-8</_description>
+        <vendor>A4Tech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>a4_rfkb23</name>
+        <_description>A4Tech Wireless Desktop RFKB-23</_description>
+        <vendor>A4Tech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>abnt2</name>
+        <_description>Brazilian ABNT2</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>airkey</name>
+        <_description>Acer AirKey V</_description>
+        <vendor>Acer</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>acpi</name>
+        <_description>ACPI Standard</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>azonaRF2300</name>
+        <_description>Azona RF2300 wireless Internet Keyboard</_description>
+        <vendor>Azona</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>scorpius</name>
+        <_description>Advance Scorpius KI</_description>
+        <vendor>Scorpius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>brother</name>
+        <_description>Brother Internet Keyboard</_description>
+        <vendor>Brother</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc5113rf</name>
+        <_description>BTC 5113RF Multimedia</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc5126t</name>
+        <_description>BTC 5126T</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc6301urf</name>
+        <_description>BTC 6301URF</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc9000</name>
+        <_description>BTC 9000</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc9000a</name>
+        <_description>BTC 9000A</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc9001ah</name>
+        <_description>BTC 9001AH</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc5090</name>
+        <_description>BTC 5090</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc9019u</name>
+	<_description>BTC 9019U</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherryblue</name>
+        <_description>Cherry Blue Line CyBo@rd</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherryblueb</name>
+        <_description>Cherry CyMotion Master XPress</_description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherrybluea</name>
+        <_description>Cherry Blue Line CyBo@rd (alternate option)</_description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherrycyboard</name>
+        <_description>Cherry CyBo@rd USB-Hub</_description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>chicony</name>
+        <_description>Chicony Internet Keyboard</_description>
+        <vendor>Chicony</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>chicony0108</name>
+        <_description>Chicony KU-0108</_description>
+        <vendor>Chicony</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>chicony9885</name>
+        <_description>Chicony KB-9885</_description>
+        <vendor>Chicony</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>compaqeak8</name>
+        <_description>Compaq Easy Access Keyboard</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>compaqik7</name>
+        <_description>Compaq Internet Keyboard (7 keys)</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>compaqik13</name>
+        <_description>Compaq Internet Keyboard (13 keys)</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>compaqik18</name>
+        <_description>Compaq Internet Keyboard (18 keys)</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cymotionlinux</name>
+        <_description>Cherry CyMotion Master Linux</_description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>armada</name>
+        <_description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>presario</name>
+        <_description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>ipaq</name>
+        <_description>Compaq iPaq Keyboard</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dell</name>
+        <_description>Dell</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellsk8125</name>
+        <_description>Dell SK-8125</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellsk8135</name>
+        <_description>Dell SK-8135</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellusbmm</name>
+        <_description>Dell USB Multimedia Keyboard</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>inspiron</name>
+        <_description>Dell Laptop/notebook Inspiron 6xxx/8xxx</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>precision_m</name>
+        <_description>Dell Laptop/notebook Precision M series</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dexxa</name>
+        <_description>Dexxa Wireless Desktop Keyboard</_description>
+        <vendor>Dexxa</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>diamond</name>
+        <_description>Diamond 9801 / 9802 series</_description>
+        <vendor>Diamond</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dtk2000</name>
+        <_description>DTK2000</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>ennyah_dkb1008</name>
+        <_description>Ennyah DKB-1008</_description>
+        <vendor>Ennyah</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>fscaa1667g</name>
+        <_description>Fujitsu-Siemens Computers AMILO A1667G laptop</_description>
+        <vendor>Fujitsu-Siemens</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>genius</name>
+        <_description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910</_description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>geniuscomfy</name>
+        <_description>Genius Comfy KB-12e</_description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>geniuscomfy2</name>
+        <_description>Genius Comfy KB-21e-Scroll</_description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>geniuskb19e</name>
+        <_description>Genius KB-19e NB</_description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>gyration</name>
+        <_description>Gyration</_description>
+        <vendor>Gyration</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logitech_base</name>
+        <_description>Logitech Generic Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logitech_g15</name>
+        <_description>Logitech G15 extra keys via G15daemon</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpi6</name>
+        <_description>Hewlett-Packard Internet Keyboard</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp2501</name>
+        <_description>Hewlett-Packard SK-2501 Multimedia Keyboard</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp2505</name>
+        <_description>Hewlett-Packard SK-2505 Internet Keyboard</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpxe3gc</name>
+        <_description>Hewlett-Packard Omnibook XE3 GC</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpxe3gf</name>
+        <_description>Hewlett-Packard Omnibook XE3 GF</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpxt1000</name>
+        <_description>Hewlett-Packard Omnibook XT1000</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpzt11xx</name>
+        <_description>Hewlett-Packard Pavilion ZT11xx</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp500fa</name>
+        <_description>Hewlett-Packard Omnibook 500 FA</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp5xx</name>
+        <_description>Hewlett-Packard Omnibook 5xx</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp5181</name>
+        <_description>Hewlett-Packard Internet Keyboard 5181</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp5185</name>
+        <_description>Hewlett-Packard Internet Keyboard 5185</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpnx9020</name>
+        <_description>Hewlett-Packard nx9020</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp6000</name>
+        <_description>Hewlett-Packard Omnibook 6000/6100</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>honeywell_euroboard</name>
+        <_description>Honeywell Euroboard</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>rapidaccess</name>
+        <_description>IBM Rapid Access</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>rapidaccess2</name>
+        <_description>IBM Rapid Access II</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>rapidaccess2a</name>
+        <_description>IBM Rapid Access II (alternate option)</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>thinkpad</name>
+        <_description>IBM ThinkPad 560Z/600/600E/A22E</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>thinkpadintl</name>
+        <_description>IBM ThinkPad 560Z/600/600E/A22E, Intl</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>thinkpad60</name>
+        <_description>IBM ThinkPad R60/T60/R61/T61</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>thinkpadz60</name>
+        <_description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>ibm_spacesaver</name>
+        <_description>IBM Space Saver</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiaccess</name>
+        <_description>Logitech Access Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiclx300</name>
+        <_description>Logitech Cordless Desktop LX-300</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logii350</name>
+        <_description>Logitech Internet 350 Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logimel</name>
+        <_description>Logitech Media Elite Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd</name>
+        <_description>Logitech Cordless Desktop</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd_it</name>
+        <_description>Logitech Cordless Desktop iTouch</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd_nav</name>
+        <_description>Logitech Cordless Desktop Navigator</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd_opt</name>
+        <_description>Logitech Cordless Desktop Optical</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicda</name>
+        <_description>Logitech Cordless Desktop (alternate option)</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicdpa2</name>
+        <_description>Logitech Cordless Desktop Pro (alternate option2)</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicfn</name>
+        <_description>Logitech Cordless Freedom/Desktop Navigator</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicdn</name>
+        <_description>Logitech Cordless Desktop Navigator</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiitc</name>
+        <_description>Logitech iTouch Cordless Keyboard (model Y-RB6)</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiik</name>
+        <_description>Logitech Internet Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>itouch</name>
+        <_description>Logitech iTouch</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicink</name>
+        <_description>Logitech Internet Navigator Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiex110</name>
+        <_description>Logitech Cordless Desktop EX110</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiinkse</name>
+        <_description>Logitech iTouch Internet Navigator Keyboard SE</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiinkseusb</name>
+        <_description>Logitech iTouch Internet Navigator Keyboard SE (USB)</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiultrax</name>
+        <_description>Logitech Ultra-X Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiultraxc</name>
+        <_description>Logitech Ultra-X Cordless Media Desktop Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logidinovo</name>
+        <_description>Logitech diNovo Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logidinovoedge</name>
+        <_description>Logitech diNovo Edge Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>mx1998</name>
+        <_description>Memorex MX1998</_description>
+        <vendor>Memorex</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>mx2500</name>
+        <_description>Memorex MX2500 EZ-Access Keyboard</_description>
+        <vendor>Memorex</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>mx2750</name>
+        <_description>Memorex MX2750</_description>
+        <vendor>Memorex</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoft7000</name>
+        <_description>Microsoft Natural Wireless Ergonomic Keyboard 7000</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftinet</name>
+        <_description>Microsoft Internet Keyboard</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftpro</name>
+        <_description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftprousb</name>
+        <_description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftprooem</name>
+        <_description>Microsoft Natural Keyboard Pro OEM</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>vsonku306</name>
+        <_description>ViewSonic KU-306 Internet Keyboard</_description>
+        <vendor>ViewSonic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftprose</name>
+        <_description>Microsoft Internet Keyboard Pro, Swedish</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftoffice</name>
+        <_description>Microsoft Office Keyboard</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftmult</name> 
+        <_description>Microsoft Wireless Multimedia Keyboard 1.0A</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftelite</name> 
+        <_description>Microsoft Natural Keyboard Elite</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>oretec</name>
+        <_description>Ortek MCK-800 MM/Internet keyboard</_description>
+        <vendor>Ortek</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>propeller</name>
+        <_description>Propeller Voyager (KTEZ-1000)</_description>
+        <vendor>KeyTronic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>qtronix</name>
+        <_description>QTronix Scorpius 98N+</_description>
+        <vendor>QTronix</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>samsung4500</name>
+        <_description>Samsung SDM 4500P</_description>
+        <vendor>Samsung</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>samsung4510</name>
+        <_description>Samsung SDM 4510P</_description>
+        <vendor>Samsung</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sk1300</name>
+        <_description>SK-1300</_description>
+	<vendor>NEC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sk2500</name>
+        <_description>SK-2500</_description>
+	<vendor>NEC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sk6200</name>
+        <_description>SK-6200</_description>
+	<vendor>NEC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sk7100</name>
+        <_description>SK-7100</_description>
+	<vendor>NEC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sp_inet</name>
+        <_description>Super Power Multimedia Keyboard</_description>
+	<vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sven</name>
+        <_description>SVEN Ergonomic 2500</_description>
+	<vendor>SVEN</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sven303</name>
+        <_description>SVEN Slim 303</_description>
+	<vendor>SVEN</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>symplon</name>
+        <_description>Symplon PaceBook (tablet PC)</_description>
+	<vendor>Symplon</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>toshiba_s3000</name>
+        <_description>Toshiba Satellite S3000</_description>
+	<vendor>Toshiba</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>trust</name>
+        <_description>Trust Wireless Keyboard Classic</_description>
+	<vendor>Trust</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>trustda</name>
+        <_description>Trust Direct Access Keyboard</_description>
+	<vendor>Trust</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>yahoo</name>
+        <_description>Yahoo! Internet Keyboard</_description>
+	<vendor>Yahoo!</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macbook78</name>
+        <_description>MacBook/MacBook Pro</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macbook79</name>
+        <_description>MacBook/MacBook Pro (Intl)</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macintosh</name>
+        <_description>Macintosh</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macintosh_old</name>
+        <_description>Macintosh Old</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macintosh_hhk</name>
+        <_description>Happy Hacking Keyboard for Mac</_description>
+	<vendor>Fujitsu</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>acer_c300</name>
+        <_description>Acer C300</_description>
+	<vendor>Acer</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>acer_ferrari4k</name>
+        <_description>Acer Ferrari 4000</_description>
+	<vendor>Acer</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>acer_laptop</name>
+        <_description>Acer Laptop</_description>
+	<vendor>Acer</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>asus_laptop</name>
+        <_description>Asus Laptop</_description>
+	<vendor>Asus</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>apple</name>
+        <_description>Apple</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>apple_laptop</name>
+        <_description>Apple Laptop</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>silvercrest</name>
+        <_description>SILVERCREST Multimedia Wireless Keyboard</_description>
+	<vendor>Silvercrest</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>emachines</name>
+        <_description>Laptop/notebook eMachines m68xx</_description>
+	<vendor>eMachines</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>kr106</name>
+	<_description>Korean 106-key</_description>
+	<vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>evdev</name>
+	<_description>Evdev-managed keyboard</_description>
+	<vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>benqx</name>
+	<_description>BenQ X-Touch</_description>
+	<vendor>BenQ</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>benqx730</name>
+	<_description>BenQ X-Touch 730</_description>
+	<vendor>BenQ</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>benqx800</name>
+	<_description>BenQ X-Touch 800</_description>
+	<vendor>BenQ</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>hhk</name>
+	<_description>Happy Hacking Keyboard</_description>
+	<vendor>Fujitsu</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>classmate</name>
+	<_description>Classmate PC</_description>
+	<vendor>Intel</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>olpc</name>
+	<_description>OLPC</_description>
+	<vendor>OLPC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun6</name>
+        <_description>Sun Type 5/6</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+  </modelList>
+  <layoutList>
+    <layout>
+      <configItem>
+        <name>us</name>
+        <_shortDescription>USA</_shortDescription>
+        <_description>USA</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>chr</name>
+            <_description>Cherokee</_description>
+            <languageList><iso639Id>chr</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>euro</name>
+            <_description>With EuroSign on 5</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>intl</name>
+            <_description>International (with dead keys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>alt-intl</name>
+            <_description>Alternative international (former us_intl)</_description>
+          </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>colemak</name>
+            <_description>Colemak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-intl</name>
+            <_description>Dvorak international</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-l</name>
+            <_description>Left handed Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-r</name>
+            <_description>Right handed Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-classic</name>
+            <_description>Classic Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvp</name>
+            <_description>Programmer Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rus</name>
+            <_description>Russian phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>altgr-intl</name>
+            <_description>International (AltGr dead keys)</_description>
+            <languageList><iso639Id>eng</iso639Id>
+                          <iso639Id>fra</iso639Id>
+                          <iso639Id>ger</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>olpc2</name>
+            <_description>Group toggle on multiply/divide key</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ad</name>
+        <_shortDescription>And</_shortDescription>
+        <_description>Andorra</_description>
+        <languageList><iso639Id>cat</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>af</name>
+        <_shortDescription>Afg</_shortDescription>
+        <_description>Afghanistan</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ps</name>
+            <_description>Pashto</_description>
+            <languageList><iso639Id>pus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>uz</name>
+            <_description>Southern Uzbek</_description>
+            <languageList><iso639Id>uzb</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>olpc-ps</name>
+            <_description>OLPC Pashto</_description>
+            <languageList><iso639Id>pus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>olpc-fa</name>
+            <_description>OLPC Dari</_description>
+            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>olpc-uz</name>
+            <_description>OLPC Southern Uzbek</_description>
+            <languageList><iso639Id>uzb</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ara</name>
+        <_shortDescription>Ara</_shortDescription>
+        <_description>Arabic</_description>
+        <countryList>
+          <iso3166Id>AE</iso3166Id>
+          <iso3166Id>BH</iso3166Id>
+          <iso3166Id>DZ</iso3166Id>
+          <iso3166Id>EG</iso3166Id>
+          <iso3166Id>EH</iso3166Id>
+          <iso3166Id>JO</iso3166Id>
+          <iso3166Id>KW</iso3166Id>
+          <iso3166Id>LB</iso3166Id>
+          <iso3166Id>LY</iso3166Id>
+          <iso3166Id>MA</iso3166Id>
+          <iso3166Id>MR</iso3166Id>
+          <iso3166Id>OM</iso3166Id>
+          <iso3166Id>PS</iso3166Id>
+          <iso3166Id>QA</iso3166Id>
+          <iso3166Id>SA</iso3166Id>
+          <iso3166Id>SD</iso3166Id>
+          <iso3166Id>SY</iso3166Id>
+          <iso3166Id>TN</iso3166Id>
+          <iso3166Id>YE</iso3166Id>
+        </countryList>
+        <languageList><iso639Id>ara</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>azerty</name>
+            <_description>azerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>azerty_digits</name>
+            <_description>azerty/digits</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>digits</name>
+            <_description>digits</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty_digits</name>
+            <_description>qwerty/digits</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>buckwalter</name>
+            <_description>Buckwalter</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>al</name>
+        <_shortDescription>Alb</_shortDescription>
+        <_description>Albania</_description>
+        <languageList><iso639Id>alb</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>am</name>
+        <_shortDescription>Arm</_shortDescription>
+        <_description>Armenia</_description>
+        <languageList><iso639Id>hye</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>phonetic-alt</name>
+            <_description>Alternative Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>eastern</name>
+            <_description>Eastern</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>western</name>
+            <_description>Western</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>eastern-alt</name>
+            <_description>Alternative Eastern</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>az</name>
+        <_shortDescription>Aze</_shortDescription>
+        <_description>Azerbaijan</_description>
+        <languageList><iso639Id>aze</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>cyrillic</name>
+            <_description>Cyrillic</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>by</name>
+        <_shortDescription>Blr</_shortDescription>
+        <_description>Belarus</_description>
+        <languageList><iso639Id>bel</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>winkeys</name>
+            <_description>Winkeys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin</name>
+            <_description>Latin</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>be</name>
+        <_shortDescription>Bel</_shortDescription>
+        <_description>Belgium</_description>
+        <languageList><iso639Id>ger</iso639Id>
+                      <iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>iso-alternate</name>
+            <_description>ISO Alternate</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>wang</name>
+            <_description>Wang model 724 azerty</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>bd</name>
+        <_shortDescription>Ban</_shortDescription>
+        <_description>Bangladesh</_description>
+        <languageList><iso639Id>ben</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>probhat</name>
+            <_description>Probhat</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>in</name>
+        <_shortDescription>Ind</_shortDescription>
+        <_description>India</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ben</name>
+            <_description>Bengali</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ben_probhat</name>
+            <_description>Bengali Probhat</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>guj</name>
+            <_description>Gujarati</_description>
+            <languageList><iso639Id>guj</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>guru</name>
+            <_description>Gurmukhi</_description>
+            <languageList><iso639Id>pan</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>jhelum</name>
+            <_description>Gurmukhi Jhelum</_description>
+            <languageList><iso639Id>pan</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kan</name>
+            <_description>Kannada</_description>
+            <languageList><iso639Id>kan</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mal</name>
+            <_description>Malayalam</_description>
+            <languageList><iso639Id>mal</iso639Id></languageList>
+         </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>mal_lalitha</name>
+            <_description>Malayalam Lalitha</_description>
+            <languageList><iso639Id>mal</iso639Id></languageList>
+         </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ori</name>
+            <_description>Oriya</_description>
+            <languageList><iso639Id>ori</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_unicode</name>
+            <_description>Tamil Unicode</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_TAB</name>
+            <_description>Tamil TAB Typewriter</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_TSCII</name>
+            <_description>Tamil TSCII Typewriter</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam</name>
+            <_description>Tamil</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tel</name>
+            <_description>Telugu</_description>
+            <languageList><iso639Id>tel</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>urd</name>
+            <_description>Urdu</_description>
+            <languageList><iso639Id>urd</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>bolnagri</name>
+            <_description>Hindi Bolnagri</_description>
+            <languageList><iso639Id>hin</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ba</name>
+        <_shortDescription>Bih</_shortDescription>
+        <_description>Bosnia and Herzegovina</_description>
+        <languageList><iso639Id>bos</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description> Use guillemets for quotes</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicode</name>
+            <_description>Use Bosnian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicodeus</name>
+            <_description>US keyboard with Bosnian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Bosnian letters</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>br</name>
+        <_shortDescription>Bra</_shortDescription>
+        <_description>Brazil</_description>
+        <languageList><iso639Id>por</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo</name>
+            <_description>Nativo</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo-us</name>
+            <_description>Nativo for USA keyboards</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo-epo</name>
+            <_description>Nativo for Esperanto</_description>
+            <languageList><iso639Id>epo</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>bg</name>
+        <_shortDescription>Bgr</_shortDescription>
+        <_description>Bulgaria</_description>
+        <languageList><iso639Id>bul</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ma</name>
+        <_description>Morocco</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>french</name>
+            <_description>French</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh</name>
+            <_description>Tifinagh</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-alt</name>
+            <_description>Tifinagh Alternative</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-alt-phonetic</name>
+            <_description>Tifinagh Alternative Phonetic</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-extended</name>
+            <_description>Tifinagh Extended</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-phonetic</name>
+            <_description>Tifinagh Phonetic</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-extended-phonetic</name>
+            <_description>Tifinagh Extended Phonetic</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mm</name>
+        <_shortDescription>Mmr</_shortDescription>
+        <_description>Myanmar</_description>
+        <languageList><iso639Id>mya</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ca</name>
+        <_shortDescription>Can</_shortDescription>
+        <_description>Canada</_description>
+        <languageList><iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>fr-dvorak</name>
+            <_description>French Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr-legacy</name>
+            <_description>French (legacy)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>multix</name>
+            <_description>Multilingual</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>multi</name>
+            <_description>Multilingual, first part</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>multi-2gr</name>
+            <_description>Multilingual, second part</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ike</name>
+            <_description>Inuktitut</_description>
+            <languageList><iso639Id>iku</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>shs</name>
+            <_description>Secwepemctsin</_description>
+            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kut</name>
+            <_description>Ktunaxa</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>cd</name>
+        <_shortDescription>DRC</_shortDescription>
+        <_description>Congo, Democratic Republic of the</_description>
+        <languageList><iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>cn</name>
+        <_shortDescription>China</_shortDescription>
+        <_description>China</_description>
+        <languageList><iso639Id>chi</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>tib</name>
+            <_description>Tibetan</_description>
+            <languageList><iso639Id>tib</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tib_asciinum</name>
+            <_description>Tibetan (with ASCII numerals)</_description>
+            <languageList><iso639Id>tib</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>hr</name>
+        <_shortDescription>Hrv</_shortDescription>
+        <_description>Croatia</_description>
+        <languageList><iso639Id>scr</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description>Use guillemets for quotes</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicode</name>
+            <_description>Use Croatian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicodeus</name>
+            <_description>US keyboard with Croatian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Croatian letters</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>cz</name>
+        <_shortDescription>Cze</_shortDescription>
+        <_description>Czechia</_description>
+        <languageList><iso639Id>cze</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>bksl</name>
+            <_description>With &lt;\|&gt; key</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty_bksl</name>
+            <_description>qwerty, extended Backslash</_description>
+          </configItem>
+        </variant>
+	<variant>
+	  <configItem>
+	    <name>ucw</name>
+	    <_description>UCW layout (accented letters only)</_description>
+	 </configItem>
+	</variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>dk</name>
+        <_shortDescription>Dan</_shortDescription>
+        <_description>Denmark</_description>
+        <languageList><iso639Id>dan</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_nodeadkeys</name>
+            <_description>Macintosh, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>nl</name>
+        <_shortDescription>Nld</_shortDescription>
+        <_description>Netherlands</_description>
+        <languageList><iso639Id>nld</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>std</name>
+            <_description>Standard</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>bt</name>
+        <_shortDescription>Bhu</_shortDescription>
+        <_description>Bhutan</_description>
+        <languageList><iso639Id>dzo</iso639Id></languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ee</name>
+        <_shortDescription>Est</_shortDescription>
+        <_description>Estonia</_description>
+        <languageList><iso639Id>est</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Estonian letters</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ir</name>
+        <_shortDescription>Irn</_shortDescription>
+        <_description>Iran</_description>
+        <languageList><iso639Id>per</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>pro</name>
+            <_description>Pro</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>keypad</name>
+            <_description>Keypad</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>pro_keypad</name>
+            <_description>Pro Keypad</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <_description>Kurdish, Latin Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <_description>Kurdish, (F)</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <_description>Kurdish, Latin Alt-Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_ara</name>
+            <_description>Kurdish, Arabic-Latin</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>iq</name>
+        <_shortDescription>Irq</_shortDescription>
+        <_description>Iraq</_description>
+        <languageList><iso639Id>ara</iso639Id>
+                      <iso639Id>kur</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <_description>Kurdish, Latin Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <_description>Kurdish, (F)</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <_description>Kurdish, Latin Alt-Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_ara</name>
+            <_description>Kurdish, Arabic-Latin</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>fo</name>
+        <_shortDescription>Fao</_shortDescription>
+        <_description>Faroe Islands</_description>
+        <languageList><iso639Id>fao</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>fi</name>
+        <_shortDescription>Fin</_shortDescription>
+        <_description>Finland</_description>
+        <languageList><iso639Id>fin</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>smi</name>
+            <_description>Northern Saami</_description>
+            <languageList><iso639Id>smi</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>classic</name>
+            <_description>Classic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>fr</name>
+        <_shortDescription>Fra</_shortDescription>
+        <_description>France</_description>
+        <languageList><iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss</name>
+            <_description>Alternative</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss_latin9</name>
+            <_description>Alternative, latin-9 only</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss_nodeadkeys</name>
+            <_description>Alternative, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss_sundeadkeys</name>
+            <_description>Alternative, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin9</name>
+            <_description>(Legacy) Alternative</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin9_nodeadkeys</name>
+            <_description>(Legacy) Alternative, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin9_sundeadkeys</name>
+            <_description>(Legacy) Alternative, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>bepo</name>
+            <_description>Bepo, ergonomic, Dvorak way</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>bepo_latin9</name>
+            <_description>Bepo, ergonomic, Dvorak way, latin-9 only</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>geo</name>
+            <_description>Georgian AZERTY Tskapo</_description>
+            <languageList><iso639Id>geo</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>gh</name>
+        <_shortDescription>Gha</_shortDescription>
+        <_description>Ghana</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>generic</name>
+            <_description>Multilingual</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>akan</name>
+            <_description>Akan</_description>
+            <languageList><iso639Id>aka</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ewe</name>
+            <_description>Ewe</_description>
+            <languageList><iso639Id>ewe</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fula</name>
+            <_description>Fula</_description>
+            <languageList><iso639Id>ful</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ga</name>
+            <_description>Ga</_description>
+            <languageList><iso639Id>gaa</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>hausa</name>
+            <_description>Hausa</_description>
+            <languageList><iso639Id>hau</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>gn</name>
+        <_shortDescription>Gui</_shortDescription>
+        <_description>Guinea</_description>
+        <languageList><iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ge</name>
+        <_shortDescription>Geo</_shortDescription>
+        <_description>Georgia</_description>
+        <languageList><iso639Id>geo</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ergonomic</name>
+            <_description>Ergonomic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mess</name>
+            <_description>MESS</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ru</name>
+            <_description>Russian</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>os</name>
+            <_description>Ossetian</_description>
+            <languageList><iso639Id>oss</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>de</name>
+        <_shortDescription>Deu</_shortDescription>
+        <_description>Germany</_description>
+        <languageList><iso639Id>ger</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>deadacute</name>
+            <_description>Dead acute</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>deadgraveacute</name>
+            <_description>Dead grave acute</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ro</name>
+            <_description>Romanian keyboard with German letters</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ro_nodeadkeys</name>
+            <_description>Romanian keyboard with German letters, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>neo</name>
+            <_description>Neostyle</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_nodeadkeys</name>
+            <_description>Macintosh, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>gr</name>
+        <_shortDescription>Gre</_shortDescription>
+        <_description>Greece</_description>
+        <languageList><iso639Id>gre</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>simple</name>
+            <_description>Simple</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>extended</name>
+            <_description>Extended</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>polytonic</name>
+            <_description>Polytonic</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>hu</name>
+        <_shortDescription>Hun</_shortDescription>
+        <_description>Hungary</_description>
+        <languageList><iso639Id>hun</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>standard</name>
+            <_description>Standard</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
+          </configItem>
+        </variant>
+
+        <!-- 101 keys -->
+        <variant>
+          <configItem>
+            <name>101_qwertz_comma_dead</name>
+            <_description>101/qwertz/comma/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwertz_comma_nodead</name>
+            <_description>101/qwertz/comma/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwertz_dot_dead</name>
+            <_description>101/qwertz/dot/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwertz_dot_nodead</name>
+            <_description>101/qwertz/dot/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwerty_comma_dead</name>
+            <_description>101/qwerty/comma/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwerty_comma_nodead</name>
+            <_description>101/qwerty/comma/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwerty_dot_dead</name>
+            <_description>101/qwerty/dot/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwerty_dot_nodead</name>
+            <_description>101/qwerty/dot/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+
+
+        <!-- 102 keys -->
+        <variant>
+          <configItem>
+            <name>102_qwertz_comma_dead</name>
+            <_description>102/qwertz/comma/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwertz_comma_nodead</name>
+            <_description>102/qwertz/comma/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwertz_dot_dead</name>
+            <_description>102/qwertz/dot/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwertz_dot_nodead</name>
+            <_description>102/qwertz/dot/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwerty_comma_dead</name>
+            <_description>102/qwerty/comma/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwerty_comma_nodead</name>
+            <_description>102/qwerty/comma/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwerty_dot_dead</name>
+            <_description>102/qwerty/dot/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwerty_dot_nodead</name>
+            <_description>102/qwerty/dot/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>is</name>
+        <_shortDescription>Isl</_shortDescription>
+        <_description>Iceland</_description>
+        <languageList><iso639Id>ice</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>Sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>il</name>
+        <_shortDescription>Isr</_shortDescription>
+        <_description>Israel</_description>
+        <languageList><iso639Id>heb</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>lyx</name>
+            <_description>lyx</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>biblical</name>
+            <_description>Biblical Hebrew (Tiro)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>it</name>
+        <_shortDescription>Ita</_shortDescription>
+        <_description>Italy</_description>
+        <languageList><iso639Id>ita</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>geo</name>
+            <_description>Georgian</_description>
+            <languageList><iso639Id>geo</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>jp</name>
+        <_shortDescription>Jpn</_shortDescription>
+        <_description>Japan</_description>
+        <languageList><iso639Id>jpn</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>kana</name>
+            <_description>Kana</_description>
+          </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>OADG109A</name>
+            <_description>OADG 109A</_description>
+          </configItem>
+	</variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>kg</name>
+        <_shortDescription>Kir</_shortDescription>
+        <_description>Kyrgyzstan</_description>
+        <languageList><iso639Id>kir</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>kh</name>
+        <_shortDescription>Khm</_shortDescription>
+        <_description>Cambodia</_description>
+        <languageList><iso639Id>khm</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+	<name>kz</name>
+	<_shortDescription>Kaz</_shortDescription>
+	<_description>Kazakhstan</_description>
+        <languageList><iso639Id>kaz</iso639Id></languageList>
+      </configItem>
+      <variantList>
+	<variant>
+	  <configItem>
+	    <name>ruskaz</name>
+	    <_description>Russian with Kazakh</_description>
+            <languageList><iso639Id>kaz</iso639Id>
+                          <iso639Id>rus</iso639Id></languageList>
+	  </configItem>
+	</variant>
+	<variant>
+	  <configItem>
+	    <name>kazrus</name>
+	    <_description>Kazakh with Russian</_description>
+            <languageList><iso639Id>kaz</iso639Id>
+                          <iso639Id>rus</iso639Id></languageList>
+	  </configItem>
+	</variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>la</name>
+        <_shortDescription>Lao</_shortDescription>
+        <_description>Laos</_description>
+        <languageList><iso639Id>lao</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>latam</name>
+        <_shortDescription>LAm</_shortDescription>
+        <_description>Latin American</_description>
+        <countryList>
+          <iso3166Id>AR</iso3166Id>
+          <iso3166Id>BO</iso3166Id>
+          <iso3166Id>CL</iso3166Id>
+          <iso3166Id>CO</iso3166Id>
+          <iso3166Id>CR</iso3166Id>
+          <iso3166Id>CU</iso3166Id>
+          <iso3166Id>DO</iso3166Id>
+          <iso3166Id>EC</iso3166Id>
+          <iso3166Id>GT</iso3166Id>
+          <iso3166Id>HN</iso3166Id>
+          <iso3166Id>HT</iso3166Id>
+          <iso3166Id>MX</iso3166Id>
+          <iso3166Id>NI</iso3166Id>
+          <iso3166Id>PA</iso3166Id>
+          <iso3166Id>PE</iso3166Id>
+          <iso3166Id>PR</iso3166Id>
+          <iso3166Id>PY</iso3166Id>
+          <iso3166Id>UY</iso3166Id>
+          <iso3166Id>VE</iso3166Id>
+        </countryList>
+        <languageList><iso639Id>spa</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>lt</name>
+        <_shortDescription>Ltu</_shortDescription>
+        <_description>Lithuania</_description>
+        <languageList><iso639Id>lit</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>std</name>
+            <_description>Standard</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Lithuanian letters</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ibm</name>
+            <_description>IBM (LST 1205-92)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>lekp</name>
+            <_description>LEKP</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>lekpa</name>
+            <_description>LEKPa</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>balticplus</name>
+            <_description>Baltic+</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>lv</name>
+        <_shortDescription>Lav</_shortDescription>
+        <_description>Latvia</_description>
+        <languageList><iso639Id>lav</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>apostrophe</name>
+            <_description>Apostrophe (') variant</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tilde</name>
+            <_description>Tilde (~) variant</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fkey</name>
+            <_description>F-letter (F) variant</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mao</name>
+        <_shortDescription>Mao</_shortDescription>
+        <_description>Maori</_description>
+        <languageList><iso639Id>mao</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>me</name>
+        <_shortDescription>MNE</_shortDescription>
+        <_description>Montenegro</_description>
+        <languageList><iso639Id>srp</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>cyrillic</name>
+            <_description>Cyrillic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cyrillicyz</name>
+            <_description>Cyrillic, Z and ZHE swapped</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicode</name>
+            <_description>Latin unicode</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinyz</name>
+            <_description>Latin qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicodeyz</name>
+            <_description>Latin unicode qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cyrillicalternatequotes</name>
+            <_description>Cyrillic with guillemets</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinalternatequotes</name>
+            <_description>Latin with guillemets</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mk</name>
+        <_shortDescription>Mkd</_shortDescription>
+        <_description>Macedonia</_description>
+        <languageList><iso639Id>mkd</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mt</name>
+        <_shortDescription>Mlt</_shortDescription>
+        <_description>Malta</_description>
+        <languageList><iso639Id>mlt</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>Maltese keyboard with US layout</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mn</name>
+        <_shortDescription>Mng</_shortDescription>
+        <_description>Mongolia</_description>
+        <languageList><iso639Id>mng</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>no</name>
+        <_shortDescription>Nor</_shortDescription>
+        <_description>Norway</_description>
+        <languageList><iso639Id>nor</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>smi</name>
+            <_description>Northern Saami</_description>
+            <languageList><iso639Id>sme</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>smi_nodeadkeys</name>
+            <_description>Northern Saami, eliminate dead keys</_description>
+            <languageList><iso639Id>sme</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_nodeadkeys</name>
+            <_description>Macintosh, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>pl</name>
+        <_shortDescription>Pol</_shortDescription>
+        <_description>Poland</_description>
+        <languageList><iso639Id>pol</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>qwertz</name>
+            <_description>qwertz</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak_quotes</name>
+            <_description>Dvorak, Polish quotes on quotemark key</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak_altquotes</name>
+            <_description>Dvorak, Polish quotes on key "1/!"</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>csb</name>
+            <_description>Kashubian</_description>
+            <languageList><iso639Id>csb</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ru_phonetic_dvorak</name>
+            <_description>Russian phonetic Dvorak</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>pt</name>
+        <_shortDescription>Prt</_shortDescription>
+        <_description>Portugal</_description>
+        <languageList><iso639Id>por</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_nodeadkeys</name>
+            <_description>Macintosh, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_sundeadkeys</name>
+            <_description>Macintosh, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo</name>
+            <_description>Nativo</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo-us</name>
+            <_description>Nativo for USA keyboards</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo-epo</name>
+            <_description>Nativo for Esperanto</_description>
+            <languageList><iso639Id>epo</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ro</name>
+        <_shortDescription>Rou</_shortDescription>
+        <_description>Romania</_description>
+        <languageList><iso639Id>rum</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>cedilla</name>
+            <_description>Cedilla</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>std</name>
+            <_description>Standard</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>std_cedilla</name>
+            <_description>Standard (Cedilla)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>winkeys</name>
+            <_description>Winkeys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ru</name>
+        <_shortDescription>Rus</_shortDescription>
+        <_description>Russia</_description>
+        <languageList><iso639Id>rus</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>typewriter</name>
+            <_description>Typewriter</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>legacy</name>
+            <_description>Legacy</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tt</name>
+            <_description>Tatar</_description>
+            <languageList><iso639Id>tat</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>os_legacy</name>
+            <_description>Ossetian, legacy</_description>
+            <languageList><iso639Id>oss</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>os_winkeys</name>
+            <_description>Ossetian, Winkeys</_description>
+            <languageList><iso639Id>oss</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cv</name>
+            <_description>Chuvash</_description>
+            <languageList><iso639Id>chv</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cv_latin</name>
+            <_description>Chuvash Latin</_description>
+            <languageList><iso639Id>chv</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>udm</name>
+            <_description>Udmurt</_description>
+            <languageList><iso639Id>udm</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kom</name>
+            <_description>Komi</_description>
+            <languageList><iso639Id>kom</iso639Id></languageList>
+          </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>sah</name>
+            <_description>Yakut</_description>
+            <languageList><iso639Id>sah</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>rs</name>
+        <_shortDescription>SRB</_shortDescription>
+        <_description>Serbia</_description>
+        <languageList><iso639Id>srp</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>yz</name>
+            <_description>Z and ZHE swapped</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin</name>
+            <_description>Latin</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicode</name>
+            <_description>Latin Unicode</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinyz</name>
+            <_description>Latin qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicodeyz</name>
+            <_description>Latin Unicode qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description>With guillemets</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinalternatequotes</name>
+            <_description>Latin with guillemets</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>si</name>
+        <_shortDescription>Svn</_shortDescription>
+        <_description>Slovenia</_description>
+        <languageList><iso639Id>slv</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description>Use guillemets for quotes</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicode</name>
+            <_description>Use Slovenian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicodeus</name>
+            <_description>US keyboard with Slovenian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Slovenian letters</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>sk</name>
+        <_shortDescription>Svk</_shortDescription>
+        <_description>Slovakia</_description>
+        <languageList><iso639Id>slo</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>bksl</name>
+            <_description>Extended Backslash</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty_bksl</name>
+            <_description>qwerty, extended Backslash</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>es</name>
+        <_shortDescription>Esp</_shortDescription>
+        <_description>Spain</_description>
+        <languageList><iso639Id>spa</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ast</name>
+            <_description>Asturian variant with bottom-dot H and bottom-dot L</_description>
+            <languageList><iso639Id>ast</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cat</name>
+            <_description>Catalan variant with middle-dot L</_description>
+            <languageList><iso639Id>cat</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>se</name>
+        <_shortDescription>Swe</_shortDescription>
+        <_description>Sweden</_description>
+        <languageList><iso639Id>swe</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rus</name>
+            <_description>Russian phonetic</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rus_nodeadkeys</name>
+            <_description>Russian phonetic, eliminate dead keys</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>smi</name>
+            <_description>Northern Saami</_description>
+            <languageList><iso639Id>sme</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>svdvorak</name>
+            <_description>Svdvorak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ch</name>
+        <_shortDescription>Che</_shortDescription>
+        <_description>Switzerland</_description>
+        <languageList><iso639Id>ger</iso639Id>
+                      <iso639Id>gsw</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>de_nodeadkeys</name>
+            <_description>German, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>de_sundeadkeys</name>
+            <_description>German, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr</name>
+            <_description>French</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr_nodeadkeys</name>
+            <_description>French, eliminate dead keys</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr_sundeadkeys</name>
+            <_description>French, Sun dead keys</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr_mac</name>
+            <_description>French (Macintosh)</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>de_mac</name>
+            <_description>German (Macintosh)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>sy</name>
+        <_shortDescription>Syr</_shortDescription>
+        <_description>Syria</_description>
+        <languageList><iso639Id>syr</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>syc</name>
+            <_description>Syriac</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>syc_phonetic</name>
+            <_description>Syriac phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <_description>Kurdish, Latin Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <_description>Kurdish, (F)</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <_description>Kurdish, Latin Alt-Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>tj</name>
+        <_shortDescription>Tjk</_shortDescription>
+        <_description>Tajikistan</_description>
+        <languageList><iso639Id>tgk</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>lk</name>
+        <_shortDescription>SrL</_shortDescription>
+        <_description>Sri Lanka</_description>
+        <languageList><iso639Id>sin</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>tam_unicode</name>
+            <_description>Tamil Unicode</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_TAB</name>
+            <_description>Tamil TAB Typewriter</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>th</name>
+        <_shortDescription>Tha</_shortDescription>
+        <_description>Thailand</_description>
+        <languageList><iso639Id>tha</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>tis</name>
+            <_description>TIS-820.2538</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>pat</name>
+            <_description>Pattachote</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>tr</name>
+        <_shortDescription>Tur</_shortDescription>
+        <_description>Turkey</_description>
+        <languageList><iso639Id>tur</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>f</name>
+            <_description>(F)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>alt</name>
+            <_description>Alt-Q</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <_description>Kurdish, Latin Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <_description>Kurdish, (F)</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <_description>Kurdish, Latin Alt-Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>intl</name>
+            <_description>International (with dead keys)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ua</name>
+        <_shortDescription>Ukr</_shortDescription>
+        <_description>Ukraine</_description>
+        <languageList><iso639Id>ukr</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>typewriter</name>
+            <_description>Typewriter</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>winkeys</name>
+            <_description>Winkeys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicode</name>
+            <_description>Unicode</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rstu</name>
+<!-- RSTU 2019-91 -->
+            <_description>Standard RSTU</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rstu_ru</name>
+<!-- RSTU 2019-91 -->
+            <_description>Standard RSTU on Russian layout</_description>
+          </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>homophonic</name>
+            <_description>Homophonic</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>gb</name>
+        <_shortDescription>GBr</_shortDescription>
+        <_description>United Kingdom</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>intl</name>
+            <_description>International (with dead keys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorakukp</name>
+            <_description>Dvorak (UK Punctuation)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>colemak</name>
+            <_description>Colemak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>uz</name>
+        <_shortDescription>Uzb</_shortDescription>
+        <_description>Uzbekistan</_description>
+        <languageList><iso639Id>uzb</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>latin</name>
+            <_description>Latin</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>vn</name>
+        <_shortDescription>Vnm</_shortDescription>
+        <_description>Vietnam</_description>
+        <languageList><iso639Id>vie</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+       <configItem>
+        <name>kr</name>
+        <_shortDescription>Kor</_shortDescription>
+        <_description>Korea, Republic of</_description>
+        <languageList><iso639Id>kor</iso639Id></languageList>
+      </configItem>
+      <variantList>
+	<variant>
+	  <configItem>
+	    <name>kr104</name>
+	    <_description>101/104 key Compatible</_description>
+	  </configItem>
+	</variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>nec_vndr/jp</name>
+        <_shortDescription>Jpn</_shortDescription>
+        <_description>Japan (PC-98xx Series)</_description>
+        <countryList><iso3166Id>JP</iso3166Id></countryList>
+        <languageList><iso639Id>jpn</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ie</name>
+        <_shortDescription>Irl</_shortDescription>
+        <_description>Ireland</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>CloGaelach</name>
+            <_description>CloGaelach</_description>
+            <languageList><iso639Id>gla</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>UnicodeExpert</name>
+            <_description>UnicodeExpert</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ogam</name>
+            <_description>Ogham</_description>
+            <!-- No ISO code in ISO639 -->
+         </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ogam_is434</name>
+            <_description>Ogham IS434</_description>
+            <!-- No ISO code in ISO639 -->
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>pk</name>
+        <_shortDescription>Pak</_shortDescription>
+        <_description>Pakistan</_description>
+        <languageList><iso639Id>urd</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ara</name>
+            <_description>Arabic</_description>
+            <languageList><iso639Id>ara</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mv</name>
+        <_shortDescription>Mal</_shortDescription>
+        <_description>Maldives</_description>
+        <languageList><iso639Id>div</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+       <configItem>
+        <name>za</name>
+        <_shortDescription>Zar</_shortDescription>
+        <_description>South Africa</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>epo</name>
+        <_shortDescription>Epo</_shortDescription>
+	<_description>Esperanto</_description>
+        <languageList><iso639Id>epo</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>legacy</name>
+            <_description>displaced semicolon and quote (obsolete)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>np</name>
+        <_shortDescription>Nep</_shortDescription>
+	<_description>Nepal</_description>
+        <languageList><iso639Id>nep</iso639Id></languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ng</name>
+        <_shortDescription>Nig</_shortDescription>
+	<_description>Nigeria</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>igbo</name>
+            <_description>Igbo</_description>
+            <languageList><iso639Id>ibo</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>yoruba</name>
+            <_description>Yoruba</_description>
+            <languageList><iso639Id>yor</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>hausa</name>
+            <_description>Hausa</_description>
+            <languageList><iso639Id>hau</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>et</name>
+        <_shortDescription>Eth</_shortDescription>
+        <_description>Ethiopia</_description>
+        <languageList><iso639Id>amh</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>braille</name>
+        <_shortDescription>Brl</_shortDescription>
+        <_description>Braille</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>left_hand</name>
+            <_description>Left hand</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>right_hand</name>
+            <_description>Right hand</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+  </layoutList>
+  <optionList>
+    <group allowMultipleSelection="true">
+      <!-- The key combination used to switch between groups -->
+      <configItem>
+        <name>grp</name>
+        <_description>Layout switching</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>grp:switch</name>
+          <_description>R-Alt switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lswitch</name>
+          <_description>Left Alt key switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lwin_switch</name>
+          <_description>Left Win-key switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rwin_switch</name>
+          <_description>Right Win-key switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:win_switch</name>
+          <_description>Both Win-keys switch layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:caps_switch</name>
+          <_description>CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rctrl_switch</name>
+          <_description>Right Ctrl key switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:toggle</name>
+          <_description>Right Alt key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lalt_toggle</name>
+          <_description>Left Alt key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:caps_toggle</name>
+          <_description>CapsLock key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:shift_caps_toggle</name>
+          <_description>Shift+CapsLock changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:shift_caps_switch</name>
+          <_description>CapsLock switch to first layout, Shift+CapsLock switch to last layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:alt_caps_toggle</name>
+          <_description>Alt+CapsLock changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:shifts_toggle</name>
+          <_description>Both Shift keys together change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:alts_toggle</name>
+          <_description>Both Alt keys together change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:ctrls_toggle</name>
+          <_description>Both Ctrl keys together change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:ctrl_shift_toggle</name>
+          <_description>Ctrl+Shift change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lctrl_lshift_toggle</name>
+          <_description>LCtrl+LShift change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:ctrl_alt_toggle</name>
+          <_description>Alt+Ctrl change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:alt_shift_toggle</name>
+          <_description>Alt+Shift change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:menu_toggle</name>
+          <_description>Menu key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lwin_toggle</name>
+          <_description>Left Win-key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rwin_toggle</name>
+          <_description>Right Win-key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lshift_toggle</name>
+          <_description>Left Shift key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rshift_toggle</name>
+          <_description>Right Shift key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lctrl_toggle</name>
+          <_description>Left Ctrl key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rctrl_toggle</name>
+          <_description>Right Ctrl key changes layout.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <!-- The key combination used to choose the 3rd (and 4th, together with Shift)
+	   level of symbols -->
+      <configItem>
+        <name>lv3</name>
+        <_description>Third level choosers</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>lv3:switch</name>
+          <_description>Press Right Ctrl to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:menu_switch</name>
+          <_description>Press Menu key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:win_switch</name>
+          <_description>Press any of Win-keys to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:lwin_switch</name>
+          <_description>Press Left Win-key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:rwin_switch</name>
+          <_description>Press Right Win-key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:alt_switch</name>
+          <_description>Press any of Alt keys to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:lalt_switch</name>
+          <_description>Press Left Alt key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:ralt_switch</name>
+          <_description>Press Right Alt key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:ralt_switch_multikey</name>
+          <_description>Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:ralt_alt</name>
+          <_description>Right Alt key never chooses 3rd level.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- Tweaking the position of the "Ctrl" key -->
+      <configItem>
+        <name>ctrl</name>
+        <_description>Ctrl key position</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>ctrl:nocaps</name>
+          <_description>Make CapsLock an additional Ctrl.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:swapcaps</name>
+          <_description>Swap Ctrl and CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_ac</name>
+          <_description>Ctrl key at left of 'A'</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_aa</name>
+          <_description>Ctrl key at bottom left</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_ra</name>
+          <_description>Right Ctrl key works as Right Alt.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <!-- Using startard LEDs to indicate the alternative (not first) group(s) -->
+      <configItem>
+        <name>grp_led</name>
+        <_description>Use keyboard LED to show alternative layout.</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>grp_led:num</name>
+          <_description>NumLock LED shows alternative layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp_led:caps</name>
+          <_description>CapsLock LED shows alternative layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp_led:scroll</name>
+          <_description>ScrollLock LED shows alternative layout.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- Select a keypad type -->
+      <configItem>
+        <name>keypad</name>
+        <_description>Numeric keypad layout selection</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>keypad:legacy</name>
+          <_description>Legacy keypad</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:oss</name>
+          <_description>Keypad with unicode additions (arrows and math operators)</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:future</name>
+          <_description>Keypad with unicode additions (arrows and math operators). Math operators on default level.</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:legacy_wang</name>
+          <_description>Legacy Wang 724 keypad</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:oss_wang</name>
+          <_description>Wang 724 keypad with unicode additions (arrows and math operators)</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:future_wang</name>
+          <_description>Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level.</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:phone_hex</name>
+          <_description>ATM/phone-style hexadecimal keypad</_description>
+        </configItem>
+      </option>
+    </group>
+    <!-- This option should override the KPDL key defined in keypad; I hope it's declared in the right place -->
+    <group allowMultipleSelection="false">
+      <!-- Select a keypad KPDL variant -->
+      <configItem>
+        <name>kpdl</name>
+        <_description>Numeric keypad delete key behaviour</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <!-- Actually, with KP_DECIMAL, as the old keypad(dot) -->
+          <name>kpdl:dot</name>
+          <_description>Legacy key with dot</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:comma</name>
+          <!-- Actually, with KP_SEPARATOR, as the old keypad(comma) -->
+          <_description>Legacy key with comma</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:dotoss</name>
+          <_description>Four-level key with dot</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:dotoss_latin9</name>
+          <_description>Four-level key with dot, latin-9 restriction</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:commaoss</name>
+          <_description>Four-level key with comma</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:momayyezoss</name>
+          <_description>Four-level key with momayyez</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:kposs</name>
+          <!-- This assumes the KP_ abstract symbols are actually useful for some apps
+               The description needs to be rewritten -->
+          <_description>Four-level key with abstract separators</_description>
+       </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- CapsLock tweaks. 
+	   "Internal" capitalization means capitalization using some internal tables.
+	   Otherwise "as Shift" - means using next group. -->
+      <configItem>
+        <name>caps</name>
+        <_description>CapsLock key behavior</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>caps:internal</name>
+          <_description>CapsLock uses internal capitalization. Shift "pauses" CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:internal_nocancel</name>
+          <_description>CapsLock uses internal capitalization. Shift doesn't affect CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:shift</name>
+          <_description>CapsLock acts as Shift with locking. Shift "pauses" CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:shift_nocancel</name>
+          <_description>CapsLock acts as Shift with locking. Shift doesn't affect CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:capslock</name>
+          <_description>CapsLock toggles normal capitalization of alphabetic characters.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:swapescape</name>
+          <_description>Swap ESC and CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:shiftlock</name>
+          <_description>CapsLock toggles Shift so all keys are affected.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) -->
+      <configItem>
+        <name>altwin</name>
+        <_description>Alt/Win key behavior</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>altwin:menu</name>
+          <_description>Add the standard behavior to Menu key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:meta_alt</name>
+          <_description>Alt and Meta are on the Alt keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:ctrl_win</name>
+          <_description>Control is mapped to the Win-keys (and the usual Ctrl keys).</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:meta_win</name>
+          <_description>Meta is mapped to the Win-keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:left_meta_win</name>
+          <_description>Meta is mapped to the left Win-key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:super_win</name>
+          <_description>Super is mapped to the Win-keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:hyper_win</name>
+          <_description>Hyper is mapped to the Win-keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:alt_super_win</name>
+          <_description>Alt is mapped to the right Win-key and Super to Menu.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:swap_lalt_lwin</name>
+          <_description>Left Alt is swapped with left Win-key.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <!-- Tweaking the position of the "Compose" key: mapping to existing PC keys -->
+      <configItem>
+        <name>Compose key</name>
+        <_description>Compose key position</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>compose:ralt</name>
+          <_description>Right Alt is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:lwin</name>
+          <_description>Left Win-key is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:rwin</name>
+          <_description>Right Win-key is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:menu</name>
+          <_description>Menu is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:rctrl</name>
+          <_description>Right Ctrl is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:caps</name>
+          <_description>Caps Lock is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:102</name>
+          <_description>Less-than/Greater-than is Compose.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>compat</name>
+        <_description>Miscellaneous compatibility options</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>numpad:pc</name>
+          <_description>Default numeric keypad keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>numpad:mac</name>
+          <_description>Numeric keypad keys work as with Mac.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>numpad:microsoft</name>
+          <_description>Shift with numeric keypad keys works as in MS Windows.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>srvrkeys:none</name>
+          <_description>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>apple:badmap</name>
+          <_description>Swap keycodes of two keys when Mac keyboards are misdetected by kernel.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>shift:breaks_caps</name>
+          <_description>Shift cancels CapsLock.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <!-- Special shortcuts for the Euro character -->
+      <configItem>
+        <name>eurosign</name>
+        <_description>Adding the EuroSign to certain keys</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>eurosign:e</name>
+          <_description>Add the EuroSign to the E key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>eurosign:2</name>
+          <_description>Add the EuroSign to the 2 key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>eurosign:4</name>
+          <_description>Add the EuroSign to the 4 key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>eurosign:5</name>
+          <_description>Add the EuroSign to the 5 key.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- Let space output nobreakspace for the desired level -->
+      <configItem>
+        <name>nbsp</name>
+        <_description>Using space key to input non-breakable space character</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>nbsp:none</name>
+          <_description>Space key outputs usual space at any level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level2</name>
+          <_description>Space key outputs non-breakable space character at second level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level3</name>
+          <_description>Space key outputs non-breakable space character at third level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level3s</name>
+          <_description>Space key outputs non-breakable space character at third level, nothing at fourth level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level3n</name>
+          <_description>Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level4</name>
+          <_description>Space key outputs non-breakable space character at fourth level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level4n</name>
+          <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level4nl</name>
+          <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>japan</name>
+        <_description>Japanese keyboard options</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>japan:kana_lock</name>
+          <_description>Kana Lock key is locking</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>japan:nicola_f_bs</name>
+          <_description>NICOLA-F style Backspace</_description>
+       </configItem>
+      </option>
+    </group>
+  </optionList>
+</xkbConfigRegistry>
diff --git a/xorg-server/xkbdata.src/rules/merge.sh b/xorg-server/xkbdata.src/rules/merge.sh
new file mode 100644
index 000000000..8dfde5546
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/merge.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+DEST=$1
+shift
+
+if [ -z "$HDR" ]; then
+    HDR="HDR"
+fi
+
+basename=`basename $0`
+echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST
+
+for i in $*; do
+  if [ "$i" == "$HDR" ] || [ "$i" == "HDR" ]; then
+    echo >> $DEST;
+    read hdr
+    echo "$hdr" >> $DEST
+  else
+    cat $i >> $DEST;
+  fi
+done < $HDR
+
diff --git a/xorg-server/xkbdata.src/rules/xfree98 b/xorg-server/xkbdata.src/rules/xfree98
new file mode 100644
index 000000000..ca7a18bf7
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/jp	=	nec_vndr/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(shifts_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/xorg-server/xkbdata.src/rules/xkb.dtd b/xorg-server/xkbdata.src/rules/xkb.dtd
new file mode 100644
index 000000000..4452712fd
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/xkb.dtd
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+  Description: XKB configuration file DTD
+  Author: Sergey V. Udaltsov
+
+-->
+
+<!ELEMENT xkbConfigRegistry (modelList,layoutList,optionList)>
+
+<!ATTLIST xkbConfigRegistry 
+          version CDATA "1.0">
+
+<!ELEMENT modelList (model*)>
+
+<!ELEMENT model (configItem)>
+
+<!ELEMENT layoutList (layout*)>
+
+<!ELEMENT layout (configItem,variantList?)>
+
+<!ELEMENT optionList (group*)>
+
+<!ELEMENT variantList (variant*)>
+
+<!ELEMENT variant (configItem)>
+
+<!ELEMENT group (configItem,option*)>
+<!ATTLIST group
+          allowMultipleSelection (true|false) "false">
+
+<!ELEMENT option (configItem)>
+
+<!ELEMENT configItem (name,shortDescription*,description*,vendor?,countryList?,languageList?)>
+
+<!ATTLIST configItem
+          popularity (standard|exotic) "standard">
+
+<!ELEMENT name (#PCDATA)>
+
+<!ELEMENT shortDescription (#PCDATA)>
+<!ATTLIST shortDescription
+          xml:lang CDATA #IMPLIED>
+
+<!ELEMENT description (#PCDATA)>
+<!ATTLIST description
+          xml:lang CDATA #IMPLIED>
+
+<!ELEMENT vendor (#PCDATA)>
+
+<!ELEMENT countryList (iso3166Id+)>
+
+<!ELEMENT iso3166Id (#PCDATA)>
+
+<!ELEMENT languageList (iso639Id+)>
+
+<!ELEMENT iso639Id (#PCDATA)>
+
diff --git a/xorg-server/xkbdata.src/rules/xml2lst.pl b/xorg-server/xkbdata.src/rules/xml2lst.pl
new file mode 100644
index 000000000..478fce89c
--- /dev/null
+++ b/xorg-server/xkbdata.src/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! option\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/xorg-server/xkbdata.src/semantics/Makefile.am b/xorg-server/xkbdata.src/semantics/Makefile.am
new file mode 100644
index 000000000..9e92daaca
--- /dev/null
+++ b/xorg-server/xkbdata.src/semantics/Makefile.am
@@ -0,0 +1,9 @@
+semanticsdir = $(xkb_base)/semantics
+
+dist_semantics_DATA = \
+basic complete default \
+xtest
+
+dir_data = $(dist_semantics_DATA)
+
+include $(top_srcdir)/xkbrules.am
diff --git a/xorg-server/xkbdata.src/semantics/Makefile.in b/xorg-server/xkbdata.src/semantics/Makefile.in
new file mode 100644
index 000000000..c1481f10e
--- /dev/null
+++ b/xorg-server/xkbdata.src/semantics/Makefile.in
@@ -0,0 +1,403 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Common rules for building *.dir files in all xkb subdirectories
+# Replaces Imake's MakeXkbDir() rule
+# svu: taken from xkbdata
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+DIST_COMMON = $(dist_dir_DATA) $(dist_semantics_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/xkbrules.am
+subdir = semantics
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(semanticsdir)"
+dist_dirDATA_INSTALL = $(INSTALL_DATA)
+dist_semanticsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_dir_DATA) $(dist_semantics_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+semanticsdir = $(xkb_base)/semantics
+dist_semantics_DATA = \
+basic complete default \
+xtest
+
+dir_data = $(dist_semantics_DATA)
+dist_dir_DATA = $(subdir).dir
+dirdir = $(xkb_base)
+CLEANFILES = $(subdir).dir
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xkbrules.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  semantics/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  semantics/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_dirDATA: $(dist_dir_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)"
+	@list='$(dist_dir_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_dirDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dirdir)/$$f'"; \
+	  $(dist_dirDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dirdir)/$$f"; \
+	done
+
+uninstall-dist_dirDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_dir_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(dirdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(dirdir)/$$f"; \
+	done
+install-dist_semanticsDATA: $(dist_semantics_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(semanticsdir)" || $(mkdir_p) "$(DESTDIR)$(semanticsdir)"
+	@list='$(dist_semantics_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_semanticsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(semanticsdir)/$$f'"; \
+	  $(dist_semanticsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(semanticsdir)/$$f"; \
+	done
+
+uninstall-dist_semanticsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_semantics_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(semanticsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(semanticsdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/..
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(semanticsdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_dirDATA install-dist_semanticsDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_dirDATA uninstall-dist_semanticsDATA \
+	uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_dirDATA install-dist_semanticsDATA install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_dirDATA uninstall-dist_semanticsDATA \
+	uninstall-info-am
+
+
+$(subdir).dir: $(dir_data)
+	-rm -f $@
+	here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*'
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/semantics/basic b/xorg-server/xkbdata.src/semantics/basic
new file mode 100644
index 000000000..014e9ca68
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/semantics/complete b/xorg-server/xkbdata.src/semantics/complete
new file mode 100644
index 000000000..df1632e29
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/semantics/default b/xorg-server/xkbdata.src/semantics/default
new file mode 100644
index 000000000..42e755e3c
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/semantics/semantics.dir b/xorg-server/xkbdata.src/semantics/semantics.dir
new file mode 100644
index 000000000..a32ef4ece
--- /dev/null
+++ b/xorg-server/xkbdata.src/semantics/semantics.dir
@@ -0,0 +1,4 @@
+-d------ -------- xtest(xtest)
+-d------ -------- default(default)
+-d------ -------- complete(complete)
+-d------ -------- basic(basic)
diff --git a/xorg-server/xkbdata.src/semantics/xtest b/xorg-server/xkbdata.src/semantics/xtest
new file mode 100644
index 000000000..d221fe5b4
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/Makefile.am b/xorg-server/xkbdata.src/symbols/Makefile.am
new file mode 100644
index 000000000..371d1aa3e
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/Makefile.am
@@ -0,0 +1,37 @@
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
+
+symbolsdir = $(xkb_base)/symbols
+dist_symbols_DATA = \
+ad af al \
+am ara az \
+be bd \
+bg br ba \
+bt by braille \
+ca cd \
+ch cn cz \
+de dk \
+ee es et epo \
+fi fo fr \
+gb ge gh gn \
+gr hr hu \
+ie il in iq \
+ir is it jp \
+kg kh kr kz \
+la latam latin \
+lk lt lv \
+ma mao me mk \
+mm mn mt mv \
+ng nl no np \
+pc pk pl pt \
+ro rs ru \
+se si sk \
+sy th \
+tj tr \
+ua us uz vn \
+za \
+altwin capslock compose ctrl eurosign group inet \
+keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl
+
+dir_data = $(dist_symbols_DATA)
+
+include $(top_srcdir)/xkbrules.am
diff --git a/xorg-server/xkbdata.src/symbols/Makefile.in b/xorg-server/xkbdata.src/symbols/Makefile.in
new file mode 100644
index 000000000..98c3d027e
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/Makefile.in
@@ -0,0 +1,587 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Common rules for building *.dir files in all xkb subdirectories
+# Replaces Imake's MakeXkbDir() rule
+# svu: taken from xkbdata
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+DIST_COMMON = $(dist_dir_DATA) $(dist_symbols_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/xkbrules.am
+subdir = symbols
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(symbolsdir)"
+dist_dirDATA_INSTALL = $(INSTALL_DATA)
+dist_symbolsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_dir_DATA) $(dist_symbols_DATA)
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
+symbolsdir = $(xkb_base)/symbols
+dist_symbols_DATA = \
+ad af al \
+am ara az \
+be bd \
+bg br ba \
+bt by braille \
+ca cd \
+ch cn cz \
+de dk \
+ee es et epo \
+fi fo fr \
+gb ge gh gn \
+gr hr hu \
+ie il in iq \
+ir is it jp \
+kg kh kr kz \
+la latam latin \
+lk lt lv \
+ma mao me mk \
+mm mn mt mv \
+ng nl no np \
+pc pk pl pt \
+ro rs ru \
+se si sk \
+sy th \
+tj tr \
+ua us uz vn \
+za \
+altwin capslock compose ctrl eurosign group inet \
+keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl
+
+dir_data = $(dist_symbols_DATA)
+dist_dir_DATA = $(subdir).dir
+dirdir = $(xkb_base)
+CLEANFILES = $(subdir).dir
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xkbrules.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  symbols/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_dirDATA: $(dist_dir_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)"
+	@list='$(dist_dir_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_dirDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dirdir)/$$f'"; \
+	  $(dist_dirDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dirdir)/$$f"; \
+	done
+
+uninstall-dist_dirDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_dir_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(dirdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(dirdir)/$$f"; \
+	done
+install-dist_symbolsDATA: $(dist_symbols_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_symbolsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  $(dist_symbolsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+
+uninstall-dist_symbolsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/..
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(symbolsdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-dist_dirDATA install-dist_symbolsDATA
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-dist_dirDATA uninstall-dist_symbolsDATA \
+	uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-recursive ctags ctags-recursive \
+	distclean distclean-generic distclean-recursive distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dist_dirDATA \
+	install-dist_symbolsDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_dirDATA \
+	uninstall-dist_symbolsDATA uninstall-info-am
+
+
+$(subdir).dir: $(dir_data)
+	-rm -f $@
+	here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*'
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/symbols/ad b/xorg-server/xkbdata.src/symbols/ad
new file mode 100644
index 000000000..3836ca34d
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/ad
@@ -0,0 +1,34 @@
+// $XKeyboardConfig$
+
+//
+// Catalan Keyboard, as manufactured by Large Format Computing, Inc.
+//
+// For layout graphic, see http://www.language-keyboard.com/languages/catalan_layout.htm
+//
+// Contributed by Robert Millan
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    include "us"
+
+    name[Group1]="Andorra";
+
+    key <AE02> { [ 2, at, dead_diaeresis ] };
+    key <AE07> { [ 7, ampersand, dead_acute ] };
+    key <AE09> { [ 9, parenleft, dead_grave ] };
+    key <AD02> { [ w, W, eacute, Eacute ] };
+    key <AD03> { [ e, E, egrave, Egrave ] };
+    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, ograve, Ograve	] };
+    key <AD12> { [ bracketright, braceright, EuroSign ] };
+    key <AC01> { [ a, A, agrave, Agrave ] };
+    key <AC08> { [ k, K, idiaeresis, Idiaeresis ] };
+    key <AC09> { [ l, L, periodcentered ] };
+    key <AB03> { [ c, C, ccedilla, Ccedilla ] };
+
+    include "level3(ralt_switch)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/af b/xorg-server/xkbdata.src/symbols/af
new file mode 100644
index 000000000..3ff8ad4ed
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/af
@@ -0,0 +1,395 @@
+// $XKeyboardConfig$
+//
+// Keymap for the Afghan dari keybord layout
+// Based on the specification "Computer Locale Requirements for 
+// Afghanstan" [1] from the "United Nations Development Programme
+// Afghanistan" and the "Afghan Transitional Islamic 
+// Administration Ministry of Communications". 
+// [1] http://www.evertype.com/standards/af/
+// For a MINI HOWTO see [2].
+// [2] http://www.afghanischerKulturverein.de/en/afghanComputer_en.php
+//
+// 2006-02-15 file created by M. Emal Alekozai <memala@gmx.net>
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+   //name[Group1]= "Afghanistan Dari";
+   name[Group1]= "Afghanistan";
+
+   key <TLDE> { [ 0x100200d, 0x10000f7, dead_tilde ] };
+   key <AE01> { [ 0x10006f1, exclam, 0x1000060 ] };
+   key <AE02> { [ 0x10006f2, 0x100066c, 0x1000040 ] };
+   key <AE03> { [ 0x10006f3, 0x100066b, numbersign ] };
+   key <AE04> { [ 0x10006f4, 0x100e60b, 0x1000024] };
+   key <AE05> { [ 0x10006f5, 0x100066a, 0x1000025 ] };
+   key <AE06> { [ 0x10006f6, multiply, 0x100005e ] };
+   key <AE07> { [ 0x10006f7, Arabic_comma, 0x1000026 ] };
+   key <AE08> { [ 0x10006f8, asterisk, 0x1002022 ] };
+   key <AE09> { [ 0x10006f9, 0x1000029, 0x100200e ] };
+   key <AE10> { [ 0x10006f0, 0x1000028, 0x100200f ] };
+   key <AE11> { [ minus, Arabic_tatweel, 0x100005f ] };
+   key <AE12> { [ plus, equal ] };
+
+   key <AD01> { [ Arabic_dad, Arabic_sukun, 0x10000b0 ] };
+   key <AD02> { [ Arabic_sad, Arabic_dammatan ] };
+   key <AD03> { [ Arabic_theh, Arabic_kasratan, 0x10020ac ] };
+   key <AD04> { [ Arabic_qaf, Arabic_fathatan, 0x100fd3e ] };
+   key <AD05> { [ Arabic_feh, Arabic_damma, 0x100fd3f ] };
+   key <AD06> { [ Arabic_ghain, Arabic_kasra, 0x100e656] };
+   key <AD07> { [ Arabic_ain, Arabic_fatha, 0x100e659] };
+   key <AD08> { [ Arabic_heh, Arabic_shadda, 0x1000655] };
+   key <AD09> { [ Arabic_khah, bracketright, 0x1000027] };
+   key <AD10> { [ Arabic_hah, bracketleft, 0x1000022] };
+   key <AD11> { [ Arabic_jeem, braceright, 0x1000681 ] };
+   key <AD12> { [ 0x1000686, braceleft, 0x1000685 ] };
+
+   key <AC01> { [ Arabic_sheen, Arabic_hamzaonwaw, 0x100069a ] };
+   key <AC02> { [ Arabic_seen, Arabic_hamzaonyeh, 0x10006cd ] };
+   key <AC03> { [ 0x10006cc, Arabic_yeh, 0x1000649 ] };
+   key <AC04> { [ Arabic_beh, Arabic_hamzaunderalef, 0x10006d0 ] };
+   key <AC05> { [ Arabic_lam, Arabic_hamzaonalef, 0x10006b7 ] };
+   key <AC06> { [ Arabic_alef, Arabic_maddaonalef, 0x1000671 ] };
+   key <AC07> { [ Arabic_teh, Arabic_tehmarbuta, 0x100067c ] };
+   key <AC08> { [ Arabic_noon, 0x10000bb, 0x10006bc ] };
+   key <AC09> { [ Arabic_meem, 0x10000ab, 0x10006ba ] };
+   key <AC10> { [ 0x10006a9, colon, 0x100003b ] };
+   key <AC11> { [ 0x10006af, Arabic_semicolon, 0x10006ab ] };
+
+   key <BKSL> { [ backslash, bar, 0x100003f ] };
+   key <SPCE> { [ space, 0x100200c, 0x10000a0 ] };
+
+   key <AB01> { [ Arabic_zah, Arabic_kaf, 0x10006d2] };
+   key <AB02> { [ Arabic_tah, 0x1000653 , 0x1000691 ] };
+   key <AB03> { [ Arabic_zain, 0x1000698, 0x1000696 ] };
+   key <AB04> { [ Arabic_ra, 0x1000670 , 0x1000693 ] };
+   key <AB05> { [ Arabic_thal, 0x100200c, 0x1000688  ] };
+   key <AB06> { [ Arabic_dal, 0x1000654, 0x1000689 ] };
+   key <AB07> { [ 0x100067e, Arabic_hamza, 0x1000679 ] };
+   key <AB08> { [ Arabic_waw, greater, 0x100002c ] };
+   key <AB09> { [ period, less, 0x10006c7 ] };
+   key <AB10> { [ slash, Arabic_question_mark, 0x10006c9 ] };
+   include "level3(ralt_switch)"
+};
+
+// Keymap for the Afghan pashto keybord layout
+// Based on the specification "Computer Locale Requirements for 
+// Afghanstan" [1] from the "United Nations Development Programme
+// Afghanistan"" and the "Afghan Transitional Islamic 
+// Administration Ministry of Communications". 
+// [1] http://www.evertype.com/standards/af/
+// For a MINI HOWTO see [2].
+// [2] http://www.afghanischerKulturverein.de/en/afghanComputer_en.php
+// 
+// 2006-02-15 file created by M. Emal Alekozai <memala@gmx.net>
+
+partial alphanumeric_keys 
+xkb_symbols "ps" {
+   name[Group1]= "Afghanistan - Pashto";
+
+   key <TLDE> { [ 0x100200d, 0x10000f7, dead_tilde ] };
+   key <AE01> { [ 0x10006f1, exclam, 0x1000060 ] };
+   key <AE02> { [ 0x10006f2, 0x100066c, 0x1000040 ] };
+   key <AE03> { [ 0x10006f3, 0x100066b, numbersign ] };
+   key <AE04> { [ 0x10006f4, 0x100e60b, 0x1000024] };
+   key <AE05> { [ 0x10006f5, 0x100066a, 0x1000025 ] };
+   key <AE06> { [ 0x10006f6, multiply, 0x100005e ] };
+   key <AE07> { [ 0x10006f7, 0x10000bb, 0x1000026 ] };
+   key <AE08> { [ 0x10006f8, 0x10000ab, 0x1002022 ] };
+   key <AE09> { [ 0x10006f9, 0x1000029, 0x100200e ] };
+   key <AE10> { [ 0x10006f0, 0x1000028, 0x100200f ] };
+   key <AE11> { [ minus, Arabic_tatweel, 0x100005f ] };
+   key <AE12> { [ plus, equal ] };
+
+   key <AD01> { [ Arabic_dad, Arabic_sukun, 0x10000b0 ] };
+   key <AD02> { [ Arabic_sad, Arabic_dammatan, 0x1000653 ] };
+   key <AD03> { [ Arabic_theh, Arabic_kasratan, 0x10020ac ] };
+   key <AD04> { [ Arabic_qaf, Arabic_fathatan, 0x100fd3e ] };
+   key <AD05> { [ Arabic_feh, Arabic_damma, 0x100fd3f ] };
+   key <AD06> { [ Arabic_ghain, Arabic_kasra, 0x100e656] };
+   key <AD07> { [ Arabic_ain, Arabic_fatha, 0x100e659] };
+   key <AD08> { [ Arabic_heh, Arabic_shadda, 0x1000670] };
+   key <AD09> { [ Arabic_khah, 0x1000681, 0x1000027] };
+   key <AD10> { [ Arabic_hah, 0x1000685, 0x1000022] };
+   key <AD11> { [ Arabic_jeem, 0x100005d, 0x100007d ] };
+   key <AD12> { [ 0x1000686, 0x100005b, 0x100007b ] };
+
+   key <AC01> { [ Arabic_sheen, 0x100069a ] };
+   key <AC02> { [ Arabic_seen, Arabic_hamzaonyeh, 0x10006d2 ] };
+   key <AC03> { [ 0x10006cc, Arabic_yeh, 0x1000649 ] };
+   key <AC04> { [ Arabic_beh, 0x100067e, 0x10006ba ] };
+   key <AC05> { [ Arabic_lam, Arabic_hamzaonalef, 0x10006b7 ] };
+   key <AC06> { [ Arabic_alef, Arabic_maddaonalef, 0x1000671 ] };
+   key <AC07> { [ Arabic_teh, 0x100067c, 0x1000679 ] };
+   key <AC08> { [ Arabic_noon, 0x10006bc, 0x100003e ] };
+   key <AC09> { [ Arabic_meem, 0x1000629, 0x100003c ] };
+   key <AC10> { [ 0x10006a9, colon, 0x1000643 ] };
+   key <AC11> { [ 0x10006ab, Arabic_semicolon, 0x10006af ] };
+
+   key <BKSL> { [ backslash, 0x100002a, 0x100007c ] };
+   key <SPCE> { [ space, 0x100200c, 0x10000a0 ] };
+
+   key <AB01> { [ 0x10006cd, 0x1000638, 0x100003f] };
+   key <AB02> { [ 0x10006d0, 0x1000637, 0x100003b ] };
+   key <AB03> { [ Arabic_zain, 0x1000698, 0x1000655 ] };
+   key <AB04> { [ Arabic_ra, 0x1000621, 0x1000654 ] };
+   key <AB05> { [ Arabic_thal, 0x100200c, 0x1000625  ] };
+   key <AB06> { [ Arabic_dal, 0x1000689, 0x1000688 ] };
+   key <AB07> { [ 0x1000693, 0x1000624, 0x1000691 ] };
+   key <AB08> { [ Arabic_waw, 0x100060c, 0x100002c ] };
+   key <AB09> { [ 0x1000696, 0x100002e, 0x10006c7 ] };
+   key <AB10> { [ slash, Arabic_question_mark, 0x10006c9 ] };
+   include "level3(ralt_switch)"
+};
+
+// Keymap for the Afghan southern uzbek keybord layout
+// Based on the specification "Computer Locale Requirements for 
+// Afghanstan" [1] from the "United Nations Development Programme
+// Afghanistan"" and the "Afghan Transitional Islamic 
+// Administration Ministry of Communications". 
+// [1] http://www.evertype.com/standards/af/
+// For a MINI HOWTO see [2].
+// [2] http://www.afghanischerKulturverein.de/en/afghanComputer_en.php
+// 
+// 2006-02-15 file created by M. Emal Alekozai <memala@gmx.net>
+
+partial alphanumeric_keys 
+xkb_symbols "uz" {
+   name[Group1]= "Afghanistan - Southern Uzbek";
+
+   key <TLDE> { [ 0x100200d, 0x10000f7, dead_tilde ] };
+   key <AE01> { [ 0x10006f1, exclam, 0x1000060 ] };
+   key <AE02> { [ 0x10006f2, 0x100066c, 0x1000040 ] };
+   key <AE03> { [ 0x10006f3, 0x100066b, numbersign ] };
+   key <AE04> { [ 0x10006f4, 0x100e60b, 0x1000024] };
+   key <AE05> { [ 0x10006f5, 0x100066a, 0x1000025 ] };
+   key <AE06> { [ 0x10006f6, multiply, 0x100005e ] };
+   key <AE07> { [ 0x10006f7, Arabic_comma, 0x1000026 ] };
+   key <AE08> { [ 0x10006f8, asterisk, 0x1002022 ] };
+   key <AE09> { [ 0x10006f9, 0x1000029, 0x100200e ] };
+   key <AE10> { [ 0x10006f0, 0x1000028, 0x100200f ] };
+   key <AE11> { [ minus, Arabic_tatweel, 0x100005f ] };
+   key <AE12> { [ plus, equal ] };
+
+   key <AD01> { [ Arabic_dad, Arabic_sukun, 0x10000b0 ] };
+   key <AD02> { [ Arabic_sad, Arabic_dammatan, 0x1000653 ] };
+   key <AD03> { [ Arabic_theh, Arabic_kasratan, 0x10020ac ] };
+   key <AD04> { [ Arabic_qaf, Arabic_fathatan, 0x100fd3e ] };
+   key <AD05> { [ Arabic_feh, Arabic_damma, 0x100fd3f ] };
+   key <AD06> { [ Arabic_ghain, Arabic_kasra, 0x100e656] };
+   key <AD07> { [ Arabic_ain, Arabic_fatha, 0x100e659] };
+   key <AD08> { [ Arabic_heh, Arabic_shadda, 0x1000670] };
+   key <AD09> { [ Arabic_khah, bracketright, 0x1000027] };
+   key <AD10> { [ Arabic_hah, bracketleft, 0x1000022] };
+   key <AD11> { [ Arabic_jeem, braceright, 0x1000681 ] };
+   key <AD12> { [ 0x1000686, braceleft, 0x1000685 ] };
+
+   key <AC01> { [ Arabic_sheen, Arabic_hamzaonwaw, 0x100069a ] };
+   key <AC02> { [ Arabic_seen, Arabic_hamzaonyeh, 0x10006cd ] };
+   key <AC03> { [ 0x10006cc, Arabic_yeh, 0x1000649 ] };
+   key <AC04> { [ Arabic_beh, 0x10006d0, 0x1000643 ] };
+   key <AC05> { [ Arabic_lam, Arabic_hamzaonalef, 0x10006b7 ] };
+   key <AC06> { [ Arabic_alef, Arabic_maddaonalef, 0x1000671 ] };
+   key <AC07> { [ Arabic_teh, Arabic_tehmarbuta, 0x100067c ] };
+   key <AC08> { [ Arabic_noon, 0x10000bb, 0x10006bc ] };
+   key <AC09> { [ Arabic_meem, 0x10000ab, 0x10006ba ] };
+   key <AC10> { [ 0x10006a9, colon, 0x100003b ] };
+   key <AC11> { [ 0x10006af, Arabic_semicolon, 0x10006ab ] };
+
+   key <BKSL> { [ backslash, bar, 0x100003f ] };
+   key <SPCE> { [ space, 0x100200c, 0x10000a0 ] };
+
+   key <AB01> { [ Arabic_zah, 0x10006c9, 0x10006d2] };
+   key <AB02> { [ Arabic_tah, 0x10006c7, 0x1000691 ] };
+   key <AB03> { [ Arabic_zain, 0x1000698, 0x1000696 ] };
+   key <AB04> { [ Arabic_ra, 0x1000625, 0x1000693 ] };
+   key <AB05> { [ Arabic_thal, 0x100200c, 0x1000688  ] };
+   key <AB06> { [ Arabic_dal, 0x1000654, 0x1000689 ] };
+   key <AB07> { [ 0x100067e, Arabic_hamza, 0x1000679 ] };
+   key <AB08> { [ Arabic_waw, greater, 0x100002c ] };
+   key <AB09> { [ period, less ] };
+   key <AB10> { [ slash, Arabic_question_mark, 0x1000655 ] };
+   include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "olpc-ps" {
+
+   name[Group1]= "Afghanistan - OLPC Pashto";
+
+   key <TLDE> { [ 0x100200D, 0x1000654, grave ] }; // zero width joiner, Arabic hamza above
+   key <AE01> { [ 0x10006F1, exclam, asciitilde ] }; // Arabic one
+   key <AE02> { [ 0x10006F2, 0x100066C, at ] }; // Arabic two, Arabic thousands separator
+   key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator
+   key <AE04> { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign
+   key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign
+   key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six
+   key <AE07> { [ 0x10006F7, guillemotright, ampersand ] }; // Arabic seven
+   key <AE08> { [ 0x10006F8, guillemotleft, 0x100066D ] }; // Arabic eight, Arabic five-pointed star
+   key <AE09> { [ 0x10006F9, parenright, enfilledcircbullet ] }; // Arabic nine
+   key <AE10> { [ 0x10006F0, parenleft, degree ] }; // Arabic zero
+   key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
+   key <AE12> { [ plus, equal, division ] };
+
+   key <AD01> { [ 0x1000636, 0x1000652, EuroSign ] }; // Arabic dad, Arabic sukun
+   key <AD02> { [ 0x1000635, 0x100064C, 0x1000671 ] }; // Arabic sad, Arabic dammatan, Arabic alef walsa
+   key <AD03> { [ 0x100062B, 0x100064D, 0x1000649 ] }; // Arabic theh, Arabic kasratan, Arabic alef maksura initial form
+   key <AD04> { [ 0x1000642, 0x100064B, 0x100200E ] }; // Arabic qaf, Arabic fathatan, left-to-right mark
+   key <AD05> { [ 0x1000641, 0x100064F, 0x100200F ] }; // Arabic feh, Arabic damma, right-to-left mark
+   key <AD06> { [ 0x100063A, 0x1000650, 0x100e653 ] }; // Arabic ghain, Arabic kasra, Arabic alef with madda above
+   key <AD07> { [ 0x1000639, 0x100064E, 0x100e659 ] }; // Arabic ain, Arabic fatha, Arabic zwarakay
+   key <AD08> { [ 0x1000647, 0x1000651, 0x1000670 ] }; // Arabic heh, Arabic shadda, Arabic superscript alef
+   key <AD09> { [ 0x100062E, 0x1000681, apostrophe ] }; // Arabic khah, Arabic hah with hamza above, 
+   key <AD10> { [ 0x100062D, 0x1000685, quotedbl ] }; // Arabic hah, Arabic hah with three dots above
+   key <AD11> { [ 0x100062C, bracketright, braceleft ] }; // Arabic jeem
+   key <AD12> { [ 0x1000686, bracketleft, braceright ] }; // Arabic tcheh
+
+   key <AC01> { [ 0x1000634, 0x100069A ] }; // Arabic sheen, Arabic seen with dot below and dot above
+   key <AC02> { [ 0x1000633, 0x10006CD ] }; // Arabic seen, Arabic yeh with tail
+   key <AC03> { [ 0x10006CC, 0x100064A, 0x10006D2 ] }; // Farsi yeh, Arabic yeh, Arabic yeh barree
+   key <AC04> { [ 0x1000628, 0x100067E, 0x10006BA ] }; // Arabic beh, Arabic peh, Arabic noon ghunna
+   key <AC05> { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above
+   key <AC06> { [ 0x1000627, 0x1000622, 0x1000625 ] }; // Arabic alef, Arabic madda on alef, Arabic alef with hamza below
+   key <AC07> { [ 0x100062A, 0x100067C, 0x1000679 ] }; // Arabic teh, Arabic teh with ring, Arabic tteh
+   key <AC08> { [ 0x1000646, 0x10006BC, greater ] }; // Arabic noon, Arabic noon with ring
+   key <AC09> { [ 0x1000645, 0x1000629, less ] }; // Arabic meem, Arabic teh marbuta
+   key <AC10> { [ 0x10006A9, colon, 0x1000643 ] }; // Arabic keheh, Arabic kaf
+   key <AC11> { [ 0x10006AB, 0x100061B, 0x10006AF ] }; // Arabic kaf with ring, Arabic semicolon, Arabic gaf
+
+   key <BKSL> { [ backslash, asterisk, bar ] };
+   key <SPCE> { [ space, 0x100200C, 0x10000A0 ] }; // zero width non-joiner, no break space
+
+   key <AB01> { [ 0x1000638, 0x1000626, question] }; // Arabic zah, Arabic yeh with hamza above
+   key <AB02> { [ 0x10006D0, 0x1000637, semicolon ] }; // Arabic tah, Arabic E
+   key <AB03> { [ 0x1000632, 0x1000698 ] }; // Arabic zain, Arabic jeh
+   key <AB04> { [ 0x1000631, 0x1000621 ] }; // Arabic_ra (reh?), Arabic hamza
+   key <AB05> { [ 0x1000630, 0x100200C ] }; // Arabic_thal, zero width non-joiner
+   key <AB06> { [ 0x100062F, 0x1000689, 0x1000688 ] }; // Arabic_dal, Arabic dal with ring, Arabic ddal
+   key <AB07> { [ 0x1000693, 0x1000624, 0x1000691 ] }; // Arabic reh with ring, Arabic waw with hamza above, Arabic rreh
+   key <AB08> { [ 0x1000648, period, comma ] }; // Arabic_waw, Arabic comma
+   key <AB09> { [ 0x1000696, 0x100002E, 0x10006C7 ] }; // Arabic reh with dot below and dot above, full stop, Arabic letter U
+   key <AB10> { [ slash, 0x100061F, 0x10006C9 ] }; // Arabic question mark, Arabic kirghiz yu
+
+   include "group(olpc)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "olpc-fa" {
+
+   name[Group1]= "Afghanistan - OLPC Dari";
+
+   key <TLDE> { [ 0x100200D, division, asciitilde ] }; // zero width joiner
+   key <AE01> { [ 0x10006F1, exclam, grave ] }; // Arabic one
+   key <AE02> { [ 0x10006F2, 0x100066C, at ] }; // Arabic two, Arabic thousands separator
+   key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator
+   key <AE04> { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign
+   key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign
+   key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six
+   key <AE07> { [ 0x10006F7, 0x100060C, ampersand ] }; // Arabic seven, Arabic comma
+   key <AE08> { [ 0x10006F8, asterisk, enfilledcircbullet ] }; // Arabic eight, 
+   key <AE09> { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark
+   key <AE10> { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark
+   key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
+   key <AE12> { [ plus, equal ] };
+
+   key <AD01> { [ 0x1000636, 0x1000652, degree ] }; // Arabic dad, Arabic sukun
+   key <AD02> { [ 0x1000635, 0x100064C ] }; // Arabic sad, Arabic dammatan
+   key <AD03> { [ 0x100062B, 0x100064D, EuroSign ] }; // Arabic theh, Arabic kasratan
+   key <AD04> { [ 0x1000642, 0x100064B, 0x100FD3E ] }; // Arabic qaf, Arabic fathatan, ornate left paren
+   key <AD05> { [ 0x1000641, 0x100064F, 0x100FD3F ] }; // Arabic feh, Arabic damma, ornate right paren
+   key <AD06> { [ 0x100063A, 0x1000650, 0x1000656 ] }; // Arabic ghain, Arabic kasra, Arabic subscript alef
+   key <AD07> { [ 0x1000639, 0x100064E, 0x100e659 ] }; // Arabic ain, Arabic fatha, Arabic zwarakay
+   key <AD08> { [ 0x1000647, 0x1000651, 0x1000655 ] }; // Arabic heh, Arabic shadda, Arabic hamza below
+   key <AD09> { [ 0x100062E, bracketright, apostrophe ] }; // Arabic khah
+   key <AD10> { [ 0x100062D, bracketleft, quotedbl ] }; // Arabic hah
+   key <AD11> { [ 0x100062C, braceright, 0x1000681 ] }; // Arabic jeem, Arabic hah with hamza above
+   key <AD12> { [ 0x1000686, braceleft, 0x1000685 ] }; // Arabic tcheh, Arabic hah with three dots above
+
+   key <AC01> { [ 0x1000634, 0x1000624, 0x100069A ] }; // Arabic sheen, Arabic waw with hamza above, Arabic seen with dot below and dot above
+   key <AC02> { [ 0x1000633, 0x1000626, 0x10006CD ] }; // Arabic seen, Arabic yeh with hamza above, Arabic yeh with tail
+   key <AC03> { [ 0x10006CC, 0x100064A, 0x1000649 ] }; // Farsi yeh, Arabic yeh, Arabic alef maksura
+   key <AC04> { [ 0x1000628, 0x1000625, 0x10006D0 ] }; // Arabic beh, Arabic alef with hamza below, Arabic e
+   key <AC05> { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above
+   key <AC06> { [ 0x1000627, 0x1000622, 0x1000671 ] }; // Arabic alef, Arabic madda on alef, Arabic alef wasla
+   key <AC07> { [ 0x100062A, 0x1000629, 0x100067C ] }; // Arabic teh, Arabic teh marbuta, Arabic tteh
+   key <AC08> { [ 0x1000646, guillemotright, 0x10006BC ] }; // Arabic noon, Arabic noon with ring
+   key <AC09> { [ 0x1000645, guillemotleft, 0x10006BA ] }; // Arabic meem, Arabic noon ghunna
+   key <AC10> { [ 0x10006A9, colon, semicolon ] }; // Arabic keheh, 
+   key <AC11> { [ 0x10006AF, 0x100061B, 0x10006AB ] }; // Arabic gaf, Arabic semicolon, Arabic kaf with ring
+
+   key <BKSL> { [ backslash, bar, question ] };
+   key <SPCE> { [ space, 0x100200C, 0x10000A0 ] }; // zero width non-joiner, no break space
+
+   key <AB01> { [ 0x1000638, 0x1000643, 0x10006D2 ] }; // Arabic zah, Arabic kaf, Arabic yeh barree
+   key <AB02> { [ 0x1000637, 0x1000653, 0x1000691 ] }; // Arabic tah, Arabic maddah above, Arabic rreh
+   key <AB03> { [ 0x1000632, 0x1000698, 0x1000696 ] }; // Arabic zain, Arabic jeh,  Arabic reh with dot below and dot above
+   key <AB04> { [ 0x1000631, 0x1000670, 0x1000693 ] }; // Arabic_ra (reh?), Arabic superscript alef, Arabic reh with ring
+   key <AB05> { [ 0x1000630, 0x100200C, 0x1000688 ] }; // Arabic_thal, zero width non-joiner, Arabic ddal
+   key <AB06> { [ 0x100062F, 0x1000654, 0x1000689 ] }; // Arabic dal, Arabic hamza above, Arabic dal with ring
+   key <AB07> { [ 0x100067E, 0x1000621, 0x1000679 ] }; // Arabic peh, Arabic hamza, Arabic tteh
+   key <AB08> { [ 0x1000648, greater, comma ] }; // Arabic_waw
+   key <AB09> { [ period, less, 0x10006C7 ] }; // Arabic u
+   key <AB10> { [ slash, 0x100061F, 0x10006C9 ] }; // Arabic question mark, Arabic kirghiz yu
+
+   include "group(olpc)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "olpc-uz" {
+
+   name[Group1]= "Afghanistan - OLPC Southern Uzbek";
+
+   key <TLDE> { [ 0x100200D, division, asciitilde ] }; // zero width joiner
+   key <AE01> { [ 0x10006F1, exclam, grave ] }; // Arabic one
+   key <AE02> { [ 0x10006F2, 0x100066C, at ] }; // Arabic two, Arabic thousands separator
+   key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator
+   key <AE04> { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign
+   key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign
+   key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six
+   key <AE07> { [ 0x10006F7, 0x100060C, ampersand ] }; // Arabic seven, Arabic comma
+   key <AE08> { [ 0x10006F8, asterisk, enfilledcircbullet ] }; // Arabic eight, 
+   key <AE09> { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark
+   key <AE10> { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark
+   key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
+   key <AE12> { [ plus, equal ] };
+
+   key <AD01> { [ 0x1000636, 0x1000652, degree ] }; // Arabic dad, Arabic sukun
+   key <AD02> { [ 0x1000635, 0x100064C, 0x1000653 ] }; // Arabic sad, Arabic dammatan, Arabic maddah above
+   key <AD03> { [ 0x100062B, 0x100064D, EuroSign ] }; // Arabic theh, Arabic kasratan
+   key <AD04> { [ 0x1000642, 0x100064B, 0x100FD3E ] }; // Arabic qaf, Arabic fathatan, ornate left paren
+   key <AD05> { [ 0x1000641, 0x100064F, 0x100FD3F ] }; // Arabic feh, Arabic damma, ornate right paren
+   key <AD06> { [ 0x100063A, 0x1000650, 0x1000656 ] }; // Arabic ghain, Arabic kasra, Arabic subscript alef
+   key <AD07> { [ 0x1000639, 0x100064E, 0x100e659 ] }; // Arabic ain, Arabic fatha, Arabic zwarakay
+   key <AD08> { [ 0x1000647, 0x1000651, 0x1000670 ] }; // Arabic heh, Arabic shadda, Arabic superscript alef
+   key <AD09> { [ 0x100062E, bracketright, apostrophe ] }; // Arabic khah
+   key <AD10> { [ 0x100062D, bracketleft, quotedbl ] }; // Arabic hah
+   key <AD11> { [ 0x100062C, braceright, 0x1000681 ] }; // Arabic jeem, Arabic hah with hamza above
+   key <AD12> { [ 0x1000686, braceleft, 0x1000685 ] }; // Arabic tcheh, Arabic hah with three dots above
+
+   key <AC01> { [ 0x1000634, 0x1000624, 0x100069A ] }; // Arabic sheen, Arabic waw with hamza above, Arabic seen with dot below and dot above
+   key <AC02> { [ 0x1000633, 0x1000626, 0x10006CD ] }; // Arabic seen, Arabic yeh with hamza above, Arabic yeh with tail
+   key <AC03> { [ 0x10006CC, 0x100064A, 0x1000649 ] }; // Farsi yeh, Arabic yeh, Arabic alef maksura
+   key <AC04> { [ 0x1000628, 0x10006D0, 0x1000643  ] }; // Arabic beh, Arabic e, Arabic kaf
+   key <AC05> { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above
+   key <AC06> { [ 0x1000627, 0x1000622, 0x1000671 ] }; // Arabic alef, Arabic madda on alef, Arabic alef wasla
+   key <AC07> { [ 0x100062A, 0x1000629, 0x100067C ] }; // Arabic teh, Arabic teh marbuta, Arabic tteh
+   key <AC08> { [ 0x1000646, guillemotright, 0x10006BC ] }; // Arabic noon, Arabic noon with ring
+   key <AC09> { [ 0x1000645, guillemotleft, 0x10006BA ] }; // Arabic meem, Arabic noon ghunna
+   key <AC10> { [ 0x10006A9, colon, semicolon ] }; // Arabic keheh, 
+   key <AC11> { [ 0x10006AF, 0x100061B, 0x10006AB ] }; // Arabic gaf, Arabic semicolon, Arabic kaf with ring
+
+   key <BKSL> { [ backslash, bar, question ] };
+   key <SPCE> { [ space, 0x100200C, 0x10000A0 ] }; // zero width non-joiner, no break space
+
+   key <AB01> { [ 0x1000638, 0x10006C9, 0x10006D2 ] }; // Arabic zah, Arabic kirghiz yu, Arabic yeh barree
+   key <AB02> { [ 0x1000637, 0x10006C7, 0x1000691 ] }; // Arabic tah, Arabic u, Arabic rreh
+   key <AB03> { [ 0x1000632, 0x1000698, 0x1000696 ] }; // Arabic zain, Arabic jeh,  Arabic reh with dot below and dot above
+   key <AB04> { [ 0x1000631, 0x1000625, 0x1000693 ] }; // Arabic_ra (reh?), Arabic alef with hamza below, Arabic reh with ring
+   key <AB05> { [ 0x1000630, 0x100200C, 0x1000688 ] }; // Arabic_thal, zero width non-joiner, Arabic ddal
+   key <AB06> { [ 0x100062F, 0x1000654, 0x1000689 ] }; // Arabic dal, Arabic hamza above, Arabic dal with ring
+   key <AB07> { [ 0x100067E, 0x1000621, 0x1000679 ] }; // Arabic peh, Arabic hamza, Arabic tteh
+   key <AB08> { [ 0x1000648, greater, comma ] }; // Arabic_waw
+   key <AB09> { [ period, less ] };
+   key <AB10> { [ slash, 0x100061F, 0x1000655 ] }; // Arabic question mark, Arabic hamza below
+
+   include "group(olpc)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/al b/xorg-server/xkbdata.src/symbols/al
new file mode 100644
index 000000000..18f11139e
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/al
@@ -0,0 +1,44 @@
+// $XKeyboardConfig$
+
+// based on
+// albanian keyboard layout
+// done by Pablo Saratxaga <pablo@mandrakesoft.com>
+//
+// $XFree86: xc/programs/xkbcomp/symbols/al,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin(type3)"
+
+    name[Group1]="Albania";
+
+    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)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/altwin b/xorg-server/xkbdata.src/symbols/altwin
new file mode 100644
index 000000000..a3c633a0f
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/altwin
@@ -0,0 +1,76 @@
+// $XKeyboardConfig$
+
+// $XFree86: xc/programs/xkbcomp/symbols/altwin,v 1.5 2003/12/03 14:09:08 pascal Exp $
+
+partial modifier_keys 
+xkb_symbols "meta_alt" {
+    key <LALT> {	[ 	Alt_L,	Meta_L		]	};
+    key <RALT> {	[ 	Alt_R,	Meta_R		]	};
+    modifier_map Mod1	{ Alt_L, Alt_R, Meta_L, Meta_R };
+//  modifier_map Mod4	{};
+};
+
+// Control is mapped to the Win-keys (and the usual Ctrl keys).
+partial modifier_keys 
+xkb_symbols "ctrl_win" {
+    key <LWIN> {	[ 	Control_L		]	};
+    key <RWIN> {	[ 	Control_R		]	};
+    modifier_map Control { <LWIN>, <RWIN> };
+};
+
+partial modifier_keys 
+xkb_symbols "meta_win" {
+    key <LALT> {	[ 	Alt_L,	Alt_L		]	};
+    key <RALT> {	[ 	Alt_R,	Alt_R		]	};
+    key <LWIN> {	[ 	Meta_L			]	};
+    key <RWIN> {	[ 	Meta_R			]	};
+    modifier_map Mod1	{ Alt_L, Alt_R };
+    modifier_map Mod4	{ <META>, Meta_L, Meta_R };
+};
+
+partial modifier_keys 
+xkb_symbols "left_meta_win" {
+    key <LALT> {	[ 	Alt_L,	Alt_L		]	};
+    key <LWIN> {	[ 	Meta_L			]	};
+    modifier_map Mod1	{ Alt_L };
+    modifier_map Mod4	{ <META>, Meta_L };
+};
+
+partial modifier_keys 
+xkb_symbols "super_win" {
+    key <LWIN> {	[ 	Super_L			]	};
+    key <RWIN> {	[ 	Super_R			]	};
+    modifier_map Mod4	{ Super_L, Super_R };
+};
+
+partial modifier_keys 
+xkb_symbols "hyper_win" {
+    key <LWIN> {	[ 	Hyper_L			]	};
+    key <RWIN> {	[ 	Hyper_R			]	};
+    modifier_map Mod4	{ Hyper_L, Hyper_R };
+};
+
+// Use Menu for the menu key
+partial modifier_keys 
+xkb_symbols "menu" {
+    key <MENU> {	[ 	Menu		]	};
+};
+
+// Layout for Tux key caps with additional right Alt key
+partial modifier_keys 
+xkb_symbols "alt_super_win" {
+    key <LALT> {        [       Alt_L,  Meta_L          ]       };
+    key <RWIN> {        [       Alt_R,  Meta_R          ]       };
+    key <LWIN> {        [       Super_L                 ]       };
+    key <MENU> {        [       Super_R                 ]       };
+    modifier_map Mod1   { Alt_L, Alt_R, Meta_L, Meta_R };
+    modifier_map Mod4   { Super_L, Super_R };
+};
+
+partial modifier_keys 
+xkb_symbols "swap_lalt_lwin" {
+    key <LALT> {	[ 	Super_L			]	};
+    key <LWIN> {	[	Alt_L,	Meta_L		]	};
+    modifier_map Mod1 { <LWIN> };
+    modifier_map Mod4 { <LALT> };
+};
diff --git a/xorg-server/xkbdata.src/symbols/am b/xorg-server/xkbdata.src/symbols/am
new file mode 100644
index 000000000..6fe84836c
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/am
@@ -0,0 +1,244 @@
+// $XKeyboardConfig$
+
+// based on a keyboard map from an 'xkb/symbols/am' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/am,v 1.4 2003/05/29 12:41:58 pascal Exp $
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    name[Group1]= "Armenia";
+
+    // 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> {	[ 0x1002024,  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	]       };
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+    include "am(basic)"
+    name[Group1]= "Armenia";
+
+    include "group(olpc)"
+};
+
+xkb_symbols "phonetic" {
+    include "am(basic)"
+    name[Group1]= "Armenia - Phonetic";
+	
+    key <BKSL> {	[ 0x1000577,  0x1000547 ]	};
+	
+    key <AE01> {	[ 0x1000567,  0x1000537 ]	};
+    key <AE02> {	[ 0x1000569,  0x1000539 ]	};
+    key <AE03> {	[ 0x1000583,  0x1000553 ]	};
+    key <AE04> {	[ 0x1000571,  0x1000541 ]       };
+    key <AE05> {	[ 0x100057b,  0x100054b ]	};
+    key <AE06> {	[ 0x1000582,  0x1000552 ]	};
+    key <AE07> {	[ 0x1000587,  0x1000587 ]	};
+    key <AE08> {	[ 0x100057c,  0x100054c ]	};
+    key <AE09> {	[ 0x1000579,  0x1000549 ]	};
+    key <AE10> {	[ 0x1000573,  0x1000543 ]	};
+    key <AE11> {	[ 0x100002D,  0x1002015 ]       };
+    key <AE12> {	[ 0x100056a,  0x100053a ]	};
+
+    key <LatQ> {	[ 0x1000584,  0x1000554 ]	};
+    key <LatW> {	[ 0x1000578,  0x1000548 ]	};
+    key <LatE> {	[ 0x1000565,  0x1000535 ]	};
+    key <LatR> {	[ 0x1000580,  0x1000550 ]	};
+    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 <AB08> {	[ 0x100002C,  0x10000AB ]       };
+    key <AB09> {	[ 0x1002024,  0x10000BB ]       };
+    key <AB10> {	[ 0x100002F,  0x100055e ]	};
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "phonetic-alt" {
+    include "am(phonetic)"
+    name[Group1]= "Armenia - Alternative Phonetic";
+
+    key <AE08> {	[ 0x1000580,  0x1000550 ]	};
+    key <LatR> {	[ 0x100057c,  0x100054c ]	};
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "eastern" {
+
+    name[Group1]="Armenia - Eastern";
+
+    // This is the closer phonetic transliteration for Eastern Armenian
+    // than the Windows XP layout for Eastern Armenian, which seems
+    // to have contained a bug, with the reversal of 'g' for keh and 'c' for gim
+    // Also, AE01 (the colon) has been replaced with the Armenian_full_stop and
+    // capital AE07 (ken) with the Armenian ligature ew
+
+    key <TLDE> {	[ Armenian_separation_mark,  Armenian_exclam ]	};
+//  key <AE01> {	[ colon,  		KP_1 ]	};
+    key <AE01> {	[ Armenian_full_stop,  	KP_1 ]	};
+    key <AE02> {	[ Armenian_dza,  	Armenian_DZA ]	};
+    key <AE03> {	[ Armenian_hi,  	Armenian_HI ]	};
+    key <AE04> {	[ Armenian_accent,  	KP_3 ]       };
+    key <AE05> {	[ comma,  		KP_4 ]	};
+    key <AE06> {	[ minus,  		KP_9 ]	};
+    key <AE07> {	[ period,  		Armenian_ligature_ew ]	};
+    key <AE08> {	[ guillemotleft,  	parenleft ]	};
+    key <AE09> {	[ guillemotright,  	parenright ]	};
+    key <AE10> {	[ Armenian_o,  		Armenian_O ]	};
+    key <AE11> {	[ Armenian_ra,  	Armenian_RA ]       };
+    key <AE12> {	[ Armenian_zhe,  	Armenian_ZHE ]	};
+
+    key <LatQ> {	[ Armenian_khe,  	Armenian_KHE ]	};
+    key <LatW> {	[ Armenian_vyun,  	Armenian_VYUN ]	};
+    key <LatE> {	[ Armenian_e,  		Armenian_E ]	};
+    key <LatR> {	[ Armenian_re,  	Armenian_RE ]	};
+    key <LatT> {	[ Armenian_tyun,  	Armenian_TYUN ]	};
+    key <LatY> {	[ Armenian_yech,  	Armenian_YECH ]	};
+    key <LatU> {	[ Armenian_at,  	Armenian_AT ]	};
+    key <LatI> {	[ Armenian_ini,  	Armenian_INI ]	};
+    key <LatO> {	[ Armenian_vo,  	Armenian_VO ]	};
+    key <LatP> {	[ Armenian_pe,  	Armenian_PE ]	};
+    key <AD11> {	[ Armenian_cha,  	Armenian_CHA ]	};
+    key <AD12> {	[ Armenian_je,  	Armenian_JE ]	};
+    key <BKSL> {	[ apostrophe,  		Armenian_question ]	};
+
+    key <LatA> {	[ Armenian_ayb,  	Armenian_AYB ]	};
+    key <LatS> {	[ Armenian_se,  	Armenian_SE ]	};
+    key <LatD> {	[ Armenian_da,  	Armenian_DA ]	};
+    key <LatF> {	[ Armenian_fe,  	Armenian_FE ]	};
+    key <LatG> {	[ Armenian_gim,  	Armenian_GIM ]	};
+    key <LatH> {	[ Armenian_ho,  	Armenian_HO ]	};
+    key <LatJ> {	[ Armenian_tche,  	Armenian_TCHE ]	};
+    key <LatK> {	[ Armenian_ken,  	Armenian_KEN ]	};
+    key <LatL> {	[ Armenian_lyun,  	Armenian_LYUN ]	};
+    key <AC10> {	[ Armenian_to,  	Armenian_TO ]	};
+    key <AC11> {	[ Armenian_pyur,  	Armenian_PYUR ]	};
+
+    key <LatZ> {	[ Armenian_za,  	Armenian_ZA ]	};
+    key <LatX> {	[ Armenian_tso,  	Armenian_TSO ]	};
+    key <LatC> {	[ Armenian_ke,  	Armenian_KE ]	};
+    key <LatV> {	[ Armenian_vev,  	Armenian_VEV ]	};
+    key <LatB> {	[ Armenian_ben,  	Armenian_BEN ]	};
+    key <LatN> {	[ Armenian_nu,  	Armenian_NU ]	};
+    key <LatM> {	[ Armenian_men,  	Armenian_MEN ]	};
+    key <AB08> {	[ Armenian_sha,  	Armenian_SHA ]       };
+    key <AB09> {	[ Armenian_ghat,  	Armenian_GHAT ]       };
+    key <AB10> {	[ Armenian_tsa,  	Armenian_TSA ]	};
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "western" {
+    include "am(eastern)"
+    name[Group1]="Armenia - Western";
+
+    // This is exactly the same layout for Western Armenian
+    // as in Windows XP, except:
+    // AE01 (the colon) has been replaced with the Armenian_full_stop and
+    // capital AE07 (ken) with the Armenian ligature ew
+
+    key <LatW> {	[ Armenian_vev,  	Armenian_VEV ]	};
+    key <LatT> {	[ Armenian_da,  	Armenian_DA ]	};
+    key <LatP> {	[ Armenian_ben,  	Armenian_BEN ]	};
+    key <LatD> {	[ Armenian_tyun,  	Armenian_TYUN ]	};
+    key <LatG> {	[ Armenian_ken,  	Armenian_KEN ]	};
+    key <LatK> {	[ Armenian_ke,  	Armenian_KE ]	};
+    key <LatC> {	[ Armenian_gim,  	Armenian_GIM ]	};
+    key <LatV> {	[ Armenian_vyun,  	Armenian_VYUN ]	};
+    key <LatB> {	[ Armenian_pe,  	Armenian_PE ]	};
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "eastern-alt" {
+    include "am(eastern)"
+    name[Group1]="Armenia - Alternative Eastern";
+
+	// This replicates the Windows XP keyboard layout for Eastern
+	// Armenian exactly (including the bug), except:
+ 	// AE01 (the colon) has been replaced with the Armenian_full_stop and
+	// capital AE07 (ken) with the Armenian ligature ew
+
+    key <LatG> {	[ Armenian_ke,  	Armenian_KE ]	};
+    key <LatC> {	[ Armenian_gim,  	Armenian_GIM ]	};
+
+};
diff --git a/xorg-server/xkbdata.src/symbols/ara b/xorg-server/xkbdata.src/symbols/ara
new file mode 100644
index 000000000..a42fc6981
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/ara
@@ -0,0 +1,276 @@
+// $XKeyboardConfig$
+
+// based on a keyboard map from an 'xkb/symbols/ar' file
+
+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,      parenright      ]     };
+    key <AE10> {  [               0,       parenleft      ]     };
+    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,       VoidSymbol     ]     };
+    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,        less          ]     };
+    key <AD12> {  [      Arabic_dal,        greater       ]     };
+
+    key <AC01> {  [    Arabic_sheen,   Arabic_kasra       ]     };
+    key <AC02> {  [     Arabic_seen,   Arabic_kasratan    ]     };
+    key <AC03> {  [      Arabic_yeh,       bracketright   ]     };
+    key <AC04> {  [      Arabic_beh,       bracketleft    ]     };
+    key <AC05> {  [      Arabic_lam,       VoidSymbol     ]     };
+    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 <LSGT> {  [             bar,      brokenbar	  ]     };
+    key <AB01> {  [Arabic_hamzaonyeh,    asciitilde       ]     };
+    key <AB02> {  [    Arabic_hamza,      Arabic_sukun    ]     };
+    key <AB03> {  [Arabic_hamzaonwaw,      braceright     ]     };
+    key <AB04> {  [       Arabic_ra,       braceleft      ]     };
+    key <AB05> {  [       VoidSymbol,      VoidSymbol     ]     };
+    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 "ara(basic)"
+    name[Group1]= "Arabic - qwerty";
+};
+
+partial alphanumeric_keys
+xkb_symbols "azerty" {
+    include "ara(basic)"
+    name[Group1]= "Arabic - azerty";
+
+	// 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 "ara(basic)"
+    name[Group1]= "Arabic - digits";
+
+	// use arabic script digits
+
+    key <AE01> {  [       0x1000661,          exclam      ]       };
+    key <AE02> {  [       0x1000662,              at      ]       };
+    key <AE03> {  [       0x1000663,      numbersign      ]       };
+    key <AE04> {  [       0x1000664,          dollar      ]       };
+    key <AE05> {  [       0x1000665,  Arabic_percent      ]       };
+    key <AE06> {  [       0x1000666,     asciicircum      ]       };
+    key <AE07> {  [       0x1000667,       ampersand      ]       };
+    key <AE08> {  [       0x1000668,        asterisk      ]       };
+    key <AE09> {  [       0x1000669,      parenright      ]       };
+    key <AE10> {  [       0x1000660,       parenleft      ]       };
+};
+
+partial alphanumeric_keys
+xkb_symbols "qwerty_digits" {
+    include "ara(digits)"
+    name[Group1]= "Arabic - qwerty/digits";
+};
+
+partial alphanumeric_keys
+xkb_symbols "azerty_digits" {
+    include "ara(azerty)"
+    name[Group1]= "Arabic - azerty/digits";
+	
+    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      ]       };
+};
+
+// Arabic keyboard using Buckwalter transliteration
+// http://www.qamus.org/transliteration.htm
+// Martin Vidner
+
+// symbol names: see /usr/X11R6/include/X11/keysymdef.h (XFree86-devel.rpm)
+
+partial alphanumeric_keys 
+xkb_symbols "buckwalter" {
+    name[Group1]= "Arabic - Buckwalter";
+
+    // ARABIC LETTER SUPERSCRIPT ALEF
+    key <TLDE> {  [       0x1000670,  Arabic_shadda       ]       };
+
+    // Arabic_0 .. Arabic_9 do not work in Kate,
+    // Unicode never seems to work worse.
+    key <AE01> {  [       0x1000661,   VoidSymbol         ]       };
+    key <AE02> {  [       0x1000662,   VoidSymbol         ]       };
+    key <AE03> {  [       0x1000663,   VoidSymbol         ]       };
+    key <AE04> {  [       0x1000664,   Arabic_sheen       ]       };
+    key <AE05> {  [       0x1000665,   Arabic_percent     ]       };
+    key <AE06> {  [       0x1000666,   VoidSymbol         ]       };
+    key <AE07> {  [       0x1000667,   Arabic_hamzaonwaw  ]       };
+    key <AE08> {  [       0x1000668,   Arabic_thal        ]       };
+    // ORNATE LEFT PARENTHESIS
+    key <AE09> {  [       0x1000669,   0x100fd3e          ]       };
+    // ORNATE RIGHT PARENTHESIS
+    key <AE10> {  [       0x1000660,   0x100fd3f          ]       };
+    key <AE11> {  [       minus,       Arabic_tatweel     ]       };
+    key <AE12> {  [       equal,       plus               ]       };
+						
+    key <AD01> {  [      Arabic_qaf,   VoidSymbol         ]       };
+    key <AD02> {  [      Arabic_waw,   Arabic_hamzaonwaw  ]       };
+    key <AD03> {  [      VoidSymbol,   Arabic_ain         ]       };
+    key <AD04> {  [      Arabic_ra,    VoidSymbol         ]       };
+    key <AD05> {  [      Arabic_teh,   Arabic_tah         ]       };
+    key <AD06> {  [      Arabic_yeh,   Arabic_alefmaksura ]       };
+    key <AD07> {  [      Arabic_damma, VoidSymbol         ]       };
+    key <AD08> {  [      Arabic_kasra, Arabic_hamzaunderalef ]    };
+    key <AD09> {  [      Arabic_sukun, Arabic_hamzaonalef ]       };
+    key <AD10> {  [      Arabic_tehmarbuta, VoidSymbol    ]       };
+    // ARABIC LETTER ALEF WASLA
+    key <AD11> {  [      VoidSymbol,   0x1000671          ]       };
+    key <AD12> {  [      VoidSymbol,   Arabic_hamzaonyeh  ]       };
+
+    key <AC01> {  [    Arabic_fatha,   Arabic_alef        ]       };
+    key <AC02> {  [    Arabic_seen,    Arabic_sad         ]       };
+    key <AC03> {  [    Arabic_dal,     Arabic_dad         ]       };
+    key <AC04> {  [    Arabic_feh,     Arabic_fathatan    ]       };
+    key <AC05> {  [    Arabic_ghain,   VoidSymbol         ]       };
+    key <AC06> {  [    Arabic_ha,      Arabic_hah         ]       };
+    key <AC07> {  [    Arabic_jeem,    VoidSymbol         ]       };
+    key <AC08> {  [    Arabic_kaf,     Arabic_kasratan    ]       };
+    key <AC09> {  [    Arabic_lam,     VoidSymbol         ]       };
+    key <AC10> {  [    Arabic_semicolon, VoidSymbol       ]       };
+    key <AC11> {  [    Arabic_hamza,   VoidSymbol         ]       };
+
+    key <BKSL> {  [      VoidSymbol,   Arabic_maddaonalef ]     };
+
+//    key <LSGT> {  [             bar,      brokenbar	  ]     };
+
+    key <AB01> {  [    Arabic_zain,    Arabic_zah         ]       };
+    key <AB02> {  [    Arabic_khah,    VoidSymbol         ]       };
+    key <AB03> {  [    VoidSymbol,     VoidSymbol         ]       };
+    key <AB04> {  [    Arabic_theh,    VoidSymbol         ]       };
+    key <AB05> {  [    Arabic_beh,     VoidSymbol         ]       };
+    key <AB06> {  [    Arabic_noon,    Arabic_dammatan    ]       };
+    key <AB07> {  [    Arabic_meem,    VoidSymbol         ]       };
+    key <AB08> {  [    Arabic_comma,   Arabic_hamzaunderalef ]    };
+    // ARABIC FULL STOP (Urdu)
+    key <AB09> {  [    0x10006d4,      Arabic_hamzaonalef ]       };
+    key <AB10> {  [    VoidSymbol,     Arabic_question_mark ]     };
+
+    // End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+    include "ara(basic)"
+
+    // As part of the olpc design some changes were made to the Arabic
+    // keyboard design. Major changes are:
+    //
+    //  * Removed the lam-alef single character. Poeple type as they
+    //    pronounce, and lam-alef is just a visual formatting of the
+    //    sequence and is not often used on the keyboard. It is
+    //    similar to the Allah single character, which is also not on
+    //    the keyboard.
+    //  * Moved the following keys:
+    //     o Thal from TLDE to AB05: Due to space limitation on the
+    //       keybaord, but also accessibility
+    //     o Shadda from TLDE to AD05
+    //  * Placed currency letters on number keys and moved the ^ and &
+    //    characters to lower keys (This change is worth revisiting
+    //    before end of test period)
+
+    key <TLDE> {  [           grave,      asciitilde  ] };
+
+    key <AE01> {  [       0x1000661,          exclam  ] };
+    key <AE02> {  [       0x1000662,              at  ] };
+    key <AE03> {  [       0x1000663,      numbersign  ] };
+    key <AE04> {  [       0x1000664,          dollar  ] };
+    key <AE05> {  [       0x1000665,  Arabic_percent  ] };
+    key <AE06> {  [       0x1000666,        sterling  ] };
+    key <AE07> {  [       0x1000667,        EuroSign  ] };
+    key <AE08> {  [       0x1000668,        asterisk  ] };
+    key <AE09> {  [       0x1000669,      parenright  ] };
+    key <AE10> {  [       0x1000660,       parenleft  ] };
+
+    key <AD05> {  [      Arabic_feh,   Arabic_shadda  ] };
+
+    key <AD08> {  [      Arabic_heh,        division  ] };
+    key <AD11> {  [     Arabic_jeem,      braceright  ] };
+    key <AD12> {  [      Arabic_dal,       braceleft  ] };
+
+    key <AC01> {  [    Arabic_sheen,         greater  ] };
+    key <AC02> {  [     Arabic_seen,            less  ] };
+    key <AC05> {  [      Arabic_lam,       ampersand  ] };
+    key <AC10> {  [      Arabic_kaf                   ] };
+    key <AC11> {  [      Arabic_tah                   ] };
+
+    key <BKSL> {  [       backslash,             bar  ] };
+
+
+    // REH isolated form?
+    key <AB03> {  [ Arabic_hamzaonwaw,   Arabic_kasra ] };
+    key <AB04> {  [       Arabic_ra,  Arabic_kasratan ] };    
+    key <AB05> {  [     Arabic_thal,      asciicircum ] };
+
+    include "group(olpc)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/az b/xorg-server/xkbdata.src/symbols/az
new file mode 100644
index 000000000..254cf7f8c
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/az
@@ -0,0 +1,94 @@
+// $XKeyboardConfig$
+
+// based on:
+// symbols definition for a very simple Azerbaidjani keyboard layout.
+// 2001 - Pablo Saratxaga <pablo@mandrakesoft.com>
+
+partial default alphanumeric_keys
+xkb_symbols "latin" {
+
+  include "us"
+
+  name[Group1]= "Azerbaijan";
+
+  key <TLDE> { [ grave,      asciitilde, dead_grave,  dead_tilde      ] };
+
+  key <AE03> { [ 3,          numbersign, U2166        ] };
+  key <AE06> { [ 6,          colon,      EuroSign,    periodcentered  ] };
+  key <AE07> { [ 7,          question    ] };
+
+  key <AE08> { [ 8,          asterisk,   asciicircum, dead_circumflex ] };
+  key <AE11> { [ minus,      underscore, hyphen,      emdash          ] };
+
+  key <AD02> { [ udiaeresis, Udiaeresis  ] };
+  key <AD04> { [ r,          R,          registered   ] };
+  key <AD08> { [ i,          Iabovedot   ] };
+  key <AD11> { [ odiaeresis, Odiaeresis, bracketleft, braceleft       ] };
+  key <AD12> { [ gbreve,     Gbreve,    bracketright, braceright      ] };
+
+  key <AC10> { [ idotless,   I           ] };
+  key <AC11> { [ schwa,      SCHWA       ] };
+
+  key <AB03> { [ c,          C,          copyright,      division     ] };
+  key <AB07> { [ m,          M,          periodcentered, currency     ] };
+  key <AB08> { [ ccedilla,   Ccedilla    ] };
+  key <AB09> { [ scedilla,   Scedilla    ] };
+  key <AB10> { [ period,     comma       ] };
+  // End alphanumeric section
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "cyrillic" {
+
+  name[Group1]= "Azerbaijan - Cyrillic";
+
+  key <AE02> {[ 2,                 quotedbl           ] };
+  key <AE03> {[ 3,                 numbersign         ] };
+  key <AE04> {[ 4,                 semicolon          ] };
+  key <AE06> {[ 6,                 colon              ] };
+  key <AE07> {[ 7,                 question           ] };
+  key <AE08> {[ 8,                 asterisk,   braceleft    ] };
+  key <AE09> {[ 9,                 parenleft,  bracketleft  ] };
+  key <AE10> {[ 0,                 parenright, bracketright ] };
+  key <AE11> {[ minus,             underscore, braceright   ] };
+
+  key <AD01> {[ Cyrillic_je,       Cyrillic_JE        ] };
+  key <AD02> {[ Cyrillic_u_straight, Cyrillic_U_straight ] };
+  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_shha,     Cyrillic_SHHA      ] };
+  key <AD10> {[ Cyrillic_ze,       Cyrillic_ZE        ] };
+  key <AD11> {[ Cyrillic_ha,       Cyrillic_HA        ] };
+  key <AD12> {[ Cyrillic_che_vertstroke, Cyrillic_CHE_vertstroke ] };
+
+  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_ka_vertstroke,Cyrillic_KA_vertstroke ] };
+
+  key <AB01> {[ Cyrillic_schwa,    Cyrillic_SCHWA     ] };
+  key <AB02> {[ Cyrillic_che,      Cyrillic_CHE       ] };
+  key <AB03> {[ Cyrillic_es,       Cyrillic_ES        ] };
+  key <AB04> {[ Cyrillic_em,       Cyrillic_EM        ] };
+  key <AB05> {[ Cyrillic_i,        Cyrillic_I         ] };
+  key <AB06> {[ Cyrillic_te,       Cyrillic_TE        ] };
+  key <AB07> {[ Cyrillic_ghe_bar,  Cyrillic_GHE_bar   ] };
+  key <AB08> {[ Cyrillic_be,       Cyrillic_BE        ] };
+  key <AB09> {[ Cyrillic_o_bar,    Cyrillic_O_bar     ] };
+  key <AB10> {[ period,            comma              ] };
+
+  // End alphanumeric section
+};
diff --git a/xorg-server/xkbdata.src/symbols/ba b/xorg-server/xkbdata.src/symbols/ba
new file mode 100644
index 000000000..68a887a94
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/ba
@@ -0,0 +1,43 @@
+// $XKeyboardConfig$
+//
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    name[Group1]="Bosnia and Herzegovina";
+
+    include "rs(latin)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "us" {
+
+    name[Group1]= "Bosnia and Herzegovina - US keyboard with Bosnian letters";
+
+    include "rs(latinyz)"
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "alternatequotes" {
+
+    name[Group1]= "Bosnia and Herzegovina - Use guillemets for quotes";
+
+    include "rs(latinalternatequotes)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "unicode" {
+
+    name[Group1]= "Bosnia and Herzegovina - Use Bosnian digraphs";
+
+    include "rs(latinunicode)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "unicodeus" {
+
+    name[Group1]= "Bosnia and Herzegovina - US keyboard with Bosnian digraphs";
+
+    include "rs(latinunicodeyz)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/bd b/xorg-server/xkbdata.src/symbols/bd
new file mode 100644
index 000000000..1f622e9fd
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/bd
@@ -0,0 +1,98 @@
+// $XKeyboardConfig$
+//
+// XKB symbol :: National Bangla/Bengali Standard Keyboard Layout for Bangladesh
+// Ref: http://www.bcc.net.bd/keyboard/bsti_kb_specification.pdf
+//
+// Author: Jamil Ahmed <jamil at bengalinux.org>
+// Created: 18-12-2005
+// Last Updated: 08-01-2006
+// Version: 6.01.3
+//
+// Issues:
+// <AC08> Khanda-Ta is given U-09CE; But BCC had U-09BA
+// <AC07> U-09BB is added though it is not allocated in Original Unicode
+// <AE06> U-09B3 is added though it is not allocated in Original Unicode
+// 3 Conjunct characters are not included
+//
+
+default partial alphanumeric_keys
+
+xkb_symbols "basic" {
+   name[Group1]= "Bangladesh";
+   key <ESC>  { [ Escape ] };
+
+// numbers
+   key <TLDE> { [ quoteleft,	asciitilde,	voidsymbol,	voidsymbol ] };
+   key <AE01> { [ 0x10009E7,	exclam,		0x10009F4,	voidsymbol ] };
+   key <AE02> { [ 0x10009E8,	at,		0x10009F5,	voidsymbol ] };
+   key <AE03> { [ 0x10009E9,	numbersign,	0x10009F6,	voidsymbol ] };
+   key <AE04> { [ 0x10009EA,	dollar,		0x10009F3,	0x10009F2  ] };
+   key <AE05> { [ 0x10009EB,	percent,	0x10009F7,	voidsymbol ] };
+   key <AE06> { [ 0x10009EC,	asciicircum,	0x10009F8,	0x10009B3  ] };
+   key <AE07> { [ 0x10009ED,	ampersand,	0x1000902,	voidsymbol ] };
+   key <AE08> { [ 0x10009EE,	asterisk,	voidsymbol,	voidsymbol ] };
+   key <AE09> { [ 0x10009EF,	parenleft,	voidsymbol,	voidsymbol ] };
+   key <AE10> { [ 0x10009E6,	parenright,	0x10009F9,	voidsymbol ] };
+   key <AE11> { [ minus,	underscore,	0x100200C,	voidsymbol ] };
+   key <AE12> { [ equal,	plus,		0x100200D,	voidsymbol ] };
+   key <BKSP> { [ BackSpace ] };
+
+// tab, q to ] 
+   key <TAB>  { [ Tab,  ISO_Left_Tab ] };
+   key <AD01> { [ 0x1000999,	0x1000982,	0x10009E2,	0x10009E3  ] };
+   key <AD02> { [ 0x10009AF,	0x10009DF,	voidsymbol,	voidsymbol ] };
+   key <AD03> { [ 0x10009A1,	0x10009A2,	0x10009C4,	voidsymbol ] };
+   key <AD04> { [ 0x10009AA,	0x10009AB,	voidsymbol,	voidsymbol ] };
+   key <AD05> { [ 0x100099F,	0x10009A0,	voidsymbol,	voidsymbol ] };
+   key <AD06> { [ 0x100099A,	0x100099B,	voidsymbol,	voidsymbol ] };
+   key <AD07> { [ 0x100099C,	0x100099D,	voidsymbol,	voidsymbol ] };
+   key <AD08> { [ 0x10009B9,	0x100099E,	0x10009BD,	voidsymbol ] };
+   key <AD09> { [ 0x1000997,	0x1000998,	voidsymbol,	voidsymbol ] };
+   key <AD10> { [ 0x10009DC,	0x10009DD,	voidsymbol,	voidsymbol ] };
+   key <AD11> { [ bracketleft,	braceleft,	voidsymbol,	voidsymbol ] };
+   key <AD12> { [ bracketright,	braceright,	voidsymbol,	voidsymbol ] };
+   key <RTRN> { [ Return ] };
+
+// caps, a to ' 
+// key <CAPS> { [ Caps_Lock ] };
+   key <AC01> { [ 0x10009C3,	0x10009D7,	0x100098B,	0x10009E0  ] };
+   key <AC02> { [ 0x10009C1,	0x10009C2,	0x1000989,	0x100098A  ] };
+   key <AC03> { [ 0x10009BF,	0x10009C0,	0x1000987,	0x1000988  ] };
+   key <AC04> { [ 0x10009AC,	0x10009AD,	0x10009F0,	0x10009F1  ] };
+   key <AC05> { [ 0x10009CD,	0x1000964,	0x1000965,	voidsymbol ] };
+   key <AC06> { [ 0x10009BE,	0x1000985,	0x1000986,	voidsymbol ] };
+   key <AC07> { [ 0x1000995,	0x1000996,	0x10009BB,	voidsymbol ] };
+   key <AC08> { [ 0x10009A4,	0x10009A5,	0x10009CE,	voidsymbol ] };
+   key <AC09> { [ 0x10009A6,	0x10009A7,	0x100098C,	0x10009E1  ] };
+   key <AC10> { [ semicolon,	colon,		voidsymbol,	voidsymbol ] };
+   key <AC11> { [ quoteright,	quotedbl,	voidsymbol,	voidsymbol ] };
+
+// shift, z to /
+// key <LFSH> { [ Shift_L ] };
+   key <AB01> { [ 0x1000981,	0x1000983,	0x10009FA,	voidsymbol ] };
+   key <AB02> { [ 0x10009CB,	0x10009CC,	0x1000993,	0x1000994  ] };
+   key <AB03> { [ 0x10009C7,	0x10009C8,	0x100098F,	0x1000990  ] };
+   key <AB04> { [ 0x10009B0,	0x10009B2,	voidsymbol,	voidsymbol ] };
+   key <AB05> { [ 0x10009A8,	0x10009A3,	voidsymbol,	voidsymbol ] };
+   key <AB06> { [ 0x10009B8,	0x10009B7,	voidsymbol,	voidsymbol ] };
+   key <AB07> { [ 0x10009AE,	0x10009B6,	voidsymbol,	voidsymbol ] };
+   key <AB08> { [ comma,	less,		voidsymbol,	voidsymbol ] };
+   key <AB09> { [ period,	greater,	0x10009BC,	voidsymbol ] };
+   key <AB10> { [ slash,	question,	voidsymbol,	voidsymbol ] };
+   key <BKSL> { [ backslash,	bar,		voidsymbol,	voidsymbol ] };
+
+// third level with right-Alt
+    include "level3(ralt_switch)"
+
+};
+
+
+//
+// XKB symbol :: Probhat Bangla/Bengali Keyboard Layout
+// Ref: www.ankurbangla.org/images/probhat_layout.png
+//
+
+xkb_symbols "probhat" {
+    include "in(ben_probhat)"
+    name[Group1]= "Bangladesh - Probhat";
+};
diff --git a/xorg-server/xkbdata.src/symbols/be b/xorg-server/xkbdata.src/symbols/be
new file mode 100644
index 000000000..6e22f8a11
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/be
@@ -0,0 +1,115 @@
+// $XKeyboardConfig$
+
+// based on a keyboard map from an 'xkb/symbols/be' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/be,v 1.3 2003/04/12 10:53:48 pascal Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin"
+
+    name[Group1]="Belgium";
+
+    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)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "iso-alternate" {
+    include "be(basic)"
+    name[Group1]="Belgium - ISO Alternate";
+
+    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 "be(basic)"
+    name[Group1]="Belgium - Sun dead keys";
+
+    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 "be(sundeadkeys)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Eliminates dead keys from the basic Belgian layout
+
+    include "be(basic)"
+    name[Group1]="Belgium - Eliminate dead keys";
+
+    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 ]	};
+};
+
+// Wang model 724 azerty Belgium keyboard
+partial alphanumeric_keys
+xkb_symbols "wang" {
+
+    include "be(basic)"
+    include "keypad(legacy_wang)"
+    name[Group1]="Belgium - Wang model 724 azerty";
+
+    // Engravings on Wang 725-3771-ae
+    key <TLDE> { [ twosuperior, threesuperior,   notsign, asciitilde ] };
+    key <LSGT> { [        less,       greater, backslash,  brokenbar ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/bg b/xorg-server/xkbdata.src/symbols/bg
new file mode 100644
index 000000000..8c4913c86
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/bg
@@ -0,0 +1,137 @@
+// $XKeyboardConfig$
+
+// 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
+
+partial default alphanumeric_keys
+xkb_symbols "bds" {
+// BDS is the Bulgarian Institute for Standardization
+
+  name[Group1]= "Bulgaria";
+  
+  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
+  
+};
+
+partial alphanumeric_keys 
+xkb_symbols "phonetic" {
+  
+  name[Group1]= "Bulgaria - Phonetic";
+  
+  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
+
+};
diff --git a/xorg-server/xkbdata.src/symbols/br b/xorg-server/xkbdata.src/symbols/br
new file mode 100644
index 000000000..75ec08254
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/br
@@ -0,0 +1,322 @@
+// $XKeyboardConfig$
+// $XdotOrg: xc/programs/xkbcomp/symbols/br,v 1.1.4.3 2004/03/05 13:41:32 eich Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/br,v 1.3 2003/04/19 12:22:11 pascal Exp $
+//
+// based on 
+// "a very simple Brasilian ABNT2 keyboard
+// by Ricardo Y. Igarashi (iga@that.com.br)
+// Adds suport for dead-keys in I18N applications
+// by Conectiva  (http://www.conectiva.com.br)"
+//
+
+default
+xkb_symbols "abnt2" {
+
+    include "latin"
+    name[Group1]="Brazil";
+
+    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 <AD01>  { [         q,          Q,        slash,        slash ] };   
+    key <AD02>  { [         w,          W,     question,     question ] };   
+    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 <BKSL>  { [bracketright, braceright,  masculine,    masculine   ] };
+
+    key <TLDE>	{ [apostrophe,   quotedbl,      notsign,      notsign ]	};
+
+    key <LSGT>	{ [ 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 ]	};
+
+    include "kpdl(comma)"
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    include "br(abnt2)" // for consistent naming
+    name[Group1]="Brazil - Eliminate dead keys";
+
+    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 ]	};
+};
+
+
+// ABNT2 Keyboard to IBM/Lenovo Thinkpads 
+// by Piter PUNK <piterpk@terra.com.br>
+//
+partial alphanumeric_keys
+xkb_symbols "thinkpad" {
+
+    include "br(abnt2)" // for consistent naming
+    name[Group1]="Brazil";
+
+    key <RCTL> { [     slash,   question,       degree, questiondown ] };
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+    include "us(basic)"
+    name[Group1]="Brazil";
+
+    key <TLDE> { [   apostrophe,       quotedbl                                ] };
+
+    key <AE01> { [           1,          exclam,   onesuperior                 ] };
+    key <AE02> { [           2,              at,   twosuperior                 ] };
+    key <AE03> { [           3,      numbersign, threesuperior                 ] };
+    key <AE04> { [           4,          dollar,      sterling                 ] };
+    key <AE05> { [           5,         percent,          cent                 ] };
+    key <AE06> { [           6,  dead_diaeresis,       notsign                 ] };
+    key <AE12>  { [       equal,           plus,       section                 ] };
+
+    key <AD03> { [            e,              E,      EuroSign                 ] };
+    key <AD11> { [   dead_acute,      dead_grave,        acute,          grave ] };
+    key <AD12> { [  bracketleft,       braceleft,     0x10000AA                 ] };
+
+    key <AC10> { [     ccedilla,       Ccedilla                                ] };
+    key <AC11> { [   dead_tilde, dead_circumflex                               ] };
+    key <BKSL> { [ bracketright,      braceright,     0x10000BA                        ] };
+
+    key <AB01> { [            z,              Z,           bar                 ] };
+    key <AB03> { [            c,              C,     0x10020A2                 ] };
+    key <AB09> { [       period,        greater,     backslash                 ] };
+    key <AB10> { [    semicolon,           colon                                ] };
+
+    key <I219> { [        slash,       question,        degree, ISO_Next_Group ] };
+
+    include "level3(ralt_switch)"
+};
+
+
+//
+// Brazilian Dvorak keyboard                               2005-04-18
+// "Teclado Simplificado Brasileiro" ou "Dvorak Brasileiro"
+//
+// Heitor Moraes    heitor.moraes@gmail.com
+// Luiz Portella    lfpor@lujz.org
+// Nando Florestan  nando2003@mandic.com.br
+// Ari Caldeira     ari@tecladobrasileiro.com.br
+//
+partial alphanumeric_keys
+xkb_symbols "dvorak" {
+
+    name[Group1]="Brazil - Dvorak";
+
+// Numeric row
+    key <TLDE> { [   apostrophe,        quotedbl,           dead_caron, dead_doubleacute ] };
+    key <AE01> { [            1,          exclam,          onesuperior,       exclamdown ] };
+    key <AE02> { [            2,              at,          twosuperior,          onehalf ] };
+    key <AE03> { [            3,      numbersign,        threesuperior,    threequarters ] };
+    key <AE04> { [            4,          dollar,             sterling,       onequarter ] };
+    key <AE05> { [            5,         percent,                 cent,       0x01002030 ] };
+    key <AE06> { [            6,  dead_diaeresis,              notsign,        diaeresis ] };
+    key <AE07> { [            7,       ampersand,        dead_belowdot,    dead_abovedot ] };
+    key <AE08> { [            8,        asterisk,          dead_ogonek,        dead_horn ] };
+    key <AE09> { [            9,       parenleft,         dead_cedilla,        dead_hook ] };
+    key <AE10> { [            0,      parenright,          dead_macron,       dead_breve ] };
+    key <AE11> { [  bracketleft,       braceleft,          ordfeminine,       0x01000326 ] };
+    key <AE12> { [ bracketright,      braceright,            masculine,   dead_abovering ] };
+
+
+// Upper row
+    key <AD01> { [        slash,        question,               degree,     questiondown ] };
+    key <AD02> { [        comma,            less,           0x01000329,       0x01000313 ] };
+    key <AD03> { [       period,         greater,           0x01002022,   periodcentered ] };
+    key <AD04> { [            p,               P,                thorn,            THORN ] };
+    key <AD05> { [            y,               Y,                  yen,              yen ] };
+    key <AD06> { [            f,               F,  leftdoublequotemark, leftsinglequotemark ] };
+    key <AD07> { [            g,               G, rightdoublequotemark, rightsinglequotemark ] };
+    key <AD08> { [            c,               C,              uparrow,        copyright ] };
+    key <AD09> { [            r,               R,           registered,       registered ] };
+    key <AD10> { [            l,               L,              lstroke,          Lstroke ] };
+    key <AD11> { [   dead_acute,      dead_grave,                acute,            grave ] };
+    key <AD12> { [        equal,            plus,              section,        plusminus ] };
+
+// Central row
+    key <AC01> { [            a,               A,                   ae,               AE ] };
+    key <AC02> { [            o,               O,                   oe,               OE ] };
+    key <AC03> { [            e,               E,             EuroSign,         EuroSign ] };
+    key <AC04> { [            u,               U,               oslash,         Ooblique ] };
+    key <AC05> { [            i,               I,             idotless,        Iabovedot ] };
+    key <AC06> { [            d,               D,                  eth,              ETH ] };
+    key <AC07> { [            h,               H,            leftarrow,        paragraph ] };
+    key <AC08> { [            t,               T,           rightarrow,        trademark ] };
+    key <AC09> { [            n,               N,                  eng,              ENG ] };
+    key <AC10> { [            s,               S,               ssharp,           ssharp ] };
+    key <AC11> { [   dead_tilde, dead_circumflex,           asciitilde,      asciicircum ] };
+    key <BKSL> { [        minus,      underscore,           0x01002015,       0x01000336 ] };
+
+// Lower row
+    key <LSGT> { [     ccedilla,        Ccedilla,            backslash,              bar ] };
+    key <AB01> { [    semicolon,           colon,           0x01000331,       0x0100032D ] };
+    key <AB02> { [            q,               Q,           0x01000259,       0x0100018F ] };
+    key <AB03> { [            j,               J,           0x01000292,       0x010001B7 ] };
+    key <AB04> { [            k,               K,        guillemotleft,       0x01002039 ] };
+    key <AB05> { [            x,               X,             multiply,         division ] };
+    key <AB06> { [            b,               B,       guillemotright,       0x0100203A ] };
+    key <AB07> { [            m,               M,            downarrow,               mu ] };
+    key <AB08> { [            w,               W,               ubreve,           Ubreve ] };
+    key <AB09> { [            v,               V,   doublelowquotemark, singlelowquotemark ] };
+    key <AB10> { [            z,               Z,           0x0100201F,       0x0100201B ] };
+    key <AB11> { [    backslash,             bar,             currency,        brokenbar ] };
+
+    key <SPCE> { [        space,           space,         nobreakspace,     nobreakspace ] };
+
+// Configures the "." and the "," for the numeric keypad
+    key <KPPT> { [ KP_Decimal              ] };
+    include "kpdl(comma)"
+
+// Configures the use of the AltGr key
+    include "level3(ralt_switch)"
+
+};
+
+
+//
+// Teclado Nativo Brasileiro                               2005-07-19
+// Brazilian Nativo Keyboard
+//      This is a Dvorak-based layout, designed for the Portuguese language
+//
+// Ari Caldeira     ari@tecladobrasileiro.com.br
+//
+partial alphanumeric_keys
+xkb_symbols "nativo" {
+
+    name[Group1]="Brazil - Nativo";
+
+// Numeric row
+    key <TLDE> { [        equal,            plus,              section,        plusminus ] };
+    key <AE01> { [            1,          exclam,          onesuperior,       exclamdown ] };
+    key <AE02> { [            2,              at,          twosuperior,          onehalf ] };
+    key <AE03> { [            3,      numbersign,        threesuperior,    threequarters ] };
+    key <AE04> { [            4,          dollar,             sterling,       onequarter ] };
+    key <AE05> { [            5,         percent,                 cent,       0x01002030 ] };
+    key <AE06> { [            6,  dead_diaeresis,              notsign,        diaeresis ] };
+    key <AE07> { [            7,       ampersand,        dead_belowdot,    dead_abovedot ] };
+    key <AE08> { [            8,        asterisk,          dead_ogonek,        dead_horn ] };
+    key <AE09> { [            9,       parenleft,         dead_cedilla,        dead_hook ] };
+    key <AE10> { [            0,      parenright,          dead_macron,       dead_breve ] };
+    key <AE11> { [  bracketleft,       braceleft,          ordfeminine,       0x01000326 ] };
+    key <AE12> { [ bracketright,      braceright,            masculine,   dead_abovering ] };
+
+// Upper row
+    key <AD01> { [        slash,        question,               degree,     questiondown ] };
+    key <AD02> { [        comma,            less,           0x01000329,       0x01000313 ] };
+    key <AD03> { [       period,         greater,           0x01002022,   periodcentered ] };
+    key <AD04> { [            h,               H,            paragraph,        paragraph ] };
+    key <AD05> { [            x,               X,             multiply,         division ] };
+    key <AD06> { [            w,               W,               ubreve,           Ubreve ] };
+    key <AD07> { [            l,               L,              lstroke,          Lstroke ] };
+    key <AD08> { [            t,               T,            trademark,        trademark ] };
+    key <AD09> { [            c,               C,            copyright,        copyright ] };
+    key <AD10> { [            p,               P,                thorn,            THORN ] };
+    key <AD11> { [   dead_tilde, dead_circumflex,           asciitilde,      asciicircum ] };
+    key <AD12> { [        minus,      underscore,           0x01002015,       0x01000336 ] };
+
+// Central row
+    key <AC01> { [            i,               I,             idotless,        Iabovedot ] };
+    key <AC02> { [            e,               E,             EuroSign,         EuroSign ] };
+    key <AC03> { [            a,               A,                   ae,               AE ] };
+    key <AC04> { [            o,               O,                   oe,               OE ] };
+    key <AC05> { [            u,               U,               oslash,         Ooblique ] };
+    key <AC06> { [            m,               M,                   mu,               mu ] };
+    key <AC07> { [            d,               D,                  eth,              ETH ] };
+    key <AC08> { [            s,               S,               ssharp,           ssharp ] };
+    key <AC09> { [            r,               R,           registered,       registered ] };
+    key <AC10> { [            n,               N,                  eng,              ENG ] };
+    key <AC11> { [   dead_acute,      dead_grave,                acute,            grave ] };
+    key <BKSL> { [   apostrophe,        quotedbl,           dead_caron, dead_doubleacute ] };
+
+// Lower row
+    key <LSGT> { [    semicolon,           colon,           0x01000331,       0x0100032D ] };
+    key <AB01> { [            y,               Y,                  yen,              yen ] };
+    key <AB02> { [     ccedilla,        Ccedilla,            backslash,              bar ] };
+    key <AB03> { [            j,               J,           0x01000292,       0x010001B7 ] };
+    key <AB04> { [            b,               B,        guillemotleft,       0x01002039 ] };
+    key <AB05> { [            k,               K,       guillemotright,       0x0100203A ] };
+    key <AB06> { [            q,               Q,           0x01000259,       0x0100018F ] };
+    key <AB07> { [            v,               V,   doublelowquotemark, singlelowquotemark ] };
+    key <AB08> { [            g,               G,  leftdoublequotemark, leftsinglequotemark ] };
+    key <AB09> { [            f,               F, rightdoublequotemark, rightsinglequotemark ] };
+    key <AB10> { [            z,               Z,           0x0100201F,       0x0100201B ] };
+    key <AB11> { [    backslash,             bar,             currency,        brokenbar ] };
+
+    key <SPCE> { [        space,           space,         nobreakspace,     nobreakspace ] };
+
+// Configures the "." and the "," for the numeric keypad
+    key <KPPT> { [ KP_Decimal              ] };
+    include "kpdl(comma)"
+
+// Configures the use of the AltGr key
+    include "level3(ralt_switch)"
+
+};
+
+
+//
+// Teclado Nativo Brasileiro para o teclado estadunidense  2005-07-19
+// Brazilian Nativo Keyboard for USA keyboards
+//
+// Ari Caldeira     ari@tecladobrasileiro.com.br
+//
+partial alphanumeric_keys
+xkb_symbols "nativo-us" {
+    include "br(nativo)"
+
+    name[Group1]="Brazil - Nativo for USA keyboards";
+
+// Lower row
+    key <AB01> { [            y,               Y,              ccedilla,        Ccedilla ] };
+    key <AB02> { [    semicolon,           colon,             backslash,             bar ] };
+
+};
+
+
+//
+// Teclado Nativo Brasileiro para digitacao em Esperanto   2005-07-19
+// Brazilian Nativo Keyboard for typing Esperanto
+//
+// Ari Caldeira     ari@tecladobrasileiro.com.br
+//
+partial alphanumeric_keys
+xkb_symbols "nativo-epo" {
+    include "br(nativo)"
+
+    name[Group1]="Brazil - Nativo for Esperanto";
+
+// Upper row Esperanto
+    key <AD04> { [            h,               H,          hcircumflex,      Hcircumflex ] };
+    key <AD05> { [  ccircumflex,     Ccircumflex,                    x,                X ] };
+    key <AD06> { [       ubreve,          Ubreve,                    w,                W ] };
+
+// Lower row Esperanto
+    key <AB01> { [  jcircumflex,     Jcircumflex,                    y,                Y ] };
+    key <AB02> { [  scircumflex,     Scircumflex,             ccedilla,         Ccedilla ] };
+    key <AB06> { [  gcircumflex,     Gcircumflex,                    q,                Q ] };
+
+};
diff --git a/xorg-server/xkbdata.src/symbols/braille b/xorg-server/xkbdata.src/symbols/braille
new file mode 100644
index 000000000..01d0bf2d2
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/braille
@@ -0,0 +1,62 @@
+// $XKeyboardConfig$
+
+// 10-dot patterns on the home row + v and n
+partial default alphanumeric_keys
+xkb_symbols "home_row" {
+    include "braille(keypad)"
+
+    name[Group1]="Braille";
+
+    key <AC04>	{ [ braille_dot_1 ] };
+    key <AC03>	{ [ braille_dot_2 ] };
+    key <AC02>	{ [ braille_dot_3 ] };
+    key <AC07>	{ [ braille_dot_4 ] };
+    key <AC08>	{ [ braille_dot_5 ] };
+    key <AC09>	{ [ braille_dot_6 ] };
+    key <AC01>	{ [ braille_dot_7 ] };
+    key <AC10>	{ [ braille_dot_8 ] };
+    key <AB04>	{ [ braille_dot_9 ] };
+    key <AB06>	{ [ braille_dot_10 ] };
+};
+
+// 6-dot patterns for the left hand
+partial alphanumeric_keys
+xkb_symbols "left_hand" {
+    include "braille(keypad)"
+
+    name[Group1]="Braille - Left hand";
+
+    key <AC03>	{ [ braille_dot_1 ] };
+    key <AC02>	{ [ braille_dot_2 ] };
+    key <AC01>	{ [ braille_dot_3 ] };
+    key <AC04>	{ [ braille_dot_4 ] };
+    key <AB05>	{ [ braille_dot_5 ] };
+    key <AB04>	{ [ braille_dot_6 ] };
+};
+
+// 6-dot patterns for the right hand
+partial alphanumeric_keys
+xkb_symbols "right_hand" {
+    include "braille(keypad)"
+
+    name[Group1]="Braille - Right hand";
+
+    key <AC07>	{ [ braille_dot_1 ] };
+    key <AB05>	{ [ braille_dot_2 ] };
+    key <AB06>	{ [ braille_dot_3 ] };
+    key <AC08>	{ [ braille_dot_4 ] };
+    key <AC09>	{ [ braille_dot_5 ] };
+    key <AC10>	{ [ braille_dot_6 ] };
+};
+
+// 6-dot patterns on the keypad
+partial hidden keypad_keys
+xkb_symbols "keypad" {
+    key <KP4>	{ [ braille_dot_1 ] };
+    key <KP1>	{ [ braille_dot_2 ] };
+    key <KP0>	{ [ braille_dot_3 ] };
+    key <KP5>	{ [ braille_dot_4 ] };
+    key <KP6>	{ [ braille_dot_5 ] };
+    key <KPAD>	{ [ braille_dot_6 ] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/bt b/xorg-server/xkbdata.src/symbols/bt
new file mode 100644
index 000000000..d87558371
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/bt
@@ -0,0 +1,88 @@
+// $XKeyboardConfig$
+//
+// 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>
+///////////////////////////////////////////////////////////////// 
+//   Version 0.97  2004-01-09  Layout map provided by Chris Fynn
+//   Version 1.0   2004-07-29  Some correction by Pema Geyleg <pema_geyleg@druknet.bt>
+/////////////////////////////////////////////////////////////////
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+      name[Group1]= "Bhutan";
+
+      key <TLDE> { [      0x1000F09, 0x1000F0A, 0x1000F6C, 0x1000F6D ]	};
+      
+// numbers e.a.
+      key <AE01> { [      0x1000F21, 0x1000F04, 1, exclam ]	};
+      key <AE02> { [      0x1000F22, 0x1000F05, 2, at     ]	};
+      key <AE03> { [      0x1000F23, 0x1000F06, 3, numbersign ]	};
+      key <AE04> { [      0x1000F24, 0x1000F48, 4, dollar  ]	};
+      key <AE05> { [      0x1000F25, 0x1000F70, 5, percent ]	};
+      key <AE06> { [      0x1000F26, 0x1000F08, 6, 0x1000F01 ]	};
+      key <AE07> { [      0x1000F27, 0x1000F38, 7, ampersand ]	};
+      key <AE08> { [      0x1000F28, 0x1000F34, 8, asterisk ]	};
+      key <AE09> { [      0x1000F29, 0x1000F3C, 9, parenleft ]	};
+      key <AE10> { [      0x1000F20, 0x1000F3D, 0, parenright ]	};
+      key <AE11> { [      0x1000F14, 0x1000F7F, minus, underscore ]	};
+      key <AE12> { [      0x1000F0D, 0x1000F11, equal, plus ]	};
+
+// consonants ( ka kha ga nga )
+      key <AD01> { [      0x1000F40, 0x1000F90, 0x1000F88, VoidSymbol  ]	};
+      key <AD02> { [      0x1000F41, 0x1000F91, 0x1000F89, VoidSymbol  ]	};
+      key <AD03> { [      0x1000F42, 0x1000F92, 0x1000F6E, 0x1000F6F] 	};
+      key <AD04> { [      0x1000F44, 0x1000F94, 0x1000F83, 0x1000F82  ]	};
+
+// vowels ( i u e o )
+      key <AD05> { [      0x1000F72, 0x1000F80, 0x1000F1A, VoidSymbol  ]	};
+      key <AD06> { [      0x1000F74, 0x1000F84, 0x1000F1B, VoidSymbol  ]	};
+      key <AD07> { [      0x1000F7A, 0x1000F7B, 0x1000F1C, VoidSymbol ]	};
+      key <AD08> { [      0x1000F7C, 0x1000F7D, 0x1000F1D, 0x1000F17  ]	};
+
+// consonants ( ca cha ja nya )
+      key <AD09> { [      0x1000F45, 0x1000F95, 0x1000F1E, 0x1000F18   ]	};
+      key <AD10> { [      0x1000F46, 0x1000F96, 0x1000F1F, 0x1000F19   ]	};
+      key <AD11> { [      0x1000F47, 0x1000F97, bracketleft, 0x1000F3E ]	};
+      key <AD12> { [      0x1000F49, 0x1000F99, bracketright, 0x1000F3F  ]	};
+
+// consonants ( ta tha da na pa pha ba ma tsa tsha dza wa )
+      key <AC01> { [      0x1000F4F, 0x1000F9F, 0x1000F4A, 0x1000F9A ]	};
+      key <AC02> { [      0x1000F50, 0x1000FA0, 0x1000F4B, 0x1000F9B ]	};
+      key <AC03> { [      0x1000F51, 0x1000FA1, 0x1000F4C, 0x1000F9C ]	};
+      key <AC04> { [      0x1000F53, 0x1000FA3, 0x1000F4E, 0x1000F9E ]	};
+      key <AC05> { [      0x1000F54, 0x1000FA4, 0x1002039, guillemotleft ]	};
+      key <AC06> { [      0x1000F55, 0x1000FA5, 0x100203A, guillemotright ]	};
+      key <AC07> { [      0x1000F56, 0x1000FA6, 0x1000F37, 0x1000F35 ]	};
+      key <AC08> { [      0x1000F58, 0x1000FA8, 0x1000F7E, VoidSymbol ]	};
+      key <AC09> { [      0x1000F59, 0x1000FA9, 0x1000F39, VoidSymbol ]	};
+      key <AC10> { [      0x1000F5A, 0x1000FAA, colon, semicolon ]	};
+      key <AC11> { [      0x1000F5B, 0x1000FAB, apostrophe, quotedbl ]	};
+      
+// TODO: BKSL and LSGT are from gb layout, are there any variants?
+      key <BKSL> { [      0x1000F5D, 0x1000FAD, backslash, 0x1000FBA ]	};
+      key <LSGT> { [      0x1000F0D, 0x1000F11, 0x1000F10, 0x1000F0F ]	};
+
+// consonants ( zha za 'a ya ra la sha sa ha a )
+      key <AB01> { [      0x1000F5E, 0x1000FAE, 0x1000F13, 0x1000F36 ]	};
+      key <AB02> { [      0x1000F5F, 0x1000FAF, 0x1000FBE, 0x1000FBF ]	};
+      key <AB03> { [      0x1000F60, 0x1000F71, 0x1000F03, 0x1000FB0 ]	};
+      key <AB04> { [      0x1000F61, 0x1000FB1, 0x1000F12, 0x1000FBB ]	};
+      key <AB05> { [      0x1000F62, 0x1000FB2, 0x1000F6A, 0x1000FBC ]	};
+      key <AB06> { [      0x1000F63, 0x1000FB3, 0x1000F8A, 0x1000F8B ]	};
+      key <AB07> { [      0x1000F64, 0x1000FB4, 0x1000F65, 0x1000FB5 ]	};
+      key <AB08> { [      0x1000F66, 0x1000FB6, comma, less ]	};
+      key <AB09> { [      0x1000F67, 0x1000FB7, period, greater ]	};
+      key <AB10> { [      0x1000F68, 0x1000FB8, slash, question ]	};
+
+// space
+      key <SPCE> { [ 0x1000F0B, space, 0x1000F0C, nobreakspace ] };
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/by b/xorg-server/xkbdata.src/symbols/by
new file mode 100644
index 000000000..b3194133b
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/by
@@ -0,0 +1,96 @@
+// $XKeyboardConfig$
+
+// based on
+// belarusian standard keyboard 
+// Alexander Mikhailian <mikhailian@altern.org>
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    name[Group1]= "Belarus";
+
+    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 "by(basic)"
+    name[Group1]= "Belarus - Winkeys";
+    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	]	};
+};
+
+// 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 alphanumeric_keys
+xkb_symbols "latin" {
+
+    include "latin"
+    name[Group1]= "Belarus - Latin";
+    key <AD02> {        [    w,    W,    scaron,    Scaron    ]       };
+    key <AD07> {        [    u,    U,    ubreve,    Ubreve    ]       };
+    key <AC02> {        [    s,    S,    sacute,    Sacute    ]       };
+    key <AC09> {        [    l,    L,    lstroke,   Lstroke   ]       };
+    key <AB01> {        [    z,    Z,    zacute,    Zacute    ]       };
+    key <AB02> {        [    x,    X,    zcaron,    Zcaron    ]       };
+    key <AB03> {        [    c,    C,    cacute,    Cacute    ]       };
+    key <AB04> {        [    v,    V,    ccaron,    Ccaron    ]       };
+    key <AB06> {        [    n,    N,    nacute,    Nacute    ]       };
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/ca b/xorg-server/xkbdata.src/symbols/ca
new file mode 100644
index 000000000..c198fafd9
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/ca
@@ -0,0 +1,511 @@
+// $XKeyboardConfig$
+
+default partial
+xkb_symbols "fr" {
+    name[Group1] = "Canada";
+
+    key <TLDE>	{ [ numbersign,       bar,     backslash ]	};
+    key <AE01>	{ [         1,     exclam,     plusminus ]	};
+    key <AE02>	{ [         2,   quotedbl,            at ]	};
+    key <AE03>	{ [         3,      slash,      sterling ]	};
+    key <AE04>	{ [         4,     dollar,          cent ]	};
+    key <AE05>	{ [         5,    percent,      currency ] 	};
+    key <AE06>	{ [         6,   question,       notsign ]	};
+    key <AE07>	{ [         7,  ampersand,     brokenbar ]	};
+    key <AE08>	{ [         8,   asterisk,   twosuperior ]	};
+    key <AE09>	{ [         9,  parenleft, threesuperior ]	};
+    key <AE10>	{ [         0, parenright,    onequarter ]	};
+    key <AE11>	{ [     minus, underscore,       onehalf ]	};
+    key <AE12>	{ [     equal,       plus, threequarters ]	};
+
+    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,   section ]	};
+    key <AD10>	{ [         p,          P, paragraph ]	};
+    key <AD11>	{ [dead_circumflex, dead_circumflex, bracketleft  ]	};
+    key <AD12>	{ [   dead_cedilla,  dead_diaeresis, bracketright ]	};
+
+    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, asciitilde ]	};
+    key <AC11>	{ [dead_grave, dead_grave,  braceleft ]	};
+    key <BKSL>	{ [      less,    greater, braceright ]	};
+
+    key <LSGT>	{ [guillemotleft, guillemotright, degree]	};
+    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,           mu ]	};
+    key <AB08>	{ [     comma, apostrophe,       macron ]	};
+    key <AB09>	{ [    period,     period,       hyphen ]	};
+    key <AB10>	{ [    eacute,     Eacute,   dead_acute ]	};
+
+    key <SPCE>	{ [     space,      space, nobreakspace ]	};
+
+    include "level3(ralt_switch)"
+};
+
+xkb_symbols "fr-dvorak" {
+    name[Group1] = "Canada - French Dvorak";
+
+    key <TLDE>  { [ numbersign,       bar,     backslash ]  };
+    key <AE01>  { [         1,     exclam,     plusminus ]  };
+    key <AE02>  { [         2,   quotedbl,            at ]  };
+    key <AE03>  { [         3,      slash,      sterling ]  };
+    key <AE04>  { [         4,     dollar,          cent ]  };
+    key <AE05>  { [         5,    percent,      currency ]  };
+    key <AE06>  { [         6,   question,       notsign ]  };
+    key <AE07>  { [         7,  ampersand,     brokenbar ]  };
+    key <AE08>  { [         8,   asterisk,   twosuperior ]  };
+    key <AE09>  { [         9,  parenleft, threesuperior ]  };
+    key <AE10>  { [         0, parenright,    onequarter ]  };
+    key <AE11>  { [dead_circumflex, dead_circumflex, bracketleft  ] };
+    key <AE12>  { [   dead_cedilla,  dead_diaeresis, bracketright ] };
+
+    key <AD01>  { [dead_grave, dead_grave,  braceleft ] };
+    key <AD02>  { [     comma, apostrophe,       macron ]   };
+    key <AD03>  { [    period,     period,       hyphen ]   };
+    key <AD04>  { [         p,          P, paragraph ]  };
+    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>  { [    eacute,     Eacute,   dead_acute ]   };
+    key <AD12>  { [     equal,       plus, threequarters ]  };
+
+    key <AC01>  { [         a,          A ] };
+    key <AC02>  { [         o,          O,   section ]  };
+    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,       onehalf ]  };
+    key <BKSL>  { [      less,    greater, braceright ] };
+
+    key <LSGT>  { [guillemotleft, guillemotright, degree]   };
+    key <AB01>  { [ semicolon,      colon, asciitilde ] };
+    key <AB02>  { [         q,          Q ] };
+    key <AB03>  { [         j,          J ] };
+    key <AB04>  { [         k,          K ] };
+    key <AB05>  { [         x,          X ] };
+    key <AB06>  { [         b,          B ] };
+    key <AB07>  { [         m,          M,           mu ]   };
+    key <AB08>  { [         w,          W ] };
+    key <AB09>  { [         v,          V ] };
+    key <AB10>  { [         z,          Z ] };
+
+    key <SPCE>  { [     space,      space, nobreakspace ]   };
+
+    include "level3(ralt_switch)"
+};
+
+partial
+xkb_symbols "fr-legacy" {
+
+    name[Group1] = "Canada - French (legacy)";
+
+    include "ca(fr)"
+
+    key <TLDE>	{ [    degree,     degree,       notsign ]	};
+    key <AE01>	{ [         1,     exclam,   onesuperior ]	};
+
+    key <AE03>	{ [         3, numbersign, threesuperior ]	};
+    key <AE04>	{ [         4,     dollar,    onequarter ]	};
+    key <AE05>	{ [         5,    percent,       onehalf ] 	};
+    key <AE06>	{ [         6,   question, threequarters ]	};
+    key <AE07>	{ [         7,  ampersand,     braceleft ]	};
+    key <AE08>	{ [         8,   asterisk,   bracketleft ]	};
+    key <AE09>	{ [         9,  parenleft,  bracketright,   plusminus ]	};
+    key <AE10>	{ [         0, parenright,    braceright ]	};
+    key <AE11>	{ [     minus, underscore,           bar, questiondown]	};
+    key <AE12>	{ [     equal,       plus,  dead_cedilla ]	};
+
+    key <AD04>	{ [         r,          R,     paragraph,  registered ]	};
+    key <AD06>	{ [         y,          Y,           yen ]	};
+    key <AD09>	{ [         o,          O,        oslash,      Ooblique ] };
+    key <AD10>	{ [         p,          P,         thorn,       THORN ]	};
+    key <AD11>	{ [dead_circumflex, dead_circumflex,           degree ]	};
+    key <AD12>	{ [  ccedilla,   Ccedilla, dead_tilde, dead_diaeresis ]	};
+
+    key <AC01>	{ [         a,          A,            ae,          AE ]	};
+    key <AC02>	{ [         s,          S,        ssharp,     section ]	};
+    key <AC03>	{ [         d,          D,           eth,         ETH ]	};
+    key <AC04>	{ [         f,          F,   ordfeminine ]	};
+    key <AC10>	{ [ semicolon,      colon,    dead_acute,  dead_acute ]	};
+    key <AC11>	{ [    egrave,     Egrave ]	};
+    key <BKSL>	{ [    agrave,     Agrave,    dead_grave ]	};
+
+    key <LSGT>	{ [    ugrave,     Ugrave,     backslash,         bar ]	};
+    key <AB01>	{ [         z,          Z, guillemotleft  ]	};
+    key <AB02>	{ [         x,          X, guillemotright ]	};
+    key <AB03>	{ [         c,          C,          cent,   copyright ]	};
+    key <AB07>	{ [         m,          M,            mu,   masculine ]	};
+    key <AB08>	{ [     comma, apostrophe,         less ]	};
+    key <AB09>	{ [    period,     period,      greater ]	};
+    key <AB10>	{ [    eacute,     Eacute,        slash ]	};
+};
+
+partial
+xkb_symbols "multi" {
+
+    name[Group1] = "Canada - Multilingual, first part";
+
+    include "ca(fr)"
+
+    key <TLDE>	{ [     slash,  backslash,           bar ]	};
+    key <AE01>	{ [         1,     exclam ]	};
+    key <AE02>	{ [         2,         at ]	};
+    key <AE03>	{ [         3, numbersign ]	};
+    key <AE04>	{ [         4,     dollar ]	};
+    key <AE05>	{ [         5,    percent ] 	};
+    key <AE06>	{ [         6,   question ]	};
+    key <AE07>	{ [         7,  ampersand,    braceleft ]	};
+    key <AE08>	{ [         8,   asterisk,   braceright ]	};
+    key <AE09>	{ [         9,  parenleft,  bracketleft ]	};
+    key <AE10>	{ [         0, parenright, bracketright ]	};
+    key <AE11>	{ [     minus, underscore ]	};
+    key <AE12>	{ [     equal,       plus,      notsign ]	};
+
+    key <AD09>	{ [         o,          O ]	};
+    key <AD10>	{ [         p,          P ]	};
+    key <AD11>	{ [dead_circumflex, dead_diaeresis, dead_grave  ]	};
+    key <AD12>	{ [  ccedilla,   Ccedilla,   asciitilde ]	};
+
+    key <AC10>	{ [ semicolon,      colon,     degree ]	};
+    key <AC11>	{ [    egrave,     Egrave ]	};
+    key <BKSL>	{ [    agrave,     Agrave ]	};
+
+    key <LSGT>	{ [    ugrave,     Ugrave ] 	};
+    key <AB01>	{ [         z,          Z, guillemotleft  ]	};
+    key <AB02>	{ [         x,          X, guillemotright ]	};
+    key <AB08>	{ [     comma, apostrophe,           less ]	};
+    key <AB09>	{ [    period,   quotedbl,        greater ]	};
+    key <AB10>	{ [    eacute,     Eacute ]	};
+};
+
+partial
+xkb_symbols "multi-2gr" {
+
+    name[Group1] = "Canada - Multilingual, second part";
+
+    key <TLDE>	{ [    NoSymbol,      hyphen ]	};
+    key <AE01>	{ [   onesuperior,  exclamdown ]	};
+    key <AE02>	{ [   twosuperior,  NoSymbol ]	};
+    key <AE03>	{ [ threesuperior,    sterling ]	};
+    key <AE04>	{ [    onequarter,    currency ]	};
+    key <AE05>	{ [       onehalf,threeeighths ]	};
+    key <AE06>	{ [ threequarters, fiveeighths ]	};
+    key <AE07>	{ [    NoSymbol,seveneighths ]	};
+    key <AE08>	{ [    NoSymbol,   trademark ]	};
+    key <AE09>	{ [    NoSymbol,   plusminus ]	};
+
+    key <AE11>	{ [    NoSymbol, questiondown]	};
+    key <AE12>	{ [  dead_cedilla, dead_ogonek ]	};
+
+    key <AD01>	{ [ NoSymbol,    Greek_OMEGA ]	};
+    key <AD02>	{ [    lstroke,        Lstroke ]	};
+    key <AD03>	{ [         oe,             OE ]	};
+    key <AD04>	{ [  paragraph,     registered ]	};
+    key <AD05>	{ [     tslash,         Tslash ]	};
+    key <AD06>	{ [  leftarrow,            yen ]	};
+    key <AD07>	{ [  downarrow,        uparrow ]	};
+    key <AD08>	{ [ rightarrow,       idotless ]	};
+    key <AD09>	{ [     oslash,       Ooblique ]	};
+    key <AD10>	{ [      thorn,          THORN ]	};
+    key <AD11>	{ [ NoSymbol, dead_abovering ]	};
+    key <AD12>	{ [ dead_tilde,    dead_macron ]	};
+
+    key <AC01>	{ [         ae,          AE ]	};
+    key <AC02>	{ [     ssharp,     section ]	};
+    key <AC03>	{ [        eth,         ETH ]	};
+    key <AC04>	{ [ NoSymbol, ordfeminine ]	};
+    key <AC05>	{ [        eng,         ENG ]	};
+    key <AC06>	{ [    hstroke,     Hstroke ]	};
+    key <AC07>	{ [      U0133,       U0132 ]	};
+    key <AC08>	{ [        kra,  NoSymbol ]	};
+    key <AC09>	{ [      U0140,       U013F ]	};
+    key <AC10>	{ [ dead_acute, dead_doubleacute ]	};
+    key <AC11>	{ [ NoSymbol,  dead_caron ]	};
+    key <BKSL>	{ [ NoSymbol,  dead_breve ]	};
+
+
+    key <LSGT>	{ [ NoSymbol,   brokenbar ]	};
+
+    key <AB03>	{ [       cent,   copyright ]	};
+    key <AB04>	{ [  leftdoublequotemark,  leftsinglequotemark ]	};
+    key <AB05>	{ [ rightdoublequotemark, rightsinglequotemark ]	};
+    key <AB06>	{ [      U0149,       U266A ]	};
+    key <AB07>	{ [         mu,   masculine ]	};
+    key <AB08>	{ [ Greek_horizbar, multiply ]	};
+    key <AB09>	{ [ periodcentered, division ]	};
+    key <AB10>	{ [ NoSymbol, dead_abovedot ]	};
+
+};
+
+// based on
+// Inuktitut keyboard for X11
+// written by Pablo Saratxaga <pablo@mandrakesoft.com>
+
+alphanumeric_keys 
+xkb_symbols "ike" {
+
+    name[Group1]= "Canada - 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
+};
+
+partial
+xkb_symbols "multix" {
+
+    name[Group1] = "Canada - Multilingual";
+
+    key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";
+    key <TLDE>	{ [     slash,  backslash,            bar, NoSymbol,
+    		   NoSymbol,     hyphen ]	};
+    key <AE01>	{ [         1,     exclam,      plusminus, NoSymbol,
+    		  onesuperior, exclamdown ]	};
+    key <AE02>	{ [         2,         at,             at, NoSymbol,
+    		  twosuperior, NoSymbol ]	};
+    key <AE03>	{ [         3, numbersign,       sterling, NoSymbol,
+    		threesuperior,   sterling ]	};
+    key <AE04>	{ [         4,     dollar,           cent, NoSymbol,
+    		   onequarter,   currency ]	};
+    key <AE05>	{ [         5,    percent,       currency, NoSymbol,
+    		      onehalf, threeeighths ]	};
+    key <AE06>	{ [         6,   question,        notsign, NoSymbol,
+    		threequarters, fiveeighths ]	};
+    key <AE07>	{ [         7,  ampersand,      braceleft, NoSymbol,
+    		   NoSymbol, seveneighths ]	};
+    key <AE08>	{ [         8,   asterisk,     braceright, NoSymbol,
+    		   NoSymbol,  trademark ]	};
+    key <AE09>	{ [         9,  parenleft,    bracketleft, NoSymbol,
+    		   NoSymbol,  plusminus ]	};
+    key <AE10>	{ [         0, parenright,   bracketright, NoSymbol ] };
+    key <AE11>	{ [     minus, underscore,        onehalf, NoSymbol,
+    		   NoSymbol, questiondown]	};
+    key <AE12>	{ [     equal,       plus,        notsign, NoSymbol,
+    		dead_cedilla, dead_ogonek ]	};
+
+    key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";
+    key <AD01>	{ [         q,           Q,     NoSymbol, NoSymbol,
+		   NoSymbol, Greek_OMEGA ]	};
+    key <AD02>	{ [         w,           W,     NoSymbol, NoSymbol,
+   		      lstroke,     Lstroke ]	};
+    key <AD03>	{ [         e,           E,     NoSymbol, NoSymbol,
+    			   oe,          OE ]	};
+    key <AD04>	{ [         r,           R,     NoSymbol, NoSymbol,
+    		    paragraph,  registered ]	};
+    key <AD05>	{ [         t,           T,     NoSymbol, NoSymbol,
+		       tslash,      Tslash ]	};
+    key <AD06>	{ [         y,           Y,     NoSymbol, NoSymbol,
+		    leftarrow,         yen ]	};
+    key <AD07>	{ [         u,           U,     NoSymbol, NoSymbol,
+    		    downarrow,     uparrow ]	};
+    key <AD08>	{ [         i,           I,     NoSymbol, NoSymbol,
+    		   rightarrow,    idotless ]	};
+    key <AD09>	{ [         o,           O,        section, NoSymbol,
+		       oslash,    Ooblique ]	};
+    key <AD10>	{ [         p,           P,      paragraph, NoSymbol,
+		        thorn,       THORN ]	};
+
+    key.type[group1]="EIGHT_LEVEL";
+    key <AD11>	{ [dead_circumflex, dead_diaeresis, dead_grave, NoSymbol,
+    			NoSymbol, dead_abovering ]	};
+
+    key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";
+    key <AD12>	{ [  ccedilla,   Ccedilla,     asciitilde, NoSymbol,
+		   dead_tilde,    dead_macron ]	};
+
+    key <AC01>	{ [         a,          A,     NoSymbol, NoSymbol,
+    			   ae,         AE ]	};
+    key <AC02>	{ [         s,          S,     NoSymbol, NoSymbol,
+    		       ssharp,    section ]	};
+    key <AC03>	{ [         d,          D,     NoSymbol, NoSymbol,
+    			  eth,        ETH ]	};
+    key <AC04>	{ [         f,          F,     NoSymbol, NoSymbol,
+    		   NoSymbol, ordfeminine ]	};
+    key <AC05>	{ [         g,          G,     NoSymbol, NoSymbol,
+    			  eng,        ENG ]	};
+    key <AC06>	{ [         h,          H,     NoSymbol, NoSymbol,
+    		      hstroke,    Hstroke ]	};
+    key <AC07>	{ [         j,          J,     NoSymbol, NoSymbol,
+    			U0133,      U0132 ]	};
+    key <AC08>	{ [         k,          K,     NoSymbol, NoSymbol,
+    			  kra, NoSymbol ]	};
+    key <AC09>	{ [         l,          L,     NoSymbol, NoSymbol,
+    			U0140,      U013F ]	};
+
+    key.type[group1]="EIGHT_LEVEL";
+    key <AC10>	{ [ semicolon,          colon,         degree, NoSymbol,
+    		   dead_acute, dead_doubleacute ]	};
+
+    key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";
+    key <AC11>	{ [    egrave,         Egrave,      braceleft, NoSymbol,
+    		   NoSymbol,  dead_caron ]	};
+    key <BKSL>	{ [    agrave,         Agrave,     braceright, NoSymbol,
+    		   NoSymbol,  dead_breve ]	};
+
+    key <LSGT>	{ [    ugrave,     Ugrave,         degree, NoSymbol,
+    		   NoSymbol,   brokenbar ]	};
+
+    key.type[group1]="FOUR_LEVEL_SEMIALPHABETIC";
+    key <AB01>	{ [         z,          Z,  guillemotleft, NoSymbol ]	};
+    key <AB02>	{ [         x,          X, guillemotright, NoSymbol ]	};
+
+    key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";
+    key <AB03>	{ [         c,          C,     NoSymbol, NoSymbol,
+    			 cent,   copyright ]	};
+    key <AB04>	{ [         v,          V,     NoSymbol, NoSymbol,
+    	  leftdoublequotemark,  leftsinglequotemark ]	};
+    key <AB05>	{ [         b,          B,     NoSymbol, NoSymbol,
+    	 rightdoublequotemark, rightsinglequotemark ]	};
+    key <AB06>	{ [         n,          N,     NoSymbol, NoSymbol,
+    			U0149,       U266A ]	};
+    key <AB07>	{ [         m,          M,             mu, NoSymbol,
+    			   mu,   masculine ]	};
+    key <AB08>	{ [     comma, apostrophe,           less, NoSymbol,
+    	       Greek_horizbar, multiply ]	};
+    key <AB09>	{ [    period,   quotedbl,        greater, NoSymbol,
+    	       periodcentered, division ]	};
+    key <AB10>	{ [    eacute,     Eacute,     dead_acute, NoSymbol,
+    		   NoSymbol, dead_abovedot ]	};
+
+    include "nbsp(level3s)"
+
+    modifier_map Control{ Control_L };
+
+    include "level3(ralt_switch)"
+    include "level5(rctrl_switch)"
+};
+
+// Secwepemctsin keyboard for X11
+// written by Neskie Manuel <neskiem@gmail.com>
+
+partial alphanumeric_keys  
+xkb_symbols "shs" {
+
+    include "us"
+
+    name[Group1]= "Canada - Secwepemctsin";
+
+    //Using Dead key to get COMBINING COMMA ABOVE for ejectives on
+    //q, l, t, s, m, g, k, p, w, y, r
+    //XCompose key is used for the other accute and grave.
+
+    key <AB08> {        [ comma, less, U0313    ]	};
+
+    include "level3(ralt_switch)"
+    include "compose(rctrl)"
+};
+
+// OLPC Section
+xkb_symbols "olpc" {
+
+    include "fr"
+
+    key <AE03>	{ [          3,    slash,          ograve,        Ograve ] };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "kut" {
+
+    //Ejective U0313  and compose accents are from shs layout
+    include "ca(shs)"
+
+    name[Group1]= "Canada - Ktunaxa";
+
+    // Alphanumeric section
+
+    // Alveolar Click
+    key <AD05> {	[ t,	T,U01C2	,U01C2	]	};
+
+    //Cent sign
+    key <AB03> {	[ c,	C,U00A2,U00A2	]	};
+
+    //Mid dot
+    key <AB09> {	[ period,     greater,U00B7   	]	};
+
+    //Glottal stop
+    key <AB10> {	[ slash,	question, U0294	]	};
+
+    //COMBINING COMMA ABOVE RIGHT
+    key <AC11> {	[ apostrophe,	quotedbl, U0315,U0315	]	};
+
+    //MODIFIER LETTER RIGHT HALF RING
+    key <AC10> {	[ semicolon,	colon,U02BE,U02BE	]	};
+};
diff --git a/xorg-server/xkbdata.src/symbols/capslock b/xorg-server/xkbdata.src/symbols/capslock
new file mode 100644
index 000000000..735e148cb
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/capslock
@@ -0,0 +1,33 @@
+// $XKeyboardConfig$
+
+default partial hidden modifier_keys
+xkb_symbols "capslock" {
+    key <CAPS> {	[	Caps_Lock		]	};
+    modifier_map Lock { Caps_Lock };
+};
+
+partial hidden modifier_keys
+xkb_symbols "shiftlock" {
+    key <CAPS> {	[	Shift_Lock		]	};
+    modifier_map Shift { Shift_Lock };
+};
+
+partial hidden modifier_keys
+xkb_symbols "grouplock" {
+    key <CAPS> {	[	ISO_Next_Group,	Caps_Lock	]	};
+};
+
+partial hidden modifier_keys
+xkb_symbols "swapescape" {
+    key <CAPS> {        [       Escape  ]       };
+    key <ESC>  {        [     Caps_Lock    ]       };
+};
+
+partial hidden modifier_keys
+xkb_symbols "groupshift" {
+    key <CAPS> {
+       type[Group1]="PC_ALT_LEVEL2",
+       [       Mode_switch,    Caps_Lock       ]
+    };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/cd b/xorg-server/xkbdata.src/symbols/cd
new file mode 100644
index 000000000..1ba036551
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/cd
@@ -0,0 +1,71 @@
+// $XKeyboardConfig$
+
+// based on us_intl keyboard map file and a Sinhala keyboard map
+// version 0.3
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    name[Group1]= "Congo, Democratic Republic of the";
+
+    key.type[Group1] = "FOUR_LEVEL";
+
+    // Alphanumeric section
+    // TILDE, COMBINING TILDE
+    key <TLDE> { [     grave, asciitilde, 0x01000303] };
+    key <AE01> { [ ampersand,          1, numbersign                      ] };
+    key <AE02> { [0x01000301,          2, at                              ] };
+    key <AE03> { [0x01000300,          3, guillemotleft                   ] };
+    key <AE04> { [ parenleft,          4, bracketleft                     ] };
+    key <AE05> { [ braceleft,          5, less                            ] };
+    key <AE06> { [ braceright,         6, greater                         ] };
+    key <AE07> { [parenright,          7, bracketright                    ] };
+    key <AE08> { [0x01000302,          8, guillemotright                  ] };
+    key <AE09> { [0x0100030c,          9                                  ] };
+    key <AE10> { [0x01000308,          0, at                              ] };
+    key <AE11> { [     minus,      underscore,   percent                  ] };
+    key <AE12> { [     equal,      plus,       multiply,        division  ] };
+
+    key <AD01> { [         a,          A                                  ] };
+    key <AD02> { [	   z,          Z                                  ] };
+    key <AD03> { [	   e,          E                                  ] };
+    key <AD04> { [         r,          R                                  ] };
+    key <AD05> { [	   t,          T                                  ] };
+    key <AD06> { [	   y,          Y                                  ] };
+    key <AD07> { [	   u,          U,    0x01000289,       0x01001d7e ] };
+    key <AD08> { [	   i,          I,    0x01000268,       0x01000197 ] };
+    key <AD09> { [	   o,          O,        oslash,         Ooblique ] };
+    key <AD10> { [	   p,          P                                  ] };
+    key <AD11> { [0x0100025B,      0x01000190,     asciicircum ] };
+    key <AD12> { [ asterisk, asciicircum, dollar                ] };
+
+    key <AC01> { [	   q,          Q                                  ] };
+    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> { [         m,          M                                  ] };
+    key <AC11> { [0x01000254, 0x01000186                                  ] };
+    key <LSGT> { [    backslash,     bar                                  ] };
+
+    key <AB01> { [	   w,          W                                  ] };
+    key <AB02> { [         x,          X                                  ] };
+    key <AB03> { [	   c,          C,       ccedilla,       Ccedilla  ] };
+    key <AB04> { [	   v,          V                                  ] };
+    key <AB05> { [	   b,          B                                  ] };
+    key <AB06> { [	   n,          N                                  ] };
+    key <AB07> { [     comma,   question,        0x01000327               ] };
+    key <AB08> { [ semicolon,     period                              ] };
+    key <AB09> { [     colon,      slash                              ] };
+    key <AB10> { [    exclam,   apostrophe,     0x01002019           ] };
+    key <BKSL> { [  quotedbl,  backslash,            bar                  ] };
+
+    // SPACE, SPACE, SPACE, NO-BREAK SPACE, SPACE
+    key <SPCE> { [ space,          space,  nobreakspace,     nobreakspace ] };
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/ch b/xorg-server/xkbdata.src/symbols/ch
new file mode 100644
index 000000000..3a7646f80
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/ch
@@ -0,0 +1,210 @@
+// $XKeyboardConfig$
+// $Xorg: ch,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/ch,v 3.6 2002/11/25 14:05:06 eich Exp $
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    include "latin"
+
+    // Alphanumeric section
+    name[Group1]= "Switzerland";
+    key <TLDE> { [    section,     degree                           ] };
+    key <AE01> { [          1,       plus,          bar, exclamdown ] };
+    key <AE02> { [          2,   quotedbl,           at, oneeighth  ] };
+    key <AE03> { [          3,   asterisk,   numbersign             ] };
+    key <AE04> { [          4,   ccedilla                           ] };
+    key <AE05> { [          5,    percent                           ] };
+    key <AE06> { [          6,  ampersand,      notsign             ] };
+    key <AE07> { [          7,      slash,    brokenbar             ] };
+    key <AE08> { [          8,  parenleft,         cent             ] };
+    key <AE09> { [          9, parenright                           ] };
+    key <AE10> { [          0,      equal                           ] };
+    key <AE11> { [ apostrophe,   question,   dead_acute             ] };
+    key <AE12> { [ dead_circumflex, dead_grave, dead_tilde          ] };
+
+    key <AD03> { [          e,          E,     EuroSign             ] };
+    key <AD06> { [          z,          Z                           ] };
+    key <AD11> { [ udiaeresis,     egrave,  bracketleft             ] };
+    key <AD12> { [ dead_diaeresis, exclam, bracketright             ] };
+
+    key <AC10> { [ odiaeresis,     eacute                           ] };
+    key <AC11> { [ adiaeresis,     agrave,    braceleft             ] };
+    key <BKSL> { [     dollar,   sterling,   braceright             ] };
+
+    key <LSGT> { [       less,    greater,    backslash, brokenbar  ] };
+    key <AB01> { [          y,          Y                           ] };
+    key <AB08> { [      comma,  semicolon                           ] };
+    key <AB09> { [     period,      colon                           ] };
+    key <AB10> { [      minus, underscore                           ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "de" {
+    include "ch(basic)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "de_Sundeadkeys" {
+    // modify the basic Swiss German layout to use Sun dead keys
+    include "ch(basic)"
+    key <AE11> { [      apostrophe,    question,  SunFA_Acute   ] };
+    key <AE12> { [    SunFA_Circum, SunFA_Grave,  SunFA_Tilde   ] };
+    key <AD12> { [ SunFA_Diaeresis,      exclam, bracketright   ] };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "de_sundeadkeys" {
+    include "ch(de_Sundeadkeys)"
+    name[Group1]= "Switzerland - German, Sun dead keys";
+};
+
+partial alphanumeric_keys 
+xkb_symbols "de_nodeadkeys" {
+    // modify the basic Swiss German layout not to have any dead keys
+    include "ch(basic)"
+    name[Group1]= "Switzerland - German, eliminate dead keys";
+    key <AE11> { [  apostrophe, question,        acute  ] };
+    key <AE12> { [ asciicircum,    grave,   asciitilde  ] };
+    key <AD12> { [   diaeresis,   exclam, bracketright  ] };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "fr" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Swiss/French keybaord
+
+    include "ch(basic)"
+    name[Group1]= "Switzerland - French";
+
+    override key <AD11> {
+	[ egrave,	udiaeresis,	bracketleft	]
+    };
+    override key <AC10> {
+	[ eacute,	odiaeresis	]
+    };
+    override key <AC11> {
+	[ agrave,	adiaeresis,	braceleft	]
+    };
+};
+
+partial alphanumeric_keys
+xkb_symbols "fr_Sundeadkeys" {
+    // modify the basic Swiss French layout to use Sun dead keys
+    include "ch(fr)"
+    key <AE11> { [      apostrophe,    question,  SunFA_Acute   ] };
+    key <AE12> { [    SunFA_Circum, SunFA_Grave,  SunFA_Tilde   ] };
+    key <AD12> { [ SunFA_Diaeresis,      exclam, bracketright   ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "fr_sundeadkeys" {
+    include "ch(fr_Sundeadkeys)"
+    name[Group1]= "Switzerland - French, Sun dead keys";
+};
+
+partial alphanumeric_keys
+xkb_symbols "fr_nodeadkeys" {
+    // modify the basic Swiss French layout not to have any dead keys
+    include "ch(fr)"
+    name[Group1]= "Switzerland - French, eliminate dead keys";
+    key <AE11> { [  apostrophe, question,        acute  ] };
+    key <AE12> { [ asciicircum,    grave,   asciitilde  ] };
+    key <AD12> { [   diaeresis,   exclam, bracketright  ] };
+};
+
+// Copied from macintosh_vndr/ch
+// 03.01.2003
+// Andreas Tobler <a.tobler@schweiz.ch>
+// modified for Swiss German Apple Extended Keyboard II
+
+partial alphanumeric_keys
+xkb_symbols "de_mac" {
+    
+    name[Group1]= "Switzerland - German (Macintosh)";
+
+    // Alphanumeric section
+
+    key <AE01> { [	1,	plus, 	plusminus,	infinity		]	};
+    key <AE02> { [	2,	quotedbl, leftdoublequotemark, rightdoublequotemark 	]	};
+    key <AE03> { [	3,	asterisk, 	numbersign,	leftcaret	]	};
+					// not displayed here
+    key <AE04> { [	4,	ccedilla, 	Ccedilla,	slash		]	};
+    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, 	NoSymbol		]	};
+    key <AE12> { [	dead_circumflex,dead_grave, 	dead_acute,	asciicircum		]	};
+    key <AD01> { [	q,	Q, 	oe,		OE			]	};
+    key <AD02> { [	w,	W, 	Greek_SIGMA,	Aacute			]	};
+    key <AD03> { [ 	e,	E, 	EuroSign,	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,	idotless		]	};
+    key <AD09> { [ 	o,	O, 	oslash,		Ooblique		]	};
+    key <AD10> { [ 	p,	P, 	Greek_pi,	Greek_PI		]	};
+    key <AD11> { [	udiaeresis,	egrave, 	section,	ydiaeresis		]	};
+    key <AD12> { [	dead_diaeresis,	exclam, 	grave,		apostrophe		]	};
+    key <AC01> { [ 	a,	A, 	aring,		Aring			]	};
+    key <AC02> { [ 	s,	S, 	ssharp, 	NoSymbol		]	}; 
+					// ligature fl
+    key <AC03> { [ 	d,	D, 	Greek_sigma,	NoSymbol		]	};
+			// partialderivative is not available here att
+    key <AC04> { [ 	f,	F, 	function,	doubledagger		]	};
+    key <AC05> { [ 	g,	G, 	at,		comma			]	};
+    key <AC06> { [ 	h,	H, 	ordfeminine,	periodcentered		]	};
+    key <AC07> { [ 	j,	J,  	masculine,	eth	 		]	};
+    key <AC08> { [ 	k,	K, 	Greek_DELTA,	macron			]	};
+    key <AC09> { [ 	l,	L, 	notsign,	caret			]	};
+    key <AC10> { [	odiaeresis,	eacute, 	cent,		breve	]	};
+    key <AC11> { [	adiaeresis,	agrave, 	ae,		AE	]	};
+    key <AB01> { [	y,	Y, 	yen,		Ydiaeresis		]	};
+    key <AB02> { [ 	x,	X, 	similarequal,	trademark		]	};
+    key <AB03> { [ 	c,	C, 	copyright,	NoSymbol		]	};
+    key <AB04> { [ 	v,	V, 	radical,	diamond			]	};
+    key <AB05> { [ 	b,	B, 	integral,	NoSymbol		]	};  
+    key <AB06> { [ 	n,	N, 	dead_tilde, 	enopencircbullet	]       };
+					// to be fixed att
+    key <AB07> { [ 	m,	M, 	mu,		dead_abovering		]       };
+					// not sure att
+    key <AB08> { [	comma,	semicolon, 	guillemotleft,	guillemotright	]	};
+    key <AB09> { [	period,	colon, 	ellipsis,	division		]	};
+    key <AB10> { [	minus,	underscore, 	hyphen,		emdash		]	};
+    key <TLDE> { [	section,	degree,   	NoSymbol, 	NoSymbol		]	};
+			// ligature fi	// per mille
+    key <SPCE> { [	space, 	nobreakspace,	nobreakspace		]	};
+    key <LSGT> { [	less,	greater, 	lessthanequal,	greaterthanequal	]  	};
+    key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet	]	};
+
+    include "kpdl(comma)"
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "fr_mac" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Swiss/French keybaord
+
+    include "ch(de_mac)"
+    name[Group1]= "Switzerland - French (Macintosh)";
+
+    override key <AD11> {
+	[ egrave,	udiaeresis,  bracketleft	]
+    };
+    override key <AC10> {
+	[ eacute,	odiaeresis	]
+    };
+    override key <AC11> {
+	[ agrave,	adiaeresis,   braceleft		]
+    };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/cn b/xorg-server/xkbdata.src/symbols/cn
new file mode 100644
index 000000000..c3dfc94b2
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/cn
@@ -0,0 +1,154 @@
+// $XKeyboardConfig$
+//
+
+//
+// Default Chinise is the same as American
+//
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+    include "us(basic)"
+
+    name[Group1]= "China";
+};
+
+// Tibetan Standard Keyboard map for XKB/X.org
+//
+// Based on the CNS Tibetan keyboard as supported by Windows Vista
+// using information published by Tashi Tsering:
+// http://www.yalasoo.com/English/docs/yalasoo_en_MStbKb.html
+//
+// XKB version by Rich Felker <dalias@aerifal.cx>.
+//
+// The CNS Tibetan keyboard standard specifies 5 keyboards worth of keys,
+// but apparently makes no requirements about how each is accessed. Only
+// the first 2 are needed for native Tibetan text; the remainder are
+// filled with special symbols and letters for transliterating foreign
+// text. Further, CNS leaves the level of support of keyboards 2-5 as an
+// option to the implementor (despite the fact that #2 is absolutely
+// essential...). Windows Vista maps them as follows:
+//
+// 1. Unshifted
+// 2. "m"-key-prefixed
+// 3. Shift-modified
+// 4. Ctrl+Alt+Shift-modified
+// 5. "M"-key-prefixed
+//
+// I roughly copy the Windows Vista mapping, which was intended by the
+// designer of the keyboard, with the following exceptions:
+//
+// The fifth keyboard is almost empty and contains only precomposed forms
+// of subjoined letter characters whose use is strongly discouraged, and
+// is not implemented at all in this XKB map. The fourth is implemented,
+// but is accessed by an "m"-prefix (or "M"-prefix, for convenience)
+// followed by a Shift-modified key. This avoids stealing the Ctrl and Alt
+// keys, which belong to applications on *nix and not to the keyboard or
+// input method. Aside from enterring rare special symbols and
+// foreign-word-transliteration letters, these differences should not
+// affect users.
+//
+// Implementation notes:
+//
+// A latching ISO Level3 shift is used for the "m"-prefix modifier. In
+// principle moving it to other keys (e.g. AltGr) would be possible
+// according to user preference, but this is not practical for typing
+// Tibetan, since the subjoined consonants, of which Tibetan has 0-2 per
+// syllable, are accessed via this mechanism.
+//
+// One annoyance is that the latching Level3 shift fails to work if the
+// previous key is not yet released when "m" is pressed (the key release
+// event kills the latch). I consider this a bug in X and don't know an
+// easy way to work around it. Complain to the maintainers if it bothers
+// you and maybe they'll find a fix. You won't notice it unless you're
+// fast at typing Tibetan anyway.
+
+partial alphanumeric_keys 
+xkb_symbols "tib" {
+
+    name[Group1]= "China - Tibetan";
+
+    key <TLDE> { [ 0x1000f68, 0x1000f01, 0x1000fb8, 0x1000f00 ] }; # ཨ � ྸ ༀ
+    key <AE01> { [ 0x1000f21, 0x1000f2a, 0x1000f04, 0x1000f76 ] }; # ༡ ༪ ༄ ྲྀ
+    key <AE02> { [ 0x1000f22, 0x1000f2b, 0x1000f05, 0x1000f77 ] }; # ༢ ༫ ༅ ཷ
+    key <AE03> { [ 0x1000f23, 0x1000f2c, 0x1000f7e, 0x1000f78 ] }; # ༣ ༬ ཾ ླྀ
+    key <AE04> { [ 0x1000f24, 0x1000f2d, 0x1000f83, 0x1000f79 ] }; # ༤ ༭ ྃ ཹ
+    key <AE05> { [ 0x1000f25, 0x1000f2e, 0x1000f37, 0x1000f81 ] }; # ༥ ༮ ༷ �
+    key <AE06> { [ 0x1000f26, 0x1000f2f, 0x1000f35, 0x1000f09 ] }; # ༦ ༯ ༵ ༉
+    key <AE07> { [ 0x1000f27, 0x1000f30, 0x1000f7f, 0x1000f0a ] }; # ༧ ༰ ཿ ༊
+    key <AE08> { [ 0x1000f28, 0x1000f31, 0x1000f14, 0x1000f0f ] }; # ༨ ༱ ༔ �
+    key <AE09> { [ 0x1000f29, 0x1000f32, 0x1000f11, 0x1000f10 ] }; # ༩ ༲ ༑ �
+    key <AE10> { [ 0x1000f20, 0x1000f33, 0x1000f08, 0x1000f12 ] }; # ༠ ༳ ༈ ༒
+    key <AE11> { [ 0x1000f67, 0x1000f3c, 0x1000fb7, 0x1000f0c ] }; # ཧ ༼ ྷ ༌
+    key <AE12> { [ 0x1000f5d, 0x1000f3d, 0x1000fba, 0x1000f13 ] }; # � ༽ ྺ ༓
+
+    key <AD01> { [ 0x1000f45, 0x1000f15, 0x1000f95, 0x1000f89 ] }; # ཅ ༕ ྕ ྉ
+    key <AD02> { [ 0x1000f46, 0x1000f16, 0x1000f96, 0x1000f88 ] }; # ཆ ༖ ྖ ྈ
+    key <AD03> { [ 0x1000f7a, 0x1000f17, 0x1000f7b, 0x1000fbe ] }; # ེ ༗ ཻ ྾
+    key <AD04> { [ 0x1000f62, 0x1000fbc, 0x1000fb2, 0x1000f6a ] }; # ར ྼ ྲ ཪ
+    key <AD05> { [ 0x1000f4f, 0x1000f4a, 0x1000f9f, 0x1000f9a ] }; # � ཊ ྟ ྚ
+    key <AD06> { [ 0x1000f61, 0x1000fbb, 0x1000fb1, 0x1000fbf ] }; # ཡ ྻ ྱ ྿
+    key <AD07> { [ 0x1000f74, 0x1000f18, 0x1000fad, 0x1000f75 ] }; # ུ ༘ ྭ ཱུ
+    key <AD08> { [ 0x1000f72, 0x1000f19, 0x1000f80, 0x1000f73 ] }; # ི ༙ ྀ ཱི
+    key <AD09> { [ 0x1000f7c, 0x1000f1a, 0x1000f7d, 0x1000fc0 ] }; # ོ ༚ ཽ ࿀
+    key <AD10> { [ 0x1000f55, 0x1000f1b, 0x1000fa5, 0x1000fc1 ] }; # ཕ ༛ ྥ �
+    key <AD11> { [ 0x1000f59, 0x1000f1c, 0x1000fa9, 0x1000fc2 ] }; # ཙ ༜ ྩ ࿂
+    key <AD12> { [ 0x1000f5a, 0x1000f1d, 0x1000faa, 0x1000fc3 ] }; # ཚ � ྪ ࿃
+    key <BKSL> { [ 0x1000f5b, 0x1000f1e, 0x1000fab, 0x1000f5c ] }; # ཛ ༞ ྫ ཛྷ
+
+    key <AC01> { [ 0x1000f60, 0x1000f71, 0x1000fb0, 0x1000fc4 ] }; # འ ཱ ྰ ࿄
+    key <AC02> { [ 0x1000f66, 0x1000f1f, 0x1000fb6, 0x1000fc5 ] }; # ས ༟ ྶ ࿅
+    key <AC03> { [ 0x1000f51, 0x1000f4c, 0x1000fa1, 0x1000f9c ] }; # ད ཌ ྡ ྜ
+    key <AC04> { [ 0x1000f56, 0x1000f3e, 0x1000fa6, 0x1000f57 ] }; # བ ༾ ྦ བྷ
+    key <AC05> { [ 0x1000f44, 0x1000f3f, 0x1000f94, 0x1000fc6 ] }; # ང ༿ ྔ ࿆
+    key <AC06> { [ 0x1000f58, 0x1000fcf, 0x1000fa8, 0x1000fc7 ] }; # མ � ྨ ࿇
+    key <AC07> { [ 0x1000f0b, 0x1000f02, 0x1000f84, 0x1000fc8 ] }; # ་ ༂ ྄ ࿈
+    key <AC08> { [ 0x1000f42, 0x1000f03, 0x1000f92, 0x1000f43 ] }; # ག ༃ ྒ གྷ
+    key <AC09> { [ 0x1000f63, 0x1000f06, 0x1000fb3, 0x1000fc9 ] }; # ལ ༆ ླ ࿉
+    key <AC10> { [ 0x1000f5e, 0x1000f07, 0x1000fae, 0x1000fca ] }; # ཞ ༇ ྮ ࿊
+    key <AC11> { [ 0x1000f0d, 0x1000f38, 0x1000f0e, 0x1000fcb ] }; # � ༸ ༎ ࿋
+
+    key <AB01> { [ 0x1000f5f, 0x1000f34, 0x1000faf, 0x1000fcc ] }; # ཟ ༴ ྯ ࿌
+    key <AB02> { [ 0x1000f64, 0x1000f65, 0x1000fb4, 0x1000fb5 ] }; # ཤ ཥ ྴ ྵ
+    key <AB03> { [ 0x1000f40, 0x1000f69, 0x1000f90, 0x1000fb9 ] }; # ཀ ཀྵ � ྐྵ
+    key <AB04> { [ 0x1000f41, 0x1000f87, 0x1000f91, 0x1000f36 ] }; # � ྇ ྑ ༶
+    key <AB05> { [ 0x1000f54, 0x1000f86, 0x1000fa4, 0x1000f82 ] }; # པ ྆ ྤ ྂ
+    key <AB06> { [ 0x1000f53, 0x1000f4e, 0x1000fa3, 0x1000f9e ] }; # ན ཎ ྣ ྞ
+    key <AB07> { [ ISO_Level3_Latch, ISO_Level3_Latch, 0x1000f85, 0x1000f52 ] }; # -བ�གས་ ྅ དྷ
+    key <AB08> { [ 0x1000f50, 0x1000f4b, 0x1000fa0, 0x1000f9b ] }; # � ཋ ྠ ྛ
+    key <AB09> { [ 0x1000f47, 0x1000f3a, 0x1000f97, 0x1000f8b ] }; # ཇ ༺ ྗ ྋ
+    key <AB10> { [ 0x1000f49, 0x1000f3b, 0x1000f99, 0x1000f8a ] }; # ཉ ༻ ྙ ྊ
+ 
+};
+
+// Tibetan Standard Keyboard with ASCII numerals
+//
+// Users may prefer that the numeral keys enter ASCII numerals instead of
+// Tibetan numerals, since the latter are not in modern use in Tibet.
+// This is especially an issue for laptop users who do not have a numeric
+// keypad by which to access the ASCII numerals, and who need to type
+// numbers to be interpreted by applications.
+//
+// In this mapping, the Shift-modified numeral keys generate Tibetan
+// numerals, since it was unclear to me that the standard Latin punctuation
+// keys would be any use without Latin letters. (One can imagine wanting to
+// type an email address using the @ sign, but as of present non-ASCII
+// email addresses are not possible.) This mapping may change in the future
+// if a clearly better use for the shifted numerals is pointed out by users.
+
+partial alphanumeric_keys 
+xkb_symbols "tib_asciinum" {
+    include "cn(tib)"
+
+    name[Group1]= "China - Tibetan (with ASCII numerals)";
+
+    key <AE01> { [ 1, 0x1000f21, 0x1000f04, 0x1000f76 ] }; # 1 ༡ ༄ ྲྀ
+    key <AE02> { [ 2, 0x1000f22, 0x1000f05, 0x1000f77 ] }; # 2 ༢ ༅ ཷ
+    key <AE03> { [ 3, 0x1000f23, 0x1000f7e, 0x1000f78 ] }; # 3 ༣ ཾ ླྀ
+    key <AE04> { [ 4, 0x1000f24, 0x1000f83, 0x1000f79 ] }; # 4 ༤ ྃ ཹ
+    key <AE05> { [ 5, 0x1000f25, 0x1000f37, 0x1000f81 ] }; # 5 ༥ ༷ �
+    key <AE06> { [ 6, 0x1000f26, 0x1000f35, 0x1000f09 ] }; # 6 ༦ ༵ ༉
+    key <AE07> { [ 7, 0x1000f27, 0x1000f7f, 0x1000f0a ] }; # 7 ༧ ཿ ༊
+    key <AE08> { [ 8, 0x1000f28, 0x1000f14, 0x1000f0f ] }; # 8 ༨ ༔ �
+    key <AE09> { [ 9, 0x1000f29, 0x1000f11, 0x1000f10 ] }; # 9 ༩ ༑ �
+    key <AE10> { [ 0, 0x1000f20, 0x1000f08, 0x1000f12 ] }; # 0 ༠ ༈ ༒
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/compose b/xorg-server/xkbdata.src/symbols/compose
new file mode 100644
index 000000000..72e92efc3
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/compose
@@ -0,0 +1,38 @@
+// $XKeyboardConfig$
+
+// $XFree86: xc/programs/xkbcomp/symbols/compose,v 1.1 2001/08/17 16:31:25 dawes Exp $
+    
+partial modifier_keys
+xkb_symbols "ralt" {
+    key <RALT>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "lwin" {
+    key <LWIN>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "rwin" {
+    key <RWIN>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "menu" {
+    key <MENU>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "rctrl" {
+    key <RCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "caps" {
+    key <CAPS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "102" {
+    key <LSGT> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/ctrl b/xorg-server/xkbdata.src/symbols/ctrl
new file mode 100644
index 000000000..ca3b8bdc1
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/ctrl
@@ -0,0 +1,41 @@
+// $XKeyboardConfig$
+
+// $XFree86: xc/programs/xkbcomp/symbols/ctrl,v 3.2 2003/10/24 20:38:20 tsi Exp $
+//
+// eliminate the caps lock key completely (replace with control)
+partial modifier_keys 
+xkb_symbols "nocaps" {
+    key <CAPS>	{  symbols[Group1]= [ Control_L, Control_L ] };
+    modifier_map  Control { <CAPS>, <LCTL> };
+};
+
+// swap the caps lock key with the left control key
+partial modifier_keys 
+xkb_symbols "swapcaps" {
+    key <CAPS>	{  symbols[Group1]= [ Control_L ] };
+    key <LCTL>	{  symbols[Group1]= [ Caps_Lock ] };
+};
+
+// moves the control key to the middle row and the caps lock
+// to the bottom row.  Only works if the geometry or keycodes
+// file has defined appropriate aliases for the keys in question.
+partial modifier_keys 
+xkb_symbols "ctrl_ac" {
+    key <AC00>	{  symbols[Group1]= [ Control_L ] };
+    key <AA00>	{  symbols[Group1]= [ Caps_Lock ] };
+};
+
+// Moves the control key to the bottom row and the caps lock
+// to the middle row.  Only works if the geometry or keycodes
+// file has defined appropriate aliases for the keys in question.
+partial modifier_keys 
+xkb_symbols "ctrl_aa" {
+    key <AA00>	{  symbols[Group1]= [ Control_L ] };
+    key <AC00>	{  symbols[Group1]= [ Caps_Lock ] };
+};
+
+// Right Ctrl works as Right Alt
+partial modifier_keys 
+xkb_symbols "ctrl_ra" {
+    key <RCTL>	{  symbols[Group1]= [ Alt_R ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/cz b/xorg-server/xkbdata.src/symbols/cz
new file mode 100644
index 000000000..cd2e09efe
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/cz
@@ -0,0 +1,144 @@
+// $XKeyboardConfig$
+// $XFree86: xc/programs/xkbcomp/symbols/cz,v 1.2 2002/11/22 04:02:22 dawes 
+// Exp $
+
+partial default 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 "latin"
+
+    name[Group1]= "Czechia";
+
+    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 ]	};
+
+    include "level3(ralt_switch)"
+};
+
+// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
+xkb_symbols "bksl" {
+    include "cz(basic)"
+    name[Group1]= "Czechia - With <\|> key";
+
+    key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "qwerty" {
+ 
+    // 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 "cz(basic)"
+    name[Group1]= "Czechia - qwerty";
+
+    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 "qwerty_bksl" {
+    include "cz(qwerty)"
+
+    name[Group1]= "Czechia - qwerty, extended Backslash";
+
+    key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
+};
+
+partial alphanumeric_keys alternate_group
+xkb_symbols "ucw" {
+
+    // This layout is usually used as the second group, it contains
+    // accented characters only, no 'latin' set.
+    // 2008 by Milan Vancura <mvancura@suse.cz>
+
+    name[Group1]= "Czechia - UCW layout (accented letters only)";
+
+    key <AB01> { [zcaron,      Zcaron      ] };
+    key <AB02> { [ssharp                   ] };
+    key <AB03> { [ccaron,      Ccaron      ] };
+    key <AB04> { [ccedilla,    Ccedilla    ] };
+    key <AB05> { [ntilde,      Ntilde      ] };
+    key <AB06> { [ncaron,      Ncaron      ] };
+    key <AB07> { [lacute,      Lacute      ] };
+
+    key <AC01> { [aacute,      Aacute      ] };
+    key <AC02> { [scaron,      Scaron      ] };
+    key <AC03> { [dcaron,      Dcaron      ] };
+    key <AC04> { [ediaeresis,  Ediaeresis  ] };
+    key <AC05> { [racute,      Racute      ] };
+    key <AC06> { [uacute,      Uacute      ] };
+    key <AC07> { [udiaeresis,  Udiaeresis  ] };
+    key <AC08> { [ocircumflex, Ocircumflex ] };
+    key <AC09> { [lcaron,      Lcaron      ] };
+
+    key <AD01> { [adiaeresis,  Adiaeresis  ] };
+    key <AD02> { [ecaron,      Ecaron      ] };
+    key <AD03> { [eacute,      Eacute      ] };
+    key <AD04> { [rcaron,      Rcaron      ] };
+    key <AD05> { [tcaron,      Tcaron      ] };
+    key <AD06> { [yacute,      Yacute      ] };
+    key <AD07> { [uring,       Uring       ] };
+    key <AD08> { [iacute,      Iacute      ] };
+    key <AD09> { [oacute,      Oacute      ] };
+    key <AD10> { [odiaeresis,  Odiaeresis  ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/de b/xorg-server/xkbdata.src/symbols/de
new file mode 100644
index 000000000..3674182dc
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/de
@@ -0,0 +1,356 @@
+
+// based on a keyboard map from an 'xkb/symbols/de' file
+//
+// $XKeyboardConfig$
+// $XFree86: xc/programs/xkbcomp/symbols/de,v 1.6 2003/09/08 13:12:51 pascal Exp $
+
+default
+xkb_symbols "basic" {
+
+    include "latin(type4)"
+
+    name[Group1]="Germany";
+
+    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
+    key <AE03>	{ [         3,    section, threesuperior,    sterling ]	};
+    key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};
+
+    key <AE11> {type[Group1]="FOUR_LEVEL_PLUS_LOCK",  symbols[Group1]=
+                  [ssharp, question, backslash, questiondown, 0x1001E9E ]};
+// The unicode capital letter sharp s U+1E9E is transformed to "SS"
+// to match the rules for capitalizing sharp s in german.
+// If the capital sharp s is needed, delete the line
+// starting with <U1E9C> from /usr/share/X11/locale/iso8859-15/Compose.
+// If both doubled S and capital sharp s are needed, use  0x1001E9E
+// for capital sharp s and some free unicode codepoint like 0x1001E9C
+// for doubled S. Don`t forget to change this in the Compose file, too.
+
+    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 ]	};
+
+    include "kpdl(comma)"
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // modify the basic German layout to not have any dead keys
+
+    include "de(basic)"
+    name[Group1]="Germany - Eliminate dead keys";
+
+    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,  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 basic German layout to have only acute and grave
+    // as dead keys (tilde and circumflex are needed as spacing characters
+    // in many programming languages)
+
+    include "de(basic)"
+    name[Group1]="Germany - Dead grave acute";
+
+    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 basic German layout to have only acute as
+    // dead keys (ASCII grave, tilde and circumflex are needed as
+    // spacing characters in many programming languages and text formatters)
+
+    include "de(deadgraveacute)"
+
+    name[Group1]="Germany - Dead acute";
+
+    key <AE12>	{ [dead_acute,      grave, dead_cedilla,  dead_ogonek ]	};
+    key <BKSL>	{ [numbersign, apostrophe,   dead_grave,   dead_grave ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "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 "de(basic)"
+
+    name[Group1]="Germany - Romanian keyboard with German letters";
+
+    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 "ro_nodeadkeys" {
+    // add romanian-specific letters to the German nodeadkeys layout.
+    // Read the comment for de_ro !
+
+    include "de(nodeadkeys)"
+    name[Group1]="Germany - Romanian keyboard with German letters, eliminate dead keys";
+
+    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       ] };
+};
+
+// German Dvorak keymap by Thorsten Staerk (www.staerk.de/thorsten)
+// Have acute and grave as dead keys, tilde and circumflex alive as they are needed 
+// in many programming languages.
+// to use this keymap, use a 105-key-keyboard and the command setxkbmap -model pc105 -layout dvorak -variant de
+// source: http://www-lehre.informatik.uni-osnabrueck.de/~rfreund/dvorak.php
+partial alphanumeric_keys 
+xkb_symbols "dvorak" {
+    include "us(dvorak)"
+
+    name[Group1]="Germany - Dvorak";
+
+    key <TLDE> { [ asciicircum, degree ] };
+
+    key <AE01> { [ 1, exclam, onesuperior ] };
+    key <AE02> { [ 2, quotedbl, twosuperior ] };
+    key <AE03> { [ 3, section, threesuperior ] };
+    key <AE04> { [ 4, dollar, bar ] };
+    key <AE05> { [ 5, percent, bar ] };
+    key <AE06> { [ 6, ampersand, brokenbar ] };
+    key <AE07> { [ 7, slash, braceleft ] };
+    key <AE08> { [ 8, parenleft, bracketleft ] };
+    key <AE09> { [ 9, parenright, bracketright ] };
+    key <AE10> { [ 0, equal, braceright ] };
+    key <AE11> { [ plus, asterisk, asciitilde ] };
+    key <AE12> { [ less, greater, dead_grave ] };
+
+    key <AD01> { [ udiaeresis, Udiaeresis, at ] };
+    key <AD02> { [ comma, semicolon, dead_diaeresis ] };
+    key <AD03> { [ period, colon ] };
+    key <AD08> { [ c, C, copyright, Cacute ] };
+    key <AD09> { [ t, T, trademark ] };
+    key <AD10> { [ z, Z, zabovedot, Zabovedot ] };
+    key <AD11> { [ question, ssharp ] };
+    key <AD12> { [ slash, backslash, dead_acute ] };
+
+    key <AC01> { [ a, A, at, aogonek ] };
+    key <AC02> { [ o, O, oacute, Oacute ] };
+    key <AC03> { [ e, E, EuroSign, eogonek ] };
+    key <AC04> { [ i, I ] };
+    key <AC05> { [ u, U ] };
+    key <AC06> { [ h, H ] };
+    key <AC07> { [ d, D ] };
+    key <AC08> { [ r, R, registered ] };
+    key <AC09> { [ n, N, nacute, Nacute ] };
+    key <AC10> { [ s, S, sacute, Sacute] };
+    key <AC11> { [ l, L, lstroke, Lstroke ] };
+
+    key <AB01> { [ odiaeresis, Odiaeresis ] };
+    key <AB02> { [ q, Q, at ] };
+    key <AB07> { [ m, M, mu ] };
+    key <AB10> { [ numbersign, apostrophe ] };
+
+    key <BKSL> { [ minus, underscore, hyphen, diaeresis] };
+
+    key <LSGT> { [ adiaeresis, Adiaeresis, bar ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    // For naming consistency
+
+    include "de(basic)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+
+    // For naming consistency
+
+    include "de(Sundeadkeys)"
+
+    name[Group1]="Germany - Sun dead keys";
+};
+
+
+// German NEO Eurokeys-Style
+// adopted 2004 by Hanno Behrens <Hanno.Behrens@gmx.de>
+// inspired by Dvorak/de-ergo  http://www.goebel-consult.de/de-ergo/
+
+partial alphanumeric_keys 
+xkb_symbols "neo" {
+
+    include "us(dvorak)"
+
+    name[Group1]= "Germany - Neostyle";
+
+    key <TLDE> { [ dead_circumflex, degree, notsign, paragraph	] };
+
+    key <AE01> { [	    1,	exclam, exclamdown, onesuperior	] };
+    key <AE02> { [	    2,	quotedbl,   dead_diaeresis, twosuperior ] };
+    key <AE03> { [	    3,	paragraph, sterling, threesuperior ] };
+    key <AE04> { [	    4,	dollar,    currency, onequarter	] };
+    key <AE05> { [	    5,	percent,    bar,	onehalf	] };
+    key <AE06> { [	    6,	ampersand,  brokenbar, threequarters ] };
+    key <AE07> { [	    7,	slash,      braceleft, division	] };
+    key <AE08> { [	    8,	parenleft,  bracketleft, guillemotleft ] };
+    key <AE09> { [	    9,	parenright, bracketright, guillemotright ] };
+    key <AE10> { [	    0,	equal,	    braceright		] };
+    key <AE11> { [	minus,	underscore, hyphen, diaeresis	 ] };
+    key <AE12> { [ dead_acute,dead_grave,   dead_cedilla, dead_ogonek  ] };
+
+    key <AD01> { [ 	    q,  Q,	at			 ] };
+    key <AD02> { [	    v,	V,	masculine, ordfeminine   ] };
+    key <AD03> { [	    l,	L,      lstroke, Lstroke	 ] };
+    key <AD04> { [	    c,	C,      ccedilla,copyright	 ] };
+    key <AD05> { [	    w,	W,	Greek_omega, Greek_OMEGA ] };
+    key <AD06> { [	    k,	K,	Greek_kappa, Greek_KAPPA ] };
+    key <AD07> { [	    h,	H,      Greek_epsilon, Greek_EPSILON ] };
+    key <AD08> { [	    g,	G, 	Greek_gamma, Greek_GAMMA ] };
+    key <AD09> { [	    f,	F,      ordfeminine		 ] };
+    key <AD10> { [	    j,	J,	Greek_iota, Greek_IOTA	 ] };
+    key <AD11> { [  ssharp, question, 	backslash, questiondown  ] };
+    key <AD12> { [	 plus,	asterisk,   dead_tilde,	plusminus ] };
+
+    key <AC01> { [	    u,	U,	Greek_delta, Greek_DELTA ] };
+    key <AC02> { [	    i,	I,      idotless, Iabovedot	 ] };
+    key <AC03> { [	    a,	A,      at, Greek_alpha		 ] };
+    key <AC04> { [	    e,	E,      EuroSign,	cent	 ] };
+    key <AC05> { [	    o,	O,	oslash,	Ooblique	 ] };
+    key <AC06> { [	    s,	S,      Greek_sigma, Greek_SIGMA ] };
+    key <AC07> { [	    n,	N,	Greek_nu, Greek_NU	 ] };
+    key <AC08> { [	    r,	R,      registered,trademark	 ] };
+    key <AC09> { [	    t,	T,      thorn,          THORN	 ] };	//Greek_theta, Greek_THETA/tcedilla, Tcedilla
+    key <AC10> { [	    d,	D,      eth,		ETH	 ] };
+    key <AC11> { [	    y,	Y,      yen			 ] };
+    key <BKSL> { [ numbersign, apostrophe, grave		 ] };
+
+    
+    key <LSGT> { [  less, greater, 	guillemotleft, guillemotright	] };
+    key <AB01> { [ odiaeresis, Odiaeresis, oe, OE		 ] };
+    key <AB02> { [ udiaeresis,Udiaeresis, apostrophe, asciitilde ] };  
+    key <AB03> { [ adiaeresis, Adiaeresis, ae, AE		 ] };
+    key <AB04> { [	    p,	P,      thorn,	THORN		 ] };
+    key <AB05> { [	    z,	Z,	Greek_zeta, Greek_ZETA	 ] };
+    key <AB06> { [	    b,	B,	Greek_beta, Greek_BETA	 ] };
+    key <AB07> { [	    m,	M,	mu, Greek_MU			 ] };
+    key <AB08> { [	comma,	semicolon, dead_cedilla, cedilla ] };
+    key <AB09> { [      period,	colon,  periodcentered		 ] };
+    key <AB10> { [	    x,	X,      multiply		 ] };
+
+    key <SPCE> { [	 space,	space, nobreakspace, nobreakspace ] };
+
+    
+    // End "Editing" section, begin "Keypad"
+//    key <NMLK> {	[  Num_Lock, Pointer_EnableKeys		]	};
+
+// Ungrab cancels server/keyboard/pointer grabs
+//    key <KPDV> {  [KP_Divide, KP_Divide, division]  };
+
+// ClsGrb kills whichever client has a grab in effect
+//    key <KPMU> {  [KP_Multiply, KP_Multiply, periodcentered]  };
+
+// -VMode switches to the previous video mode
+//    key <KPSU> { [ KP_Subtract, KP_Subtract, notsign]   };
+
+    key  <KP7> {	[  KP_Home,	KP_7, seveneighths, oneeighth	]	};
+    key  <KP8> {	[  KP_Up,	KP_8, uparrow, fiveeighths	]	};
+    key  <KP9> {	[  KP_Prior,	KP_9, threeeighths, threeeighths ]	};
+
+// +VMode switches to the next video mode
+//    key <KPAD> {	[  KP_Add, KP_Add, plusminus ]    };
+
+    key  <KP4> {	[  KP_Left,	KP_4, leftarrow, onequarter		]	};
+    key  <KP5> {	[  KP_Begin,	KP_5, dagger, onehalf 			]	};
+    key  <KP6> {	[  KP_Right,	KP_6, rightarrow, threequarters	]	};
+
+    key  <KP1> {	[  KP_End,	KP_1, onesuperior, onesuperior		]	};
+    key  <KP2> {	[  KP_Down,	KP_2, downarrow, twosuperior		]	};
+    key  <KP3> {	[  KP_Next,	KP_3, threesuperior, threesuperior	]	};
+    key <KPEN> {	[  	KP_Enter	]	};
+    key <KPEQ> {	[  	KP_Equal	]	};
+
+    key  <KP0> {	[  KP_Insert,	KP_0, percent, degree			]	};
+    key <KPDL> {  	[  KP_Delete,	KP_Decimal, periodcentered, comma  ]	};
+    // End "Keypad" section
+
+    include "level3(ralt_switch)"
+};
+ 
+// Copied from macintosh_vndr/de
+// olh@suse.de   very close to MacOS map
+
+partial alphanumeric_keys 
+xkb_symbols "mac" {
+
+    include "de"
+    name[Group1]= "Germany - Macintosh";
+
+    // Alphanumeric section
+    key <AE01>	{ [         1,     exclam,   exclamdown,           at ]	};
+    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 <AD01>	{ [         q,          Q, guillemotleft, guillemotright ]	};
+    key <AD04>	{ [         r,          R,   registered       ]	};
+    key <AD07>	{ [         u,          U,    diaeresis,       Aacute ]	};
+    key <AD08>	{ [         i,          I,        slash,  Ucircumflex ]	};
+    key <AD11>	{ [ udiaeresis, Udiaeresis, periodcentered,    degree ]	};
+    key <AD12>	{ [      plus,   asterisk,   asciitilde       ]	}; 
+    key <AC01>	{ [         a,          A,        aring,        Aring ]	};
+    key <AC05>	{ [         g,          G,    copyright       ]	};
+    key <AC06>	{ [         h,          H,  ordfeminine       ]	};
+    key <AC09>	{ [         l,          L,           at       ]	};
+    key <AC10>	{ [ odiaeresis, Odiaeresis,  dead_acute       ]	};
+    key <AB06>	{ [         n,          N,   asciitilde       ]	};
+
+};
+
+partial alphanumeric_keys 
+xkb_symbols "mac_nodeadkeys" {
+    // modify the standard German mac layout to not have any dead keys
+    include "de(mac)"
+    name[Group1]= "Germany - Macintosh, eliminate dead keys";
+    key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};
+
+    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/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.am
new file mode 100644
index 000000000..063fc8d57
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.am
@@ -0,0 +1,5 @@
+symbolsdir = $(xkb_base)/symbols/digital_vndr
+
+dist_symbols_DATA = \
+lk pc us \
+vt
diff --git a/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in
new file mode 100644
index 000000000..38a6a7ecb
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in
@@ -0,0 +1,368 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = symbols/digital_vndr
+DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(symbolsdir)"
+dist_symbolsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_symbols_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+symbolsdir = $(xkb_base)/symbols/digital_vndr
+dist_symbols_DATA = \
+lk pc us \
+vt
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/digital_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  symbols/digital_vndr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_symbolsDATA: $(dist_symbols_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_symbolsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  $(dist_symbolsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+
+uninstall-dist_symbolsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(symbolsdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_symbolsDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_symbolsDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_symbolsDATA uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/symbols/digital_vndr/lk b/xorg-server/xkbdata.src/symbols/digital_vndr/lk
new file mode 100644
index 000000000..4d311c7e5
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/lk(common)"
+    key <RALT>              { [ Alt_R,      Meta_R          ] };
+    key <LCMP>              { [ Multi_key                   ] };
+    key <RCMP>              { [ Multi_key                   ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/digital_vndr/pc b/xorg-server/xkbdata.src/symbols/digital_vndr/pc
new file mode 100644
index 000000000..b1faec03c
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_ALT_LEVEL2",
+	symbols[Group1]= [	     Print,	    Sys_Req ]
+    };
+    key <SCLK> {       [     Scroll_Lock ] };
+    key <PAUS> {
+	type= "PC_CONTROL_LEVEL2",
+	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_vndr/pc(pc)"
+
+    replace key <LALT> {       [       Alt_L ] };
+    key	<LWIN> {       [	 Meta_L ] };
+    key	<RWIN> {       [	 Meta_R ] };
+    key	<MENU> {       [	 Menu   ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/digital_vndr/us b/xorg-server/xkbdata.src/symbols/digital_vndr/us
new file mode 100644
index 000000000..7e1131a63
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/us(us)"
+    include "digital_vndr/vt(vt105)"
+    override key <AE03> { 
+	symbols[Group1]= [ 3, numbersign ],
+	symbols[Group2]= [ sterling ]
+    };
+    key <AB00> {       [	     less,	  greater ] };
+};
+
+xkb_symbols "vt105-dp" { include "digital_vndr/us(vt105-tw)" };
+xkb_symbols "vt105"    { include "digital_vndr/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_vndr/us(us)"
+    include "digital_vndr/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_vndr/us(vt108-tw)" };
+xkb_symbols "vt108"    { include "digital_vndr/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_vndr/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_vndr/pc(pc)"
+    include "digital_vndr/us(us)"
+    replace key <RALT> { [ Alt_R, Meta_R ] };
+};
+
+xkb_symbols "pcxal"   { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "pcxalaa" { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "pcxalfa" { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "pcxalka" { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "lk44x"   { include "digital_vndr/us(pcxalga)" };
+
+// **************************************************************
+// *								*
+// * The "pc104" layouts.					*
+// *								*
+// **************************************************************
+xkb_symbols "pc104" {
+    include "digital_vndr/pc(pc104)"
+    include "digital_vndr/us(us)"
+    replace key <RALT> { [ Alt_R ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/digital_vndr/vt b/xorg-server/xkbdata.src/symbols/digital_vndr/vt
new file mode 100644
index 000000000..483f1debe
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/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/xorg-server/xkbdata.src/symbols/dk b/xorg-server/xkbdata.src/symbols/dk
new file mode 100644
index 000000000..16223e9a5
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/dk
@@ -0,0 +1,77 @@
+
+// based on a keyboard map from an 'xkb/symbols/dk' file
+//
+// $XKeyboardConfig$
+// $XFree86: xc/programs/xkbcomp/symbols/dk,v 1.3 2002/12/19 01:07:56 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin(type2)"
+
+    name[Group1]="Denmark";
+
+    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 ]	};
+
+    include "kpdl(comma)"
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    include "dk(basic)"
+
+    name[Group1]="Denmark - Eliminate dead keys";
+
+    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 ]	};
+
+};
+
+// Copied from macintosh_vndr/dk
+partial alphanumeric_keys 
+xkb_symbols "mac" {
+
+    include "dk"
+    name[Group1]= "Denmark - Macintosh";
+
+    key <SPCE>	{ [    space,       space, nobreakspace, nobreakspace ]	};
+    key <AB10>	{ [    minus,  underscore,       hyphen,       macron ]	};
+    include "kpdl(dot)"
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "mac_nodeadkeys" {
+    include "dk(mac)"
+    name[Group1]= "Denmark - Macintosh, eliminate dead keys";
+
+    key <AE12>	{ [    acute,       grave,          bar,       ogonek ]	};
+    key <AD12>	{ [diaeresis, asciicircum,   asciitilde,  dead_macron ]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "dvorak" {
+    include "no(dvorak)"
+
+    name[Group1]= "Denmark - Dvorak";
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/ee b/xorg-server/xkbdata.src/symbols/ee
new file mode 100644
index 000000000..e55f20e27
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/ee
@@ -0,0 +1,103 @@
+// $XKeyboardConfig$
+
+// based on
+// Estonian XKB-keymap by Ville Hallik <ville@linux.ee>
+//
+// $XFree86: xc/programs/xkbcomp/symbols/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 "latin(type4)"
+
+    name[Group1]="Estonia";
+
+    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 <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)"
+    include "eurosign(e)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic Estonian layout to eliminate all dead keys
+
+    include "ee(basic)"
+    name[Group1]="Estonia - Eliminate dead keys";
+
+    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 ]	};
+};
+
+// Dvorak with Estonian characters
+partial alphanumeric_keys
+xkb_symbols "dvorak" {
+   include "us(dvorak)"
+   name[Group1]= "Estonia - Dvorak";
+   
+    key <AE03>	{ [         3, numbersign,   sterling ]	};
+    key <AE04>	{ [         4,     dollar,    section,   currency ]	};
+    key <AE08>	{ [         8,   asterisk,    onehalf ]	};
+
+    key <AC01>	{ [         a,          A, adiaeresis, Adiaeresis ]	};
+    key <AC02>	{ [         o,          O,     otilde,     Otilde ]	};
+    key <AC03>	{ [         e,          E, odiaeresis, Odiaeresis ]	};
+    key <AC04>	{ [         u,          U, udiaeresis, Udiaeresis ]	};
+    key <AC10>	{ [         s,          S,     scaron,     Scaron ]	};   
+    key <AB10>	{ [         z,          Z,     zcaron,     Zcaron ]	};
+
+    include "level3(ralt_switch)"
+    include "kpdl(comma)"
+    include "eurosign(5)"
+};
+
+// Estonian few characters on basic US keymap.
+// by Elan Ruusamäe <glen@delfi.ee>
+partial alphanumeric_keys
+xkb_symbols "us" {
+    include "us(euro)"
+    name[Group1] = "Estonia - US keyboard with Estonian letters";
+
+    // ž, Ž
+    key <AB01>	{ [           z,  Z,          zcaron,     Zcaron     ]	};
+    // ¢
+    key <AB03>	{ [           c,  C,          cent,       cent       ]	};
+    // Å¡, Å 
+    key <AC02>	{ [           s,  S,          scaron,     Scaron     ]	};
+    key <AC10>	{ [ semicolon,    colon,      odiaeresis, Odiaeresis ]	};
+    key <AC11>	{ [ quoteright,   quotedbl,   adiaeresis, Adiaeresis ]	};
+    key <AD11>	{ [ bracketleft,  braceleft,  udiaeresis, Udiaeresis ]	};
+    key <AD12>	{ [ bracketright, braceright, otilde,     Otilde     ]	};
+    // £
+    key <AE03>	{ [           3,  numbersign, sterling,   sterling   ]	};
+
+    include "level3(ralt_switch)"
+    include "eurosign(e)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/epo b/xorg-server/xkbdata.src/symbols/epo
new file mode 100644
index 000000000..a1c9c6098
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/epo
@@ -0,0 +1,115 @@
+// $XKeyboardConfig$
+
+// Esperanto keyboard maps -- "Ekverto"
+//
+// Ekverto A ("legacy") (2004-01-10)
+// Chusslove Illich (Ĉaslavo Iliĉo) <caslav.ilic@gmx.net>
+//
+// Ekverto B ("basic") (2006-12-02)
+// Benno Schulenberg (Beno Sĥilenberĥ) <bensberg@justemail.net>
+// Chusslove Illich (Ĉaslavo Iliĉo) <caslav.ilic@gmx.net>
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+  name[Group1]= "Esperanto";
+
+  include "us(basic)"
+
+  key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
+
+  key <AD01>  { [ scircumflex,  Scircumflex,  q,             Q          ] };
+  key <AD02>  { [ gcircumflex,  Gcircumflex,  w,             W          ] };
+  key <AB02>  { [ ccircumflex,  Ccircumflex,  x,             X          ] };
+  key <AD06>  { [ ubreve,       Ubreve,       y,             Y          ] };
+
+  key.type[Group1] = "FOUR_LEVEL_SEMIALPHABETIC";
+
+  key <AD11>  { [ jcircumflex,  Jcircumflex,  bracketleft,   braceleft  ] };
+  key <AD12>  { [ hcircumflex,  Hcircumflex,  bracketright,  braceright ] };
+
+  key <AD09>  { [ o,            O,            braceleft,     braceleft  ] };
+  key <AD10>  { [ p,            P,            braceright,    braceright ] };
+
+  key <AC01>  { [ a,            A,     leftsinglequotemark,  NoSymbol   ] };
+  key <AC02>  { [ s,            S,    rightsinglequotemark,  NoSymbol   ] };
+  key <AC03>  { [ d,            D,     leftdoublequotemark,  NoSymbol   ] };
+  key <AC04>  { [ f,            F,    rightdoublequotemark,  NoSymbol   ] };
+
+  key <AB06>  { [ n,            N,            endash,        endash     ] };
+  key <AB07>  { [ m,            M,            emdash,        emdash     ] };
+
+  key.type[Group1] = "FOUR_LEVEL";
+
+  key <AE05>  { [ 5,            percent,      EuroSign,      EuroSign   ] };
+
+  include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "legacy" {
+
+  name[Group1]= "Esperanto - displaced semicolon and quote (obsolete)";
+
+  key.type[Group1] = "FOUR_LEVEL";
+
+  key <TLDE>  { [ grave,         asciitilde,  NoSymbol,  NoSymbol ] };
+  key <AE01>  { [ 1,             exclam,      NoSymbol,  NoSymbol ] };
+  key <AE02>  { [ 2,             quotedbl,    NoSymbol,  NoSymbol ] };
+  key <AE03>  { [ 3,             numbersign,  NoSymbol,  NoSymbol ] };
+  key <AE04>  { [ 4,             dollar,      NoSymbol,  NoSymbol ] };
+  key <AE05>  { [ 5,             percent,     NoSymbol,  NoSymbol ] };
+  key <AE06>  { [ 6,             apostrophe,  NoSymbol,  NoSymbol ] };
+  key <AE07>  { [ 7,             ampersand,   NoSymbol,  NoSymbol ] };
+  key <AE08>  { [ 8,             asterisk,    NoSymbol,  NoSymbol ] };
+  key <AE09>  { [ 9,             parenleft,   NoSymbol,  NoSymbol ] };
+  key <AE10>  { [ 0,             parenright,  NoSymbol,  NoSymbol ] };
+  key <AE11>  { [ minus,         underscore,  NoSymbol,  NoSymbol ] };
+  key <AE12>  { [ equal,         plus,        NoSymbol,  NoSymbol ] };
+
+  key <AB08>  { [ comma,         semicolon,   NoSymbol,  NoSymbol ] };
+  key <AB09>  { [ period,        colon,       NoSymbol,  NoSymbol ] };
+  key <AB10>  { [ slash,         question,    NoSymbol,  NoSymbol ] };
+
+  key <AD11>  { [ bracketleft,   braceleft,   NoSymbol,  NoSymbol ] };
+  key <AD12>  { [ bracketright,  braceright,  NoSymbol,  NoSymbol ] };
+
+  key <BKSL>  { [ backslash,     bar,         NoSymbol,  NoSymbol ] };
+  key <LSGT>  { [ NoSymbol,      NoSymbol,    NoSymbol,  NoSymbol ] };
+
+  key.type[Group1] = "FOUR_LEVEL_SEMIALPHABETIC";
+
+  key <AD01>  { [ scircumflex,  Scircumflex,  at,                    NoSymbol ] };
+  key <AD02>  { [ jcircumflex,  Jcircumflex,  asciicircum,           NoSymbol ] };
+  key <AD03>  { [ e,            E,            EuroSign,              NoSymbol ] };
+  key <AD04>  { [ r,            R,            emdash,                NoSymbol ] };
+  key <AD05>  { [ t,            T,            endash,                NoSymbol ] };
+  key <AD06>  { [ gcircumflex,  Gcircumflex,  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 <AC01>  { [ a,            A,            less,                  NoSymbol ] };
+  key <AC02>  { [ s,            S,            greater,               NoSymbol ] };
+  key <AC03>  { [ d,            D,            leftdoublequotemark,   NoSymbol ] };
+  key <AC04>  { [ f,            F,            rightdoublequotemark,  NoSymbol ] };
+  key <AC05>  { [ g,            G,            NoSymbol,              NoSymbol ] };
+  key <AC06>  { [ h,            H,            NoSymbol,              NoSymbol ] };
+  key <AC07>  { [ j,            J,            NoSymbol,              NoSymbol ] };
+  key <AC08>  { [ k,            K,            NoSymbol,              NoSymbol ] };
+  key <AC09>  { [ l,            L,            NoSymbol,              NoSymbol ] };
+  key <AC10>  { [ ubreve,       Ubreve,       NoSymbol,              NoSymbol ] };
+  key <AC11>  { [ hcircumflex,  Hcircumflex,  NoSymbol,              NoSymbol ] };
+
+  key <AB01>  { [ z,            Z,            leftsinglequotemark,   NoSymbol ] };
+  key <AB02>  { [ ccircumflex,  Ccircumflex,  rightsinglequotemark,  NoSymbol ] };
+  key <AB03>  { [ c,            C,            NoSymbol,              NoSymbol ] };
+  key <AB04>  { [ v,            V,            NoSymbol,              NoSymbol ] };
+  key <AB05>  { [ b,            B,            NoSymbol,              NoSymbol ] };
+  key <AB06>  { [ n,            N,            NoSymbol,              NoSymbol ] };
+  key <AB07>  { [ m,            M,            NoSymbol,              NoSymbol ] };
+
+  include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/es b/xorg-server/xkbdata.src/symbols/es
new file mode 100644
index 000000000..404e6db61
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/es
@@ -0,0 +1,195 @@
+// $XKeyboardConfig$
+
+// based on a keyboard
+// Modified for a real Spanish Keyboard by Jon Tombs
+//
+// $XFree86: xc/programs/xkbcomp/symbols/es,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin(type4)"
+
+    name[Group1]="Spain";
+
+    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)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    include "es(basic)"
+
+    key <AC11>	{ [SunFA_Acute, SunFA_Diaeresis, braceleft, braceleft ]	};
+    key <AD11>	{ [SunFA_Grave, SunFA_Circum, bracketleft, dead_abovering ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+
+    include "es(Sundeadkeys)"
+
+    name[Group1]="Spain - Sun dead keys";
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    include "es(basic)"
+
+    name[Group1]="Spain - Eliminate dead keys";
+
+    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 ]	};
+};
+
+// Spanish mapping (note R-H exchange)
+partial alphanumeric_keys
+xkb_symbols "dvorak" {
+
+    name[Group1]="Spain - Dvorak";
+
+    // Alphanumeric section
+    key <TLDE> {[  masculine, ordfeminine, backslash, degree		]};
+    key <AE01> {[          1, exclam, bar, onesuperior			]};
+    key <AE02> {[          2, quotedbl, at, twosuperior			]};
+    key <AE03> {[          3, periodcentered, numbersign, threesuperior	]};
+    key <AE04> {[          4, dollar, asciitilde, onequarter		]};
+    key <AE05> {[          5, percent, brokenbar, fiveeighths		]};
+    key <AE06> {[          6, ampersand, notsign, threequarters		]};
+    key <AE07> {[          7, slash, onehalf, seveneighths		]};
+    key <AE08> {[          8, parenleft, oneeighth, threeeighths	]};
+    key <AE09> {[          9, parenright, asciicircum			]};
+    key <AE10> {[          0, equal, grave, dead_doubleacute		]};
+    key <AE11> {[ apostrophe, question, dead_macron, dead_ogonek	]};
+    key <AE12> {[ exclamdown, questiondown, dead_breve, dead_abovedot	]};
+
+    key <AD01> {[     period, colon					]};
+    key <AD02> {[      comma, semicolon					]};
+    key <AD03> {[     ntilde, Ntilde, lstroke, Lstroke			]};
+    key <AD04> {[          p, P, paragraph				]};
+    key <AD05> {[          y, Y, yen					]};
+    key <AD06> {[          f, F, tslash, Tslash				]};
+    key <AD07> {[          g, G, dstroke, Dstroke			]};
+    key <AD08> {[          c, C, cent, copyright			]};
+    key <AD09> {[          h, H, hstroke, Hstroke			]};
+    key <AD10> {[          l, L, sterling				]};
+    key <AD11> {[ dead_grave, dead_circumflex, bracketleft, dead_caron	]};
+    key <AD12> {[       plus, asterisk, bracketright, plusminus		]};
+
+    key <AC01> {[          a, A, ae, AE					]};
+    key <AC02> {[          o, O, oslash, Oslash				]};
+    key <AC03> {[          e, E, EuroSign				]};
+    key <AC04> {[          u, U, aring, Aring				]};
+    key <AC05> {[          i, I, oe, OE					]};
+    key <AC06> {[          d, D, eth, ETH				]};
+    key <AC07> {[          r, R, registered, trademark			]};
+    key <AC08> {[          t, T, thorn, THORN				]};
+    key <AC09> {[          n, N, eng, ENG				]};
+    key <AC10> {[          s, S, ssharp, section			]};
+    key <AC11> {[ dead_acute, dead_diaeresis, braceleft, dead_tilde	]};
+    key <BKSL> {[   ccedilla, Ccedilla, braceright, dead_cedilla	]};
+
+    key <LSGT> {[       less, greater, guillemotleft, guillemotright	]};
+    key <AB01> {[      minus, underscore, hyphen, macron		]};
+    key <AB02> {[          q, Q, currency				]};
+    key <AB03> {[          j, J						]};
+    key <AB04> {[          k, K, kra					]};
+    key <AB05> {[          x, X, multiply, division			]};
+    key <AB06> {[          b, B						]};
+    key <AB07> {[          m, M, mu					]};
+    key <AB08> {[          w, W						]};
+    key <AB09> {[          v, V						]};
+    key <AB10> {[          z, Z						]};
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "cat" {
+
+    include "es(basic)"
+
+    name[Group1]="Spain - Catalan variant with middle-dot L";
+
+    key <AC09>  { [	    l,      L,		0x1000140,  0x100013F ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "ast" {
+
+    include "es(basic)"
+
+    name[Group1]="Spain - Asturian variant with bottom-dot H and bottom-dot L";
+
+    key <AC06>  { [	    h,      H,		0x1001E25,  0x1001E24 ] };
+    key <AC09>  { [	    l,      L,		0x1001E37,  0x1001E36 ] };
+};
+
+// Copied from macintosh_vndr/es
+partial alphanumeric_keys 
+xkb_symbols "mac" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple Spanish keybaord
+
+    include "es"
+    name[Group1]= "Spain - Macintosh";
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+    include "us(basic)"
+    name[Group1]="Spain";
+
+    key <TLDE> { [    masculine,    ordfeminine      ] };
+    key <AE01> { [            1,         exclam,             bar ] };
+    key <AE02> { [            2,       quotedbl,              at ] };
+    key <AE03> { [            3,     dead_grave,      numbersign,   grave           ] };
+    key <AE05> { [            5,        percent,     asciicircum,   dead_circumflex ] };
+    key <AE06> { [            6,      ampersand,         notsign ] };
+    key <AE07> { [            7,          slash,       backslash ] };
+    key <AE08> { [            8,      parenleft                         ] };
+    key <AE09> { [            9,     parenright                         ] };
+    key <AE10> { [            0,          equal                  ] };
+    key <AE11> { [   apostrophe,       question                  ] };
+    key <AE12> { [   exclamdown,   questiondown                  ] };
+
+    key <AD03> { [            e,              E,        EuroSign ] };
+    key <AD11> { [   dead_acute, dead_diaeresis,           acute,   dead_abovering  ] };
+    key <AD12> { [  bracketleft,      braceleft                  ] };
+
+    key <AC10> { [       ntilde,        Ntilde                  ] };
+    key <AC11> { [         plus,       asterisk,      dead_tilde ] };
+    key <BKSL> { [ bracketright,     braceright                  ] };
+
+    key <AB08> { [        comma,      semicolon                  ] };
+    key <AB09> { [       period,          colon                  ] };
+    key <AB10> { [        minus,     underscore                  ] };
+  
+    key <I219> { [         less,        greater,  ISO_Next_Group ] };
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/et b/xorg-server/xkbdata.src/symbols/et
new file mode 100644
index 000000000..e6d1ba722
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/et
@@ -0,0 +1,75 @@
+// $XKeyboardConfig$
+
+//
+// Ethiopia
+// Designed as a part of OLPC project
+//
+// 2007 Sergey Udaltsov <svu@gnome.org>
+//
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    include "et(olpc)"
+    name[Group1]="Ethiopia";
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+    name[Group1]="Ethiopia";
+
+    key <AE01>	{ [        0x01001369,  0x01001372 ] }; // 1
+    key <AE02>	{ [        0x0100136a,  0x01001373 ] }; // 2
+    key <AE03>	{ [        0x0100136b,  0x01001374 ] }; // 3 
+    key <AE04>	{ [        0x0100136c,  0x01001375 ] }; // 4
+    key <AE05>	{ [        0x0100136d,  0x01001376 ] }; // 5
+    key <AE06>	{ [        0x0100136e,  0x01001377 ] }; // 6
+    key <AE07>	{ [        0x0100136f,  0x01001378 ] }; // 7
+    key <AE08>	{ [        0x01001370,  0x01001379 ] }; // 8
+    key <AE09>	{ [        0x01001371,  0x0100137a ] }; // 9
+    key <AE10>	{ [        0x0100137b,  0x0100137c ] }; // 0
+    key <AE11>	{ [        minus,       underscore ] }; // -_
+    key <AE12>	{ [        equal,       plus       ] }; // =+
+
+    key <AD01>	{ [        0x01001240,  0x01001250 ]	}; // q
+    key <AD02>	{ [        0x010012C8,  VoidSymbol ]	}; // w
+    key <AD03>	{ [        e,           E          ]	}; // e
+    key <AD04>	{ [        0x01001228,  VoidSymbol ]	}; // r
+    key <AD05>	{ [        0x01001270,  0x01001320 ]	}; // t
+    key <AD06>	{ [        0x010012E8,  VoidSymbol ]	}; // y
+    key <AD07>	{ [        u,           U          ]	}; // u
+    key <AD08>	{ [        i,           I          ]	}; // i
+    key <AD09>	{ [        o,           O          ]	}; // o
+    key <AD10>	{ [        0x01001350,  0x01001330 ]	}; // p
+    key <AD11>	{ [        0x01001340,  0x01001338 ]	}; // [
+    key <AD12>	{ [        0x01001328,  0x01001280 ]	}; // ]
+
+    key <AC01>	{ [        a,           A          ]	}; // a
+    key <AC02>	{ [        0x01001230,  0x01001220 ]	}; // s
+    key <AC03>	{ [        0x010012F0,  0x010012F8 ]	}; // d
+    key <AC04>	{ [        0x01001348,  VoidSymbol ]	}; // f
+    key <AC05>	{ [        0x01001308,  0x01001318 ]	}; // g
+    key <AC06>	{ [        0x01001200,  0x01001210 ]	}; // h
+    key <AC07>	{ [        0x01001300,  VoidSymbol ]	}; // j
+    key <AC08>	{ [        0x010012A8,  0x010012B8 ]	}; // k
+    key <AC09>	{ [        0x01001208,  VoidSymbol ]	}; // l
+
+    key <AC10>	{ [        0x01001362,  0x01001361 ]	}; // :;
+    key <AC11>	{ [        apostrophe,  quotedbl   ]	}; // '"
+
+    key <AB01>	{ [        0x010012D8,  0x010012E0 ]	}; // z
+    key <AB02>	{ [        0x010012A0,  0x010012D0 ]	}; // x
+    key <AB03>	{ [        c,           C          ]	}; // c
+    key <AB04>	{ [        0x01001238,  0x01001268 ]	}; // v
+    key <AB05>	{ [        0x01001260,  VoidSymbol ]	}; // b
+    key <AB06>	{ [        0x01001290,  0x01001298 ]	}; // n
+    key <AB07>	{ [        0x01001218,  VoidSymbol ]	}; // m
+
+    key <AB08>	{ [        0x01001363,  VoidSymbol ]	}; // <
+    key <AB09>	{ [        0x01001364,  VoidSymbol ]	}; // >
+    key <AB10>  { [        VoidSymbol,  question   ]    }; // ?
+
+    key <BKSL> {  [        backslash,   VoidSymbol ]    }; // bksl
+
+    include "group(olpc)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/eurosign b/xorg-server/xkbdata.src/symbols/eurosign
new file mode 100644
index 000000000..9458cea33
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/eurosign
@@ -0,0 +1,26 @@
+// $XKeyboardConfig$
+
+// Most keyboards have the EuroSign engraved on the E key
+partial
+xkb_symbols "e" {
+    key <AD03>	{ [  NoSymbol,   NoSymbol,   EuroSign ]	};
+};
+
+// Many Apple keyboards have the EuroSign engraved on the 2 key
+partial
+xkb_symbols "2" {
+    key <AE02>	{ [  NoSymbol,   NoSymbol,   EuroSign ]	};
+};
+
+// Some keyboards have the EuroSign engraved on the 4 key
+partial
+xkb_symbols "4" {
+    key <AE04>	{ [  NoSymbol,   NoSymbol,   EuroSign ]	};
+};
+
+// Many keyboards have the EuroSign engraved on the 5 key
+partial
+xkb_symbols "5" {
+    key <AE05>	{ [  NoSymbol,   NoSymbol,   EuroSign ]	};
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/fi b/xorg-server/xkbdata.src/symbols/fi
new file mode 100644
index 000000000..4fffb833d
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/fi
@@ -0,0 +1,205 @@
+// based on a keyboard map from an 'xkb/symbols/fi' file
+//
+// $XKeyboardConfig$
+// $XFree86: xc/programs/xkbcomp/symbols/fi,v 1.9 2003/01/29 17:17:31 dawes Exp $
+
+// Troy Korjuslommi, 
+// Jan 6, 2006,
+// May 5, 2006.
+// May 6, 2006.
+// May 12, 2006.
+// Oct 10, 2007.
+// 
+// Oct 10, 2007.
+// -Changed space column 3 to nobreakspace (from space).
+// -Changed UFE63 entries to dead_stroke.
+// 
+// Nov 29, 2006.
+// UFE63 can be changed to dead_stroke starting with version 7.0.7. of the X server.
+//
+// Dec 05, 2006.
+// Changed instances of NoSymbol in columns 3 and 4 to characters in columns 1 and 2.
+// This fixes a bug where the mappings couldn't be changed (with xmodmap for example).
+// NoSymbol left in other positions, so nothing is output from those key presses.
+//
+// Dec 11, 2006.
+// Changed all Uxxxx values to named versions.
+// If you have problems, check these defines (when compiling X):
+// XK_LATIN9: oe, OE.
+// XK_CURRENCY: EuroSign.
+// XK_LATIN2: caron.
+// XK_LATIN3: idotless.
+// XK_LATIN4: kra, eng, ENG.
+// XK_CAUCASUS: schwa, SCHWA.
+// XK_PUBLISHING: rightdoublequotemark, leftdoublequotemark, singlelowquotemark, doublelowquotemark, emdash,
+//                rightsinglequotemark, leftsinglequotemark, endash.
+// 
+// Unnamed positions: 
+// UFE63: dead_stroke. Will be fixed, once the entry is in keysymdef.h.
+// U0292: LATIN SMALL LETTER EZH. 
+// U01B7: LATIN CAPITAL LETTER EZH.
+// U2030: PER MILLE SIGN.
+//        Comment: XK_MillSign is U+20A5 MILL SIGN. 
+//                 Per mille is a generic term for 1/1000. Mill is 1/1000 of a dollar.
+// 
+
+partial default alphanumeric_keys
+xkb_symbols "kotoistus" {
+
+    name[Group1]="Finland";
+
+    key <TLDE> { [  section,         onehalf,          dead_stroke,          NoSymbol             ] };
+    key <AE01> { [  1,               exclam,           NoSymbol,             exclamdown           ] };
+    key <AE02> { [  2,               quotedbl,         at,                   rightdoublequotemark ] };
+    key <AE03> { [  3,               numbersign,       sterling,             guillemotright       ] };
+    key <AE04> { [  4,               currency,         dollar,               guillemotleft        ] };
+    key <AE05> { [  5,               percent,          U2030,                leftdoublequotemark  ] };
+    key <AE06> { [  6,               ampersand,        singlelowquotemark,   doublelowquotemark   ] };
+    key <AE07> { [  7,               slash,            braceleft,            NoSymbol             ] };
+    key <AE08> { [  8,               parenleft,        bracketleft,          NoSymbol             ] };
+    key <AE09> { [  9,               parenright,       bracketright,         NoSymbol             ] };
+    key <AE10> { [  0,               equal,            braceright,           degree               ] };
+    key <AE11> { [  plus,            question,         backslash,            questiondown         ] };
+    key <AE12> { [  dead_acute,      dead_grave,       dead_cedilla,         dead_ogonek          ] };
+    key <AD01> { [  q,               Q,                q,                    Q                    ] };
+    key <AD02> { [  w,               W,                w,                    W                    ] };
+    key <AD03> { [  e,               E,                EuroSign,             NoSymbol             ] };
+    key <AD04> { [  r,               R,                r,                    R                    ] };
+    key <AD05> { [  t,               T,                thorn,                THORN                ] };
+    key <AD06> { [  y,               Y,                y,                    Y                    ] };
+    key <AD07> { [  u,               U,                u,                    U                    ] };
+    key <AD08> { [  i,               I,                idotless,             NoSymbol             ] };
+    key <AD09> { [  o,               O,                oe,                   OE                   ] };
+    key <AD10> { [  p,               P,                dead_horn,            dead_hook            ] };
+    key <AD11> { [  aring,           Aring,            dead_doubleacute,     dead_abovering       ] };
+    key <AD12> { [  dead_diaeresis,  dead_circumflex,  dead_tilde,           dead_macron          ] };
+    key <AC01> { [  a,               A,                schwa,                SCHWA                ] };
+    key <AC02> { [  s,               S,                ssharp,               NoSymbol             ] };
+    key <AC03> { [  d,               D,                eth,                  ETH                  ] };
+    key <AC04> { [  f,               F,                f,                    F                    ] };
+    key <AC05> { [  g,               G,                g,                    G                    ] };
+    key <AC06> { [  h,               H,                h,                    H                    ] };
+    key <AC07> { [  j,               J,                j,                    J                    ] };
+    key <AC08> { [  k,               K,                kra,                  NoSymbol             ] };
+    key <AC09> { [  l,               L,                dead_stroke,          NoSymbol             ] };
+    key <AC10> { [  odiaeresis,      Odiaeresis,       oslash,               Ooblique             ] };
+    key <AC11> { [  adiaeresis,      Adiaeresis,       ae,                   AE                   ] };
+    key <BKSL> { [  apostrophe,      asterisk,         dead_caron,           dead_breve           ] };
+    key <LSGT> { [  less,            greater,          bar,                  NoSymbol             ] };
+    key <AB01> { [  z,               Z,                U0292,                U01B7                ] };
+    key <AB02> { [  x,               X,                multiply,             periodcentered       ] };
+    key <AB03> { [  c,               C,                c,                    C                    ] };
+    key <AB04> { [  v,               V,                v,                    V                    ] };
+    key <AB05> { [  b,               B,                b,                    B                    ] };
+    key <AB06> { [  n,               N,                eng,                  ENG                  ] };
+    key <AB07> { [  m,               M,                mu,                   emdash               ] };
+    key <AB08> { [  comma,           semicolon,        rightsinglequotemark, leftsinglequotemark  ] };
+    key <AB09> { [  period,          colon,            dead_belowdot,        dead_abovedot        ] };
+    key <AB10> { [  minus,           underscore,       endash,               dead_abovedot        ] };
+
+    include "nbsp(level3)"
+
+    include "kpdl(comma)"
+
+    include "level3(ralt_switch)"
+
+    include "compose(rwin)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "classic" {
+    include "latin(type2)"
+    include "fi(fi)"
+
+    name[Group1]="Finland - Classic";
+};
+
+hidden 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.
+
+    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,     dead_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"
+    include "kpdl(comma)"
+    // End "Keypad" section
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+    include "latin(type2)"
+    include "latin(type2_nodeadkeys)"
+    include "fi(fi)"
+
+    name[Group1]="Finland - Eliminate dead keys";
+
+    key <AE12> { [     acute,       grave ] };
+    key <AD12> { [ diaeresis, asciicircum, asciitilde,  caron ] };
+    key <AB10> { [     minus,  underscore,     hyphen, macron ] };
+};
+
+xkb_symbols "smi" {
+
+    // 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 "no(smi)"
+
+    name[Group1]= "Finland - Northern Saami";
+
+    key <AC10>	{ [odiaeresis, Odiaeresis,       oslash,     Ooblique ]	};
+    key <AC11>	{ [adiaeresis, Adiaeresis,           ae,           AE ]	};
+};
+
+// Copied from macintosh_vndr/fi
+partial alphanumeric_keys 
+xkb_symbols "mac" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple Swedish(Finland) keybaord
+
+    include "se(mac)"
+    name[Group1]= "Finland - Macintosh";
+};
diff --git a/xorg-server/xkbdata.src/symbols/fo b/xorg-server/xkbdata.src/symbols/fo
new file mode 100644
index 000000000..5ac205560
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/fo
@@ -0,0 +1,50 @@
+// $XKeyboardConfig$
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    include "latin(type2)"
+
+    name[Group1]= "Faroe Islands";
+
+    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)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+
+    include "fo(basic)"
+
+    name[Group1]= "Faroe Islands - Eliminate dead keys";
+
+    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/xorg-server/xkbdata.src/symbols/fr b/xorg-server/xkbdata.src/symbols/fr
new file mode 100644
index 000000000..bdbce1baf
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/fr
@@ -0,0 +1,793 @@
+// $XKeyboardConfig$
+
+// based on a keyboard map from an 'xkb/symbols/fr' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/fr,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin"
+
+    name[Group1]="France";
+
+    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)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    // Modifies the basic French layout to use the Sun dead keys
+
+    include "fr(basic)"
+
+    key <AD11>	{ [SunFA_Circum, SunFA_Diaeresis ]	};
+    key <AB07>	{ [comma,   question,  SunFA_Acute, dead_doubleacute ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+    include "fr(Sundeadkeys)"
+
+    name[Group1]="France - Sun dead keys";
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic French layout to eliminate all dead keys
+
+    include "fr(basic)"
+
+    name[Group1]="France - Eliminate dead keys";
+
+    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 ]	};
+};
+
+
+// Unicode French derivative
+// Loose refactoring of the historic Linux French keyboard layout
+//
+// Copyright © 2006-2008 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+//
+// Credits (fr-latin1, fr-latin0, fr-latin9)
+//   © 199x-1996 René Cougnenc �
+//   © 1997-2002 Guylhem Aznar <clavier @ externe.net>
+//   © 2003-2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+//
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲���������┓
+// │ ³ ¸ │ 1 ̨ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ‑ │ 7 È │ 8 ™ │ 9 Ç │ 0 À │ ° ≠ │ + ± ┃ ⌫ Retour┃
+// │ ² ¹ │ & ˇ │ é ~ │ " # │ ' { │ ( [ │ - | │ è ` │ _ \ │ ç ^ │ à @ │ ) ] │ = } ┃  arrière┃
+// ┢�����┷�┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺�┳�������┫
+// ┃       ┃ A Æ │ Z  │ E ¢ │ R Ê │ T Þ │ Y Ÿ │ U Û │ I Î │ O Œ │ P Ô │ ¨ ˚ │ £ Ø ┃Entrée ┃
+// ┃Tab ↹  ┃ 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 → │ ? … │ . . │ / ∕ │ § − ┃             ┃
+// ┃Shift ⇧┃ < ≤ │ w « │ x » │ c © │ v � │ b ↓ │ n ¬ │ , ¿ │ ; × │ : ÷ │ ! ¡ ┃Shift ⇧      ┃
+// ┣�������╋�����┷�┳���┷���┱─┴─────┴─────┴─────┴─────┴─────┴───┲�┷�����╈�����┻�┳�������┳���┛
+// ┃       ┃       ┃       ┃ �         Espace fine insécable � ┃       ┃       ┃       ┃
+// ┃Ctrl   ┃Meta   ┃Alt    ┃ � Espace       Espace insécable � ┃AltGr ⇮┃Menu   ┃Ctrl   ┃
+// ┗�������┻�������┻�������┹───────────────────────────────────┺�������┻�������┻�������┛
+partial alphanumeric_keys
+xkb_symbols "oss" {
+
+    include "latin"
+    include "level3(ralt_switch)"
+    include "nbsp(level4nl)"
+    include "keypad(oss)"
+
+    name[Group1]="France - Alternative";
+
+    // First row
+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,          dead_cedilla ] }; // ² ³ ¹ ¸ 
+    key <AE01>	{ [        ampersand,                1,           dead_caron,           dead_ogonek ] }; // & 1 ˇ ̨
+    key <AE02>	{ [           eacute,                2,           asciitilde,                Eacute ] }; // é 2 ~ É
+    key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_breve ] }; // " 3 # ˘
+    key <AE04>	{ [       apostrophe,                4,            braceleft,             0x1002014 ] }; // ' 4 { — (tiret cadratin)
+    key <AE05>	{ [        parenleft,                5,          bracketleft,             0x1002013 ] }; // ( 5 [ – (tiret demi-cadratin)
+    key <AE06>	{ [            minus,                6,                  bar,             0x1002011 ] }; // - 6 | ‑ (tiret insécable)
+    key <AE07>	{ [           egrave,                7,                grave,                Egrave ] }; // è 7 ` È
+    key <AE08>	{ [       underscore,                8,            backslash,             trademark ] }; // _ 8 \ â„¢
+    key <AE09>	{ [         ccedilla,                9,          asciicircum,              Ccedilla ] }; // ç 9 ^ Ç
+    key <AE10>	{ [           agrave,                0,                   at,                Agrave ] }; // à 0 @ À
+    key <AE11>	{ [       parenright,           degree,         bracketright,              notequal ] }; // ) ° ] ≠ 
+    key <AE12>	{ [            equal,             plus,           braceright,             plusminus ] }; // = + } ±
+
+    // Second row
+    key <AD01>	{ [                a,                A,                   ae,                    AE ] }; // a A æ Æ
+    key <AD02>	{ [                z,                Z,          acircumflex,           Acircumflex ] }; // z Z â Â
+    key <AD03>	{ [                e,                E,             EuroSign,                  cent ] }; // e E € ¢
+    key <AD04>	{ [                r,                R,          ecircumflex,           Ecircumflex ] }; // r R ê Ê
+    key <AD05>	{ [                t,                T,                thorn,                 THORN ] }; // t T þ Þ
+    key <AD06>	{ [                y,                Y,           ydiaeresis,            Ydiaeresis ] }; // y Y ÿ Ÿ
+    key <AD07>	{ [                u,                U,          ucircumflex,           Ucircumflex ] }; // u U û Û
+    key <AD08>	{ [                i,                I,          icircumflex,           Icircumflex ] }; // i I î Î
+    key <AD09>	{ [                o,                O,                   oe,                    OE ] }; // o O Å“ Å’
+    key <AD10>	{ [                p,                P,          ocircumflex,           Ocircumflex ] }; // p P ô Ô
+    key <AD11>	{ [  dead_circumflex,   dead_diaeresis,           dead_tilde,        dead_abovering ] }; // ^ ̈ ̃ ˚
+    key <AD12>	{ [           dollar,         sterling,               oslash,              Ooblique ] }; // $ £ ø Ø
+
+    // Third row
+    key <AC01>	{ [                q,                Q,           adiaeresis,            Adiaeresis ] }; // q Q ä Ä
+    key <AC02>	{ [                s,                S,               ssharp,    doublelowquotemark ] }; // s S ß „ 
+    key <AC03>	{ [                d,                D,           ediaeresis,            Ediaeresis ] }; // d D ë Ë
+    key <AC04>	{ [                f,                F,  leftsinglequotemark,    singlelowquotemark ] }; // f F ‘ ‚
+    key <AC05>	{ [                g,                G, rightsinglequotemark,                   yen ] }; // g G ’ ¥
+    key <AC06>	{ [                h,                H,                  eth,                   ETH ] }; // h H ð �
+    key <AC07>	{ [                j,                J,           udiaeresis,            Udiaeresis ] }; // j J ü Ü
+    key <AC08>	{ [                k,                K,           idiaeresis,            Idiaeresis ] }; // k K ï �
+    key <AC09>	{ [                l,                L,            0x1000140,             0x100013F ] }; // l L ŀ Ŀ
+    key <AC10>	{ [                m,                M,           odiaeresis,            Odiaeresis ] }; // m M ö Ö
+    key <AC11>	{ [           ugrave,          percent,           dead_acute,                Ugrave ] }; // ù % ' Ù
+    key <BKSL>	{ [         asterisk,               mu,           dead_grave,           dead_macron ] }; // * µ ` ̄
+
+    // Fourth row
+    key <LSGT>  { [             less,          greater,        lessthanequal,      greaterthanequal ] }; // < > ≤ ≥
+    key <AB01>  { [                w,                W,        guillemotleft,   leftdoublequotemark ] }; // w W « “
+    key <AB02>  { [                x,                X,       guillemotright,  rightdoublequotemark ] }; // x X » �
+    key <AB03>  { [                c,                C,            copyright,            registered ] }; // c C © ®
+    key <AB04>  { [                v,                V,            0x100202F,             leftarrow ] }; // v V � � (espace fine insécable)
+    key <AB05>  { [                b,                B,            downarrow,               uparrow ] }; // b B ↓ ↑
+    key <AB06>  { [                n,                N,              notsign,            rightarrow ] }; // n N ¬ →
+    key <AB07>  { [            comma,         question,         questiondown,             0x1002026 ] }; // , ? ¿ …
+    key <AB08>  { [        semicolon,           period,             multiply,             0x10022C5 ] }; // ; . × ⋅
+    key <AB09>  { [            colon,            slash,             division,             0x1002215 ] }; // : / ÷ ∕
+    key <AB10>  { [           exclam,          section,           exclamdown,             0x1002212 ] }; // ! § ¡ −
+};
+
+partial alphanumeric_keys
+xkb_symbols "oss_latin9" {
+
+    // Restricts the fr(oss) layout to latin9 symbols
+
+    include "fr(oss)"
+    include "keypad(oss_latin9)"
+
+    name[Group1]="France - Alternative, latin-9 only";
+
+    // First row
+    key <AE01>	{ [        ampersand,                1,           dead_caron,          dead_cedilla ] }; // & 1 ˇ ¸
+    key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_tilde ] }; // " 3 # ~
+    key <AE04>	{ [       apostrophe,                4,            braceleft,            underscore ] }; // ' 4 { _
+    key <AE05>	{ [        parenleft,                5,          bracketleft,                 minus ] }; // ( 5 [ -
+    key <AE06>  { [            minus,                6,                  bar,                 minus ] }; // - 6 | -
+    key <AE08>  { [       underscore,                8,            backslash,             backslash ] }; // _ 8 \ \
+    key <AE11>	{ [       parenright,           degree,         bracketright,                 equal ] }; // ) ° ] =
+
+    // Third row
+    key <AC02>	{ [                s,                S,               ssharp,         guillemotleft ] }; // s S ß « 
+    key <AC04>	{ [                f,                F,           apostrophe,            apostrophe ] }; // f F ' '
+    key <AC05>	{ [                g,                G,           apostrophe,                   yen ] }; // g G ' ¥
+    key <AC09>  { [                l,                L,       periodcentered,        periodcentered ] }; // l L · ·
+    key <BKSL>	{ [         asterisk,               mu,           dead_grave,       dead_circumflex ] }; // * µ ` ^ 
+
+    // Fourth row
+    key <LSGT>  { [             less,          greater,                 less,               greater ] }; // < > < >
+    key <AB01>  { [                w,                W,        guillemotleft,         guillemotleft ] }; // w W « «
+    key <AB02>  { [                x,                X,       guillemotright,        guillemotright ] }; // x X » »
+    key <AB04>  { [                v,                V,         nobreakspace,                  less ] }; // v V � < (espace insécable)
+    key <AB05>  { [                b,                B,                minus,           asciicircum ] }; // b B - ^
+    key <AB06>  { [                n,                N,              notsign,               greater ] }; // n N ¬ >
+    key <AB07>  { [            comma,         question,         questiondown,                period ] }; // , ? ¿ .
+    key <AB08>  { [        semicolon,           period,             multiply,        periodcentered ] }; // ; . × ·
+    key <AB09>  { [            colon,            slash,             division,                 slash ] }; // : / ÷ /
+    key <AB10>  { [           exclam,          section,           exclamdown,                 minus ] }; // ! § ¡ -
+};
+
+partial alphanumeric_keys
+xkb_symbols "oss_Sundeadkeys" {
+
+    // Modifies the basic fr(oss) layout to use the Sun dead keys
+
+    include "fr(oss)"
+
+    // First row
+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,         SunFA_Cedilla ] }; // ¹ ² ³ ¸ 
+
+    // Second row
+    key <AD11>	{ [     SunFA_Circum,  SunFA_Diaeresis,          SunFA_Tilde,        dead_abovering ] }; // ^ ̈ ̃ ˚
+
+    //Third row
+    key <AC11>	{ [           ugrave,          percent,          SunFA_Acute,                Ugrave ] }; // ù % ' Ù
+    key <BKSL>	{ [         asterisk,               mu,          SunFA_Grave,           dead_macron ] }; // * µ ` ̄
+};
+
+partial alphanumeric_keys
+xkb_symbols "oss_sundeadkeys" {
+
+    include "fr(oss_Sundeadkeys)"
+
+    name[Group1]="France - Alternative, Sun dead keys";
+};
+
+partial alphanumeric_keys
+xkb_symbols "oss_nodeadkeys" {
+
+    // Modifies the basic fr(oss) layout to eliminate all dead keys
+
+    include "fr(oss)"
+
+    name[Group1]="France - Alternative, eliminate dead keys";
+
+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,               cedilla ] }; // ² ³ ¹ ¸ 
+    key <AE01>	{ [        ampersand,                1,                caron,                ogonek ] }; // & 1 ˇ ̨
+    key <AE03>	{ [         quotedbl,                3,           numbersign,                 breve ] }; // " 3 # ˘
+
+    // Second row
+    key <AD11>	{ [  asciicircum,   diaeresis,           asciitilde,                 Aring ] }; // ^ ̈ ̃ Å
+    key <AC11>	{ [           ugrave,          percent,                acute,                Ugrave ] }; // ù % ' Ù
+    key <BKSL>	{ [         asterisk,               mu,                grave,                macron ] }; // * µ ` ̄
+};
+
+
+// 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/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 | Super| Alt  | Space    Nobreakspace | AltGr | Super|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 alphanumeric_keys
+
+xkb_symbols "latin9" {
+
+    include "latin"
+    include "nbsp(level3)"
+
+    name[Group1]="France - (Legacy) Alternative";
+
+    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                       ] };
+
+    // 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)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "latin9_Sundeadkeys" {
+
+    // Modifies the basic fr-latin9 layout to use the Sun dead keys
+
+    include "fr(latin9)"
+
+    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 "latin9_sundeadkeys" {
+
+    include "fr(latin9_Sundeadkeys)"
+
+    name[Group1]="France - (Legacy) Alternative, Sun dead keys";
+};
+
+partial alphanumeric_keys
+xkb_symbols "latin9_nodeadkeys" {
+
+    // Modifies the basic fr-latin9 layout to eliminate all dead keys
+
+    include "fr(latin9)"
+
+    name[Group1]="France - (Legacy) Alternative, eliminate dead keys";
+
+    key <AE01>	{ [       ampersand,               1,          apostrophe,       periodcentered ] };
+    key <AE07>	{ [          egrave,               7,               grave,               Egrave ] };
+    key <AE12>	{ [           equal,            plus,          braceright         	        ] };
+    key <AD11>	{ [	asciicircum,  	   diaeresis,          asciitilde,           quoteright ] };
+};
+
+// Bépo : Improved ergonomic french keymap using Dvorak method.
+// Built by community on 'Dvorak Fr' mailing list :
+// dvorak-fr@gpl.insa-lyon.fr and on its wiki : http://gpl.insa-lyon.fr/Dvorak-Fr/ .
+// XOrg integration in 2006 by Frédéric Boiteux <fboiteux @ free.fr>
+//
+// Bépo layout (6.2.1.1 version) for a pc105 keyboard (french) :
+// ┌────�
+// │ S A│   S = Shift,  A = AltGr + Shift
+// │ s a│   s = normal, a = AltGr
+// └────┘
+//
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲���������┓
+// │ $   │ 1 ¹ │ 2 ² │ 3 ³ │ 4 ° │ 5 ˚ │ 6   │ 7   │ 8   │ 9   │ 0   │ ^   │ µ   ┃ ⌫ Retour┃
+// │ @ # │ _ { │ " } │ « < │ » > │ ( [ │ ) ] │ + ± │ - ¬ │ * × │ / ÷ │ = ¯ │ %   ┃  arrière┃
+// ┢�����┷�┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺�┳�������┫
+// ┃       ┃ B   │ É ˊ │ P ¶ │ O Œ │ È ` │ Ç   │ V   │ D � │ L   │ F   │ J   │ Z   ┃Entrée ┃
+// ┃Tab ↹  ┃ b | │ é & │ p § │ o œ │ è ` │ ç   │ v   │ d ð │ l £ │ f ª │ j   │ z   ┃   �   ┃
+// ┣�������┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
+// ┃        ┃ A Æ │ U Ù │ I ˇ │ E   │ ?   │ C ¢ │ T Þ │ S   │ N   │ R   │ M   │ !   ┃      ┃
+// ┃Maj ⇬   ┃ a æ │ u ù │ i ̈ │ e € │ , ¿ │ c © │ t þ │ s ß │ n   │ r ® │ m º │ ˆ ¡ ┃      ┃
+// ┣�������┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷�����┻������┫
+// ┃       ┃ ù   │ À ˜ │ H   │ Y   │ : · │ K   │ ;   │ Q   │ G   │ X   │ W   ┃             ┃
+// ┃Shift ⇧┃ ê / │ à ~ │ h ! │ y ¥ │ . \ │ k   │ '   │ q   │ g   │ x   │ w   ┃Shift ⇧      ┃
+// ┣�������╋�����┷�┳���┷���┱─┴─────┴─────┴─────┴─────┴─────┴───┲�┷�����╈�����┻�┳�������┳���┛
+// ┃       ┃       ┃       ┃ � Espace insécable              � ┃       ┃       ┃       ┃
+// ┃Ctrl   ┃Meta   ┃Alt    ┃ � Espace                        � ┃AltGr ⇮┃Menu   ┃Ctrl   ┃
+// ┗�������┻�������┻�������┹───────────────────────────────────┺�������┻�������┻�������┛
+partial alphanumeric_keys
+xkb_symbols "bepo" {
+
+    include "keypad(oss)"
+
+    name[Group1]= "France - Bepo, ergonomic, Dvorak way";
+
+    // First row
+    key <TLDE> { [              at,       dollar,     numbersign                 ] }; // @ $ #
+    key <AE01> { [      underscore,            1,      braceleft,    onesuperior ] }; // _ 1 { ¹
+    key <AE02> { [        quotedbl,            2,     braceright,    twosuperior ] }; // " 2 } ²
+    key <AE03> { [   guillemotleft,            3,           less,  threesuperior ] }; // « 3 < ³
+    key <AE04> { [  guillemotright,            4,        greater,         degree ] }; // » 4 > °
+    key <AE05> { [       parenleft,            5,    bracketleft, dead_abovering ] }; // ( 5 [ Ëš
+    key <AE06> { [      parenright,            6,   bracketright                 ] }; // ) 6 ]
+    key <AE07> { [            plus,            7,      plusminus                 ] }; // + 7 ±
+    key <AE08> { [           minus,            8,        notsign                 ] }; // - 8 ¬
+    key <AE09> { [        asterisk,            9,       multiply                 ] }; // * 9 ×
+    key <AE10> { [           slash,            0,       division                 ] }; // / 0 ÷
+    key <AE11> { [           equal,  asciicircum,         macron                 ] }; // = ^ ¯
+    key <AE12> { [         percent,           mu                                 ] }; // % µ
+
+    // Second row
+    key <AD01> { [               b,            B,            bar                 ] }; // b B |
+    key <AD02> { [          eacute,       Eacute,      ampersand,     dead_acute ] }; // é É & ˊ
+    key <AD03> { [               p,            P,        section,      paragraph ] }; // p P § ¶
+    key <AD04> { [               o,            O,             oe,             OE ] }; // o O Å“ Å’
+    key <AD05> { [          egrave,       Egrave,          grave,     dead_grave ] }; // è È ` `
+    key <AD06> { [        ccedilla,     Ccedilla                                 ] }; // ç Ç
+    key <AD07> { [               v,            V                                 ] }; // v V
+    key <AD08> { [               d,            D,            eth,            ETH ] }; // d D ð �
+    key <AD09> { [               l,            L,       sterling                 ] }; // l L £
+    key <AD10> { [               f,            F,    ordfeminine                 ] }; // f F ª
+    key <AD11> { [               j,            J                                 ] }; // j J
+    key <AD12> { [               z,            Z                                 ] }; // z Z
+
+    // Third row
+    key <AC01> { [               a,            A,             ae,             AE ] }; // a A æ Æ
+    key <AC02> { [               u,            U,         ugrave,         Ugrave ] }; // u U ù Ù
+    key <AC03> { [               i,            I, dead_diaeresis,     dead_caron ] }; // i I ̈ ˇ
+    key <AC04> { [               e,            E,       EuroSign                 ] }; // e E €
+    key <AC05> { [           comma,     question,   questiondown                 ] }; // , ? ¿
+    key <AC06> { [               c,            C,      copyright,           cent ] }; // c C © ¢
+    key <AC07> { [               t,            T,          thorn,          Thorn ] }; // t T þ Þ
+    key <AC08> { [               s,            S,         ssharp                 ] }; // s S ß
+    key <AC09> { [               n,            N                                 ] }; // n N
+    key <AC10> { [               r,            R,     registered                 ] }; // r R ®
+    key <AC11> { [               m,            M,      masculine                 ] }; // m M º
+    key <BKSL> { [ dead_circumflex,       exclam,     exclamdown                 ] }; // ^ ! ¡
+
+    // Fourth row
+    key <LSGT> { [     ecircumflex,       ugrave,          slash                 ] }; // ê ù /
+    key <AB01> { [          agrave,       Agrave,     asciitilde,     dead_tilde ] }; // à À ~ ~
+    key <AB02> { [               h,            H,         exclam                 ] }; // h H !
+    key <AB03> { [               y,            Y,            yen                 ] }; // y Y ¥
+    key <AB04> { [          period,        colon,      backslash, periodcentered ] }; // . : \ ·
+    key <AB05> { [               k,            K                                 ] }; // k K
+    key <AB06> { [      apostrophe,    semicolon                                 ] }; // ' ;
+    key <AB07> { [               q,            Q,         oslash,       Ooblique ] }; // q Q ø Ø
+    key <AB08> { [               g,            G                                 ] }; // g G
+    key <AB09> { [               x,            X                                 ] }; // x X
+    key <AB10> { [               w,            W                                 ] }; // w W
+
+    key <SPCE> { [           space, nobreakspace,          space,          space ] }; // � � (espace insécable) � �
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "bepo_latin9" {
+
+    // Restricts the fr(bepo) layout to latin9 symbols
+
+    include "keypad(oss_latin9)"
+    include "fr(bepo)"
+
+    name[Group1]="France - Bepo, ergonomic, Dvorak way, latin-9 only";
+
+    // at now, no difference (oss keypad excepted), but will change !
+};
+
+// Author   : Francis Leboutte, http://www.algo.be/ergo/dvorak-fr.html
+//            thanks to Fabien Cazenave for his help
+// Licence  : X11 (the layout itself is released under CC-NC-ND licence)
+// Version  : 0.3
+
+// Base layer + dead AltGr key (`):
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲����������┓
+// │ *   │ 1   │ 2   │ 3   │ 4   │ 5   │ 6   │ 7   │ 8   │ 9   │ 0   │ +   │ %   ┃          ┃
+// │ _   │ =   │ / ± │ - ¼ │ è ½ │ \ ¾ │ ^   │ (   │ ` ` │ )   │ "   │ [   │ ]   ┃ ⌫        ┃
+// ┢�����┷��┱──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┺��┳�������┫
+// ┃        ┃ ? Æ │ <   │ >   │ G   │ !   │ H   │ V   │ C Ç │ M   │ K   │ Z   │ &   ┃       ┃
+// ┃ ↹      ┃ : æ │ ' $ │ é É │ g € │ . ° │ h   │ v   │ c ç │ m µ │ k   │ z   │ ¨   ┃       ┃
+// ┣��������┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓  �   ┃
+// ┃         ┃ O Ò │ A À │ U Ù │ E È │ B   │ F   │ S   │ T   │ N   │ D   │ W   │ #   ┃      ┃
+// ┃ ⇬       ┃ o ò │ a à │ u ù │ e è │ b   │ f   │ s « │ t   │ n » │ d   │ w   │ ~   ┃      ┃
+// ┣������┳��┹──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┲��┷�����┻������┫
+// ┃      ┃ ç Ç │ | Œ │ Q   │ @   │ I Ì │ Y   │ X   │ R   │ L   │ P   │ J   ┃               ┃
+// ┃ ⇧    ┃ à À │ ; œ │ q { │ , } │ i ì │ y £ │ x   │ r º │ l   │ p § │ j   ┃ ⇧             ┃
+// ┣������┻┳����┷��┳��┷����┱┴─────┴─────┴─────┴─────┴─────┴─┲���┷���┳�┷�����╋�������┳�������┫
+// ┃       ┃       ┃       ┃ �                            � ┃       ┃       ┃       ┃       ┃
+// ┃ ctrl  ┃ super ┃ alt   ┃ � Espace    Espace insécable � ┃ alt   ┃ super ┃ menu  ┃ ctrl  ┃
+// ┗�������┻�������┻�������┹────────────────────────────────┺�������┻�������┻�������┻�������┛
+
+// Notice the specific Caps_Lock layer:
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲����������┓
+// │ *   │ 1   │ 2   │ 3   │ 4   │ 5   │ 6   │ 7   │ 8   │ 9   │ 0   │ +   │ %   ┃          ┃
+// │     │     │     │     │     │     │     │     │     │     │     │     │     ┃ ⌫        ┃
+// ┢�����┷��┱──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┺��┳�������┫
+// ┃        ┃     │ <   │ >   │     │     │     │     │     │     │     │     │     ┃       ┃
+// ┃ ↹      ┃     │     │     │     │     │     │     │     │     │     │     │     ┃       ┃
+// ┣��������┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓  �   ┃
+// ┃         ┃     │     │     │     │     │     │     │     │     │     │     │     ┃      ┃
+// ┃ ⇬       ┃     │     │     │     │     │     │     │     │     │     │     │     ┃      ┃
+// ┣������┳��┹──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┲��┷�����┻������┫
+// ┃      ┃ /   │ -   │     │     │     │     │     │     │     │     │     ┃               ┃
+// ┃ ⇧    ┃     │     │     │     │     │     │     │     │     │     │     ┃ ⇧             ┃
+// ┣������┻┳����┷��┳��┷����┱┴─────┴─────┴─────┴─────┴─────┴─┲���┷���┳�┷�����╋�������┳�������┫
+// ┃       ┃       ┃       ┃ �                            � ┃       ┃       ┃       ┃       ┃
+// ┃ ctrl  ┃ super ┃ alt   ┃ � Espace    Espace insécable � ┃ alt   ┃ super ┃ menu  ┃ ctrl  ┃
+// ┗�������┻�������┻�������┹────────────────────────────────┺�������┻�������┻�������┻�������┛
+
+partial alphanumeric_keys modifier_keys
+xkb_symbols "dvorak" {
+  name[Group1]="France - Dvorak";
+
+  // First row
+  key <TLDE> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       underscore,   asterisk                  ] };
+  key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            equal,          1                  ] };
+  key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            slash,          2,       plusminus ] };
+  key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            minus,          3,      onequarter ] };
+  key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           egrave,          4,         onehalf ] };
+  key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        backslash,          5,   threequarters ] };
+  key <AE06> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [  dead_circumflex,          6                  ] };
+  key <AE07> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        parenleft,          7                  ] };
+  key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ ISO_Level3_Latch,          8,           grave ] };
+  key <AE09> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       parenright,          9                  ] };
+  key <AE10> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [         quotedbl,          0                  ] };
+  key <AE11> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [      bracketleft,       plus                  ] };
+  key <AE12> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [     bracketright,    percent                  ] };
+
+  // Second row
+  key <AD01> { [            colon,         question,              ae,               AE ] };
+  key <AD02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       apostrophe,       less,          dollar ] };
+  key <AD03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           eacute,    greater,          Eacute ] };
+  key <AD04> { [                g,                G,        EuroSign                   ] };
+  key <AD05> { [           period,           exclam,          degree                   ] };
+  key <AD06> { [                h,                H                                    ] };
+  key <AD07> { [                v,                V                                    ] };
+  key <AD08> { [                c,                C,        ccedilla,         Ccedilla ] };
+  key <AD09> { [                m,                M,              mu                   ] };
+  key <AD10> { [                k,                K                                    ] };
+  key <AD11> { [                z,                Z                                    ] };
+  key <AD12> { [   dead_diaeresis,        ampersand                                    ] };
+
+  // Third row
+  key <AC01> { [                o,                O,          ograve,           Ograve ] };
+  key <AC02> { [                a,                A,          agrave,           Agrave ] };
+  key <AC03> { [                u,                U,          ugrave,           Ugrave ] };
+  key <AC04> { [                e,                E,          egrave,           Egrave ] };
+  key <AC05> { [                b,                B                                    ] };
+  key <AC06> { [                f,                F                                    ] };
+  key <AC07> { [                s,                S,   guillemotleft                   ] };
+  key <AC08> { [                t,                T                                    ] };
+  key <AC09> { [                n,                N,  guillemotright                   ] };
+  key <AC10> { [                d,                D                                    ] };
+  key <AC11> { [                w,                W                                    ] };
+  key <BKSL> { [       asciitilde,       numbersign                                    ] };
+
+  // Fourth row
+  key <LSGT> { type[group1] = "FOUR_LEVEL_PLUS_LOCK", [       agrave, ccedilla,  Agrave, Ccedilla,   slash ] };
+  key <AB01> { type[group1] = "FOUR_LEVEL_PLUS_LOCK", [    semicolon,      bar,      oe,       OE,   minus ] };
+  key <AB02> { [                q,                Q,       braceleft                   ] };
+  key <AB03> { [            comma,               at,      braceright                   ] };
+  key <AB04> { [                i,                I,          igrave,           Igrave ] };
+  key <AB05> { [                y,                Y,        sterling                   ] };
+  key <AB06> { [                x,                X                                    ] };
+  key <AB07> { [                r,                R,       masculine                   ] };
+  key <AB08> { [                l,                L                                    ] };
+  key <AB09> { [                p,                P,         section                   ] };
+  key <AB10> { [                j,                J                                    ] };
+
+  key <SPCE> { [            space,            space,    nobreakspace,     nobreakspace ] };
+};
+
+// Marc.Shapiro@inria.fr 19-sep-1998
+// modifications : Etienne Herlent <eherlent@linux-france.org> june 2000
+// adapted to the new input layer :
+//        Martin Costabel <costabel@wanadoo.fr> 3-jan-2001
+// adapted for Latin9 alphabet (ISO-8859-15): 
+//        Etienne Herlent <eherlent@linux-france.org> march 2005
+
+// This map is an almost-complete mapping of the standard French
+// MacIntosh keyboard under Xwindows.  I tried to remain as faithful
+// as possible to the Mac meaning of each key.	I did this entirely by
+// hand and by intuition, relying on the Clavier (Keyboard?) Desktop
+// Accessory for the Mac meaning of keys, and on reading keysymdef.h
+// to intuit the corresponding X names.	 Lacking proper documentation,
+// I may have made some mistakes.
+
+// Entries marked CHECK are particularly uncertain
+
+// Entries marked MISSING mark Mac characters for which I was unable
+// to find a corresponding keysym.  (Some for sure don't: e.g. the
+// Apple mark and the oe/OE character; others I may have simply not
+// found.)
+
+// Copied from macintosh_vndr/fr
+partial alphanumeric_keys
+xkb_symbols "mac" {
+
+    name[Group1]= "France - Macintosh";
+
+    // Alphanumeric section
+    key <TLDE> {	[          at,     numbersign, periodcentered,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9
+    key <AE01> {	[   ampersand,    1,   VoidSymbol,    dead_acute	]	}; // MISSING: Apple
+    key <AE02> {	[      eacute,    2,   ediaeresis,        Eacute	]	};
+    key <AE03> {	[    quotedbl,    3,   VoidSymbol,    VoidSymbol	] 	}; // CHECK all quotemarks
+    key <AE04> {	[  apostrophe,    4,   VoidSymbol,    VoidSymbol	] 	};
+    key <AE05> {	[   parenleft,    5,    braceleft,   bracketleft	]	};
+ // CHECK section
+    key <AE06> {	[     section,    6,    paragraph,         aring	]	};
+    key <AE07> {	[      egrave,    7, guillemotleft, guillemotright	]	};
+    key <AE08> {	[      exclam,    8,   exclamdown,   Ucircumflex	]	};
+    key <AE09> {	[    ccedilla,    9,     Ccedilla,        Aacute	]	};
+    key <AE10> {	[      agrave,    0,       oslash,    VoidSymbol	]	}; // MISSING: Oslash
+    key <AE11> {	[  parenright, degree, braceright,  bracketright	]	};
+    key <AE12> {	[       minus, underscore, emdash,        endash	]	}; // CHECK dashes
+
+    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,   VoidSymbol,  VoidSymbol	]	};
+    key <AD06> {	[           y,  Y,       Uacute,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9
+    key <AD07> {	[           u,  U,   VoidSymbol, ordfeminine	]	}; // MISSING: ordmasculine?
+    key <AD08> {	[           i,  I,  icircumflex,  idiaeresis	]	};
+    key <AD09> {	[           o,  O,           oe,          OE      	]	}; // MISSING: oe, OE lacking in Latin1; eherlent ok in Latin9
+    key <AD10> {	[           p,  P,   VoidSymbol,  VoidSymbol	]	};
+    key <AD11> {	[dead_circumflex,dead_diaeresis, ocircumflex, Ocircumflex	]	};
+    key <AD12> {	[      dollar, asterisk,   EuroSign, yen		]	}; // eherlent : EuroSign in Latin9
+
+    key <AC01> {	[         q, Q, acircumflex,         Agrave		]	};
+    key <AC02> {	[         s, S,      Ograve,     VoidSymbol	]	};
+    key <AC03> {	[         d, D,  VoidSymbol,     VoidSymbol	]	};
+    key <AC04> {	[         f, F,  VoidSymbol, periodcentered	]	}; // MISSING: oblong script f??
+    key <AC05> {	[         g, G,  VoidSymbol,     VoidSymbol	]	}; // MISSING: kerned fi, fl
+    key <AC06> {	[         h, H,      Igrave,    Icircumflex	]	};
+    key <AC07> {	[         j, J,  Idiaeresis,         Iacute	]	};
+    key <AC08> {	[         k, K,      Egrave,     Ediaeresis	]	};
+    key <AC09> {	[         l, L,     notsign,            bar	]	};
+    key <AC10> {	[         m, M,          mu,         Oacute	]	};
+    key <AC11> {	[    ugrave,percent, Ugrave,    ucircumflex	]	}; // MISSING: per-mille
+    key <BKSL> {	[ dead_grave, sterling,  at,     numbersign	]	};
+
+    key <LSGT> {	[      less, greater, VoidSymbol, VoidSymbol	]	};
+    key <AB01> {	[         w, W, VoidSymbol,   VoidSymbol	]	};	// MISSING: half-guillemot (single angle bracket)
+    key <AB02> {	[         x, X, VoidSymbol,   VoidSymbol	]	}; // CHECK similarequal; MISSING: extra-slanted slash
+    key <AB03> {	[         c, C,  copyright,         cent	]	};
+    key <AB04> {	[         v, V,    diamond,  leftradical	]	}; // CHECK diamond, leftradical
+    key <AB05> {	[         b, B,     ssharp,   VoidSymbol	]	}; // CHECK: Greek_beta or ssharp?; MISSING: oblong script s
+    key <AB06> {	[         n, N,  dead_tilde,  asciitilde	]	};
+    key <AB07> {	[     comma,  question, VoidSymbol,  questiondown	]	};
+    key <AB08> {	[ semicolon,  period, VoidSymbol,  periodcentered	]	};
+    key <AB09> {	[     colon,  slash,   division,        backslash	]	};
+    key <AB10> {	[     equal,   plus, VoidSymbol,        plusminus	]	};
+
+    key <SPCE> {	[     space,  space, nobreakspace,   nobreakspace	]	};
+    // End alphanumeric section
+
+    key <KPDL> {	[  comma,KP_Decimal	]	};
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "geo" {
+    include "ge(basic)"
+
+    name[Group1]= "France - Georgian AZERTY Tskapo";
+
+    key <TLDE> { [ exclam, noSymbol ] };
+    key <AE01> { [ 0x0100201e, 1 ] };
+    key <AE02> { [ 0x01002116, 2 ] };
+    key <AE03> { [ percent, 3    ] };
+    key <AE04> { [ parenleft, 4  ] };
+    key <AE05> { [ colon, 5      ] };
+    key <AE06> { [ semicolon, 6  ] };
+    key <AE07> { [ question, 7   ] };
+    key <AE08> { [ 0x01002116, 8 ] };
+    key <AE09> { [ degree, 9     ] };
+    key <AE10> { [ parenright, 0 ] };
+    key <AE11> { [ minus, underscore, 0x01002014 ] };
+    key <AE12> { [ less, greater ] };
+
+    key <AD01> { [ 0x010010d0,  0x010010fa     ] };
+    key <AD02> { [ 0x010010d6,  Z              ] };
+    key <AD03> { [ 0x010010d4,  E, 0x010010f1  ] };
+    key <AD04> { [ 0x010010e0,  0x010000ae     ] };
+    key <AD05> { [ 0x010010e2,  T              ] };
+    key <AD06> { [ 0x010010e7,  0x010010f8     ] };
+    key <AD07> { [ 0x010010e3,  U              ] };
+    key <AD08> { [ 0x010010d8,  0x010010f2     ] };
+    key <AD09> { [ 0x010010dd,  O              ] };
+    key <AD10> { [ 0x010010de,  P              ] };
+    key <AD11> { [ 0x010010d7,  T              ] };
+    key <AD12> { [ 0x010010eb,  Z              ] };
+
+    key <AC01> { [ 0x010010e5,  Q              ] };
+    key <AC02> { [ 0x010010e1,  S              ] };
+    key <AC03> { [ 0x010010d3,  D              ] };
+    key <AC04> { [ 0x010010e4,  0x010010f6     ] };
+    key <AC05> { [ 0x010010d2,  0x010010f9     ] };
+    key <AC06> { [ 0x010010f0,  0x010010f5     ] };
+    key <AC07> { [ 0x010010ef,  0x010010f7     ] };
+    key <AC08> { [ 0x010010d9,  K              ] };
+    key <AC09> { [ 0x010010da,  L              ] };
+    key <AC10> { [ 0x010010db,  M              ] };
+    key <AC11> { [ 0x010010df,  J              ] };
+    key <BKSL> { [ 0x010010e9,  0x010000a9     ] };
+
+    key <LSGT> { [ guillemotleft,guillemotright ] };
+    key <AB01> { [ 0x010010ec,  W               ] };
+    key <AB02> { [ 0x010010ee,  0x010010f4      ] };
+    key <AB03> { [ 0x010010ea,  0x010000a9      ] };
+    key <AB04> { [ 0x010010d5,  0x010010f3      ] };
+    key <AB05> { [ 0x010010d1,  B               ] };
+    key <AB06> { [ 0x010010dc,  0x010010fc      ] };
+    key <AB07> { [ comma,       0x01002014      ] };
+    key <AB08> { [ 0x010010e8,  S               ] };
+    key <AB09> { [ 0x010010e6,  noSymbol        ] };
+    key <AB10> { [ 0x010010ed,  noSymbol        ] };
+
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.am
new file mode 100644
index 000000000..4e3a96ee1
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.am
@@ -0,0 +1,4 @@
+symbolsdir = $(xkb_base)/symbols/fujitsu_vndr
+
+dist_symbols_DATA = \
+jp us
diff --git a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in
new file mode 100644
index 000000000..3c7824624
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in
@@ -0,0 +1,367 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = symbols/fujitsu_vndr
+DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(symbolsdir)"
+dist_symbolsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_symbols_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+symbolsdir = $(xkb_base)/symbols/fujitsu_vndr
+dist_symbols_DATA = \
+jp us
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/fujitsu_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  symbols/fujitsu_vndr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_symbolsDATA: $(dist_symbols_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_symbolsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  $(dist_symbolsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+
+uninstall-dist_symbolsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(symbolsdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_symbolsDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_symbolsDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_symbolsDATA uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/jp b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/jp
new file mode 100644
index 000000000..2f49dea76
--- /dev/null
+++ b/xorg-server/xkbdata.src/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_vndr/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/xorg-server/xkbdata.src/symbols/fujitsu_vndr/us b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/us
new file mode 100644
index 000000000..e81be028d
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/gb b/xorg-server/xkbdata.src/symbols/gb
new file mode 100644
index 000000000..a2a048ef4
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/gb
@@ -0,0 +1,137 @@
+// $XKeyboardConfig$
+
+// based on a keyboard map from an 'xkb/symbols/gb' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/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 "latin"
+
+    name[Group1]="United Kingdom";
+
+    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 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 "latin" 
+
+    name[Group1]="United Kingdom - International (with dead keys)"; 
+
+    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)"
+};
+
+// Describe the differences between the US Colemak layout
+// and a UK variant. By Andy Buckley (andy@insectnation.org)
+
+partial alphanumeric_keys
+xkb_symbols "colemak" {
+    include "us(colemak)"
+
+    name[Group1]="United Kingdom - Colemak";
+
+    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)"
+};
+
+
+// Dvorak (UK) keymap (by odaen) allowing the usage of
+// the £ and ? key and swapping the @ and " keys.
+
+partial alphanumeric_keys
+xkb_symbols "dvorak" {
+    include "us(dvorak-intl)"
+
+    name[Group1]="United Kingdom - Dvorak";
+
+    key <BKSL> { [ numbersign,	asciitilde	] };
+    key <AE02> { [	    2,	quotedbl,  twosuperior,   NoSymbol	] };
+    key <AE03> { [	    3,	sterling,  threesuperior, NoSymbol	] };
+    key <LSGT> { [  backslash,	bar		] };
+    key <AD01> { [ apostrophe,	at		] };
+};
+
+// Dvorak letter positions, but punctuation all in the normal UK positions.
+partial alphanumeric_keys
+xkb_symbols "dvorakukp" {
+    include "gb(dvorak)"
+
+    name[Group1]="United Kingdom - Dvorak (UK Punctuation)";
+
+    key <AE11> {        [     minus,    underscore      ]       };
+    key <AE12> {        [     equal,    plus            ]       };
+    key <AD11> {        [ bracketleft,  braceleft       ]       };
+    key <AD12> {        [ bracketright, braceright      ]       };
+    key <AD01> {        [ slash,        question        ]       };
+    key <AC11> {        [apostrophe,    at,         dead_circumflex, dead_caron] };
+};
+
+// Copied from macintosh_vndr/gb
+partial alphanumeric_keys 
+xkb_symbols "mac" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple U.K. keyboard layout
+
+    include "latin"
+
+    name[Group1]= "United Kingdom - Macintosh";
+
+    key <AE02> {	[               2,              at,         EuroSign	]	};
+    key <AE03> {	[               3,        sterling,       numbersign	]	};
+
+    // End alphanumeric section
+    
+    include "level3(ralt_switch)"
+};
+
+
diff --git a/xorg-server/xkbdata.src/symbols/ge b/xorg-server/xkbdata.src/symbols/ge
new file mode 100644
index 000000000..155a9da66
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/ge
@@ -0,0 +1,275 @@
+// $XKeyboardConfig$
+
+// Georgian Keyboard Layouts by Aiet Kolkhi <aietkolkhi@gmail.com>
+// Full layout descriptions available at http://www.gakartuleba.org/layouts/
+//
+// This includes the following keyboard layouts: Georgian QWERTY; Georgian Ergonomic;
+// Georgian MESS; Georgian AZERTY Tskapo; Georgian Russian.
+//
+// Layouts include Georgian Mkhedruli alphabeth; most layouts also include some special
+// and ancient characters (like Fi, Yn, Elifi, Turned Gan and Ain). Layouts do not
+// include Georgian Asomtavruli or Georgian Khutsuri alphabeths which are also present
+// in Unicode.
+//
+// Georgian Typewriter no longer supported, as it is no longer used in Georgia.
+//
+// some layouts based on Georgian keyboard map, in the so called "latin" layout.
+// 1999, Pablo Saratxaga <srtxg@chanae.alphanet.ch>
+//
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    name[Group1]= "Georgia";
+
+    key <TLDE> { [ 0x0100201e, 0x0100201c, 0x0100201e, asciitilde ] };
+    key <AE01> { [ 1, exclam, apostrophe ] };
+    key <AE02> { [ 2, at, 0x0100201e ] };
+    key <AE03> { [ 3, numbersign, 0x0100201c ] };
+    key <AE04> { [ 4, dollar, 0x01002116 ] };
+    key <AE05> { [ 5, percent, EuroSign ] };
+    key <AE06> { [ 6, asciicircum ] };
+    key <AE07> { [ 7, ampersand, section ] };
+    key <AE08> { [ 8, asterisk,	degree ] };
+    key <AE09> { [ 9, parenleft ] };
+    key <AE10> { [ 0, parenright ] };
+    key <AE11> { [ minus, underscore, 0x01002014 ] };
+    key <AE12> { [ equal, plus, 0x01002013 ] };
+
+    key <AD01> { [ 0x010010e5,  Q               ]       };
+    key <AD02> { [ 0x010010ec,  0x010010ed      ]       };
+    key <AD03> { [ 0x010010d4,  E, 0x010010f1   ]       };
+    key <AD04> { [ 0x010010e0,  0x010010e6, 0x010000ae ] };
+    key <AD05> { [ 0x010010e2,  0x010010d7 ] };
+    key <AD06> { [ 0x010010e7,  Y, 0x010010f8   ]       };
+    key <AD07> { [ 0x010010e3,  U               ]       };
+    key <AD08> { [ 0x010010d8,  I, 0x010010f2   ]       };
+    key <AD09> { [ 0x010010dd,  O               ]       };
+    key <AD10> { [ 0x010010de,  P               ]       };
+    key <AD11> { [ bracketleft, braceleft       ]       };
+    key <AD12> { [ bracketright,braceright      ]       };
+
+    key <AC01> { [ 0x010010d0,  A, 0x010010fa   ]       };
+    key <AC02> { [ 0x010010e1,  0x010010e8      ]       };
+    key <AC03> { [ 0x010010d3,  D               ]       };
+    key <AC04> { [ 0x010010e4,  F, 0x010010f6   ]       };
+    key <AC05> { [ 0x010010d2,  G, 0x010010f9   ]       };
+    key <AC06> { [ 0x010010f0,  H, 0x010010f5   ]       };
+    key <AC07> { [ 0x010010ef, 0x010010df, 0x010010f7 ] };
+    key <AC08> { [ 0x010010d9,  K               ]       };
+    key <AC09> { [ 0x010010da,  L               ]       };
+    key <AC10> { [ semicolon, colon             ]       };
+    key <AC11> { [ apostrophe, quotedbl         ]       };
+    key <BKSL> { [ backslash, bar, asciitilde, asciitilde ]  };
+
+    key <LSGT> { [ guillemotleft,guillemotright ]       };
+    key <AB01> { [ 0x010010d6,  0x010010eb      ]       };
+    key <AB02> { [ 0x010010ee,  X, 0x010010f4   ]       };
+    key <AB03> { [ 0x010010ea, 0x010010e9, 0x010000a9 ] };
+    key <AB04> { [ 0x010010d5,  V, 0x010010f3   ]       };
+    key <AB05> { [ 0x010010d1,  B               ]       };
+    key <AB06> { [ 0x010010dc,  N, 0x010010fc   ]       };
+    key <AB07> { [ 0x010010db,  M               ]       };
+    key <AB08> { [ comma, less, guillemotleft   ]       };
+    key <AB09> { [ period, greater, guillemotright    ] };
+    key <AB10> { [ slash, question, 0x010010fb  ]       };
+
+    include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "qwerty" {
+    include "ge(basic)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "ergonomic" {
+    include "ge(basic)"
+
+    name[Group1]= "Georgia - Ergonomic";
+
+    key <TLDE> { [ 0x0100201e, apostrophe, 0x0100201e, asciitilde ] };
+    key <AE01> { [ exclam, 1, exclam      ] };
+    key <AE02> { [ 0x01002116, 2, at      ] };
+    key <AE03> { [ comma, 3, numbersign, section ] };
+    key <AE04> { [ semicolon, 4, dollar   ] };
+    key <AE05> { [ percent, 5, EuroSign	 ] };
+    key <AE06> { [ colon, 6, asciicircum  ] };
+    key <AE07> { [ question, 7, ampersand ] };
+    key <AE08> { [ period, 8, asterisk, degree ] };
+    key <AE09> { [ parenleft, 9, parenleft, guillemotleft ] };
+    key <AE10> { [ parenright, 0, parenright, guillemotright ] };
+    key <AE11> { [ minus, plus, 0x01002014, underscore ] };
+    key <AE12> { [ 0x0100201c, equal, equal ] };
+
+    key <AD01> { [ 0x010010e9, noSymbol      ]       };
+    key <AD02> { [ 0x010010de, noSymbol      ]       };
+    key <AD03> { [ 0x010010e3, noSymbol      ]       };
+    key <AD04> { [ 0x010010eb, noSymbol, noSymbol, 0x010000ae ] };
+    key <AD05> { [ 0x010010ed, noSymbol, noSymbol, 0x010010d7 ] };
+    key <AD06> { [ 0x010010e2, noSymbol, noSymbol, 0x010010f8 ] };
+    key <AD07> { [ 0x010010d7, noSymbol      ]       };
+    key <AD08> { [ 0x010010dc, noSymbol, 0x010010fc, I ] };
+    key <AD09> { [ 0x010010d5, noSymbol, 0x010010f3    ] };
+    key <AD10> { [ 0x010010e8, noSymbol                ] };
+    key <AD11> { [ 0x010010d9, noSymbol, bracketleft, braceleft  ] };
+    key <AD12> { [ 0x010010e5, noSymbol, bracketright,braceright ] };
+
+    key <AC01> { [ 0x010010ee, noSymbol, 0x010010f4    ] };
+    key <AC02> { [ 0x010010d8, noSymbol, 0x010010f2    ] };
+    key <AC03> { [ 0x010010d0, noSymbol, 0x010010fa, D ] };
+    key <AC04> { [ 0x010010d4, noSymbol, 0x010010f1    ] };
+    key <AC05> { [ 0x010010dd, noSymbol     ]       };
+    key <AC06> { [ 0x010010d3, noSymbol     ]       };
+    key <AC07> { [ 0x010010db, noSymbol     ]       };
+    key <AC08> { [ 0x010010e1, noSymbol     ]       };
+    key <AC09> { [ 0x010010e0, noSymbol, L  ]       };
+    key <AC10> { [ 0x010010d1, noSymbol, colon         ] }; 
+    key <AC11> { [ 0x010010d2, noSymbol, 0x010010f9, quotedbl ] };
+    key <BKSL> { [ slash, section, backslash, bar ] };
+
+    key <LSGT> { [ guillemotleft,guillemotright   ] };
+    key <AB01> { [ 0x010010ef, noSymbol      ]      };
+    key <AB02> { [ 0x010010f0, noSymbol, 0x010010f5, X ] };
+    key <AB03> { [ 0x010010e7, noSymbol, 0x010010f8, C ] };
+    key <AB04> { [ 0x010010e6, noSymbol, 0x010010f7, V ] };
+    key <AB05> { [ 0x010010df, noSymbol                ] };
+    key <AB06> { [ 0x010010d6, noSymbol                ] };
+    key <AB07> { [ 0x010010ea, noSymbol, noSymbol, M   ] };
+    key <AB08> { [ 0x010010da, noSymbol, guillemotleft, less ] };
+    key <AB09> { [ 0x010010e4, noSymbol, 0x010010f6, guillemotright ] };
+    key <AB10> { [ 0x010010ec, noSymbol, 0x010010fb    ] };
+
+    include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "mess" {
+    include "ge(basic)"
+
+    name[Group1]= "Georgia - MESS";
+
+    key <TLDE> { [ 0x010010ed, backslash, quoteleft ] };
+    key <AE01> { [ 1, exclam, apostrophe ] };
+    key <AE02> { [ 2, at, asciitilde ] };
+    key <AE03> { [ 3, 0x01002116, numbersign ]	};
+    key <AE04> { [ 4, dollar, EuroSign ] };
+    key <AE05> { [ 5, percent ]	};
+    key <AE06> { [ 6, asciicircum ] };
+    key <AE07> { [ 7, ampersand, section ] };
+    key <AE08> { [ 8, asterisk, degree ] };
+    key <AE09> { [ 9, parenleft ] };
+    key <AE10> { [ 0, parenright, 0x01002014 ] };
+    key <AE11> { [ minus, underscore, 0x01002013 ] };
+    key <AE12> { [ 0x010010df,	plus, bar   ]  };
+    key <AD01> { [ 0x010010e5,	Q ] };
+    key <AD02> { [ 0x010010ec,	W ] };
+    key <AD03> { [ 0x010010d4,	E ] };
+    key <AD04> { [ 0x010010e0,	R ] };
+    key <AD05> { [ 0x010010e2,	T ] };
+    key <AD06> { [ 0x010010e7,	Y ] };
+    key <AD07> { [ 0x010010e3,	U ] };
+    key <AD08> { [ 0x010010d8,	I, 0x010010f2 ] };
+    key <AD09> { [ 0x010010dd,	O ] };
+    key <AD10> { [ 0x010010de,	P ] };
+    key <AD11> { [ 0x010010e8,	bracketleft,  guillemotleft  ] };
+    key <AD12> { [ 0x010010e6,	bracketright, guillemotright ] };
+    key <AC01> { [ 0x010010d0,	A, 0x010010fa ] };
+    key <AC02> { [ 0x010010e1,	S ] };
+    key <AC03> { [ 0x010010d3,	D ] };
+    key <AC04> { [ 0x010010e4,	F, 0x010010f6 ] };
+    key <AC05> { [ 0x010010d2,	G, 0x010010f9 ] };
+    key <AC06> { [ 0x010010f0,	H, 0x010010f1 ]	};
+    key <AC07> { [ 0x010010ef,	J, 0x010010f7 ] };
+    key <AC08> { [ 0x010010d9,	K ] };
+    key <AC09> { [ 0x010010da,	L ] };
+    key <AC10> { [ 0x010010d7,0x0100201e ] };
+    key <AC11> { [ 0x010010e9,0x0100201c ] };
+    key <BKSL> { [ equal, slash, bar ]	};
+
+    key <LSGT> { [ guillemotleft, guillemotright ] };
+    key <AB01> { [ 0x010010d6, Z, 0x010010f5 ] };
+    key <AB02> { [ 0x010010ee, X, 0x010010f4 ]	};
+    key <AB03> { [ 0x010010ea,	C ] };
+    key <AB04> { [ 0x010010d5,	V, 0x010010f3 ]	};
+    key <AB05> { [ 0x010010d1,	B ] };
+    key <AB06> { [ 0x010010dc,	N, 0x010010fc ] };
+    key <AB07> { [ 0x010010db,	M ] };
+    key <AB08> { [ comma, semicolon, less ] };
+    key <AB09> { [ period, colon, greater ] };
+    key <AB10> { [ 0x010010eb, question, 0x010010fb ] };
+
+    include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "ru" {
+
+    name[Group1]= "Georgia - Russian";
+
+    key <TLDE> { [ asciicircum, asciitilde      ]       };
+    key <AE01> { [         1,    exclam         ]       };
+    key <AE02> { [         2,    at             ]       };
+    key <AE03> { [         3,    numbersign     ]       };
+    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            ]       };
+
+    key <LSGT> { [ guillemotleft,guillemotright ]       };
+    key <AB01> { [ 0x010010ed,  z               ]       };
+    key <AB02> { [ 0x010010e9,  x               ]       };
+    key <AB03> { [ 0x010010e1,  c               ]       };
+    key <AB04> { [ 0x010010db,  v               ]       };
+    key <AB05> { [ 0x010010d8,  b               ]       };
+    key <AB06> { [ 0x010010e2,  n               ]       };
+    key <AB07> { [ 0x010010e5,  m               ]       };
+    key <AB08> { [ 0x010010d1,  less            ]       };
+    key <AB09> { [ 0x010010e7,  greater         ]       };
+    key <AB10> { [ 0x010010f0,  question        ]       };
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "os" {
+
+    include "ru(os_legacy)"
+
+    name[Group1]= "Georgia - Ossetian";
+
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/gh b/xorg-server/xkbdata.src/symbols/gh
new file mode 100644
index 000000000..5faf87a88
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/gh
@@ -0,0 +1,96 @@
+// $XKeyboardConfig$
+//
+partial default alphanumeric_keys  
+xkb_symbols "basic" {
+
+    include "us"
+
+    name[Group1]= "Ghana";
+
+    key <AE04> { [          4, 0x010020B5,     dollar,       cent ] };
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "akan" {
+    include "gh(basic)"
+
+    name[Group1]= "Ghana - Akan";
+
+    key <AD01> { [ 0x0100025B, 0x01000190,          q,          Q ] };
+    key <AB02> { [ 0x01000254, 0x01000186,          x,          X ] }; 
+};
+
+partial alphanumeric_keys
+xkb_symbols "ga" {
+    include "gh(basic)"
+
+    name[Group1]= "Ghana - Ga";
+
+    key <AD01> { [ 0x0100025B, 0x01000190,          q,          Q ] };
+    key <AB02> { [ 0x01000254, 0x01000186,          x,          X ] }; 
+    key <AB03> { [ 0x0100014B, 0x0100014A,          c,          C ] }; 
+};
+
+partial alphanumeric_keys
+xkb_symbols "ewe" {
+    include "gh(basic)"
+
+    name[Group1]= "Ghana - Ewe";
+
+    key <AD01> { [ 0x0100025B, 0x01000190,          q,          Q ] };
+    key <AB03> { [ 0x0100014B, 0x0100014A,          c,          C ] }; 
+    key <AD11> { [ 0x01000254, 0x01000186,  braceleft,  braceleft ] }; 
+    key <AD12> { [ 0x0100028B, 0x010001B2, braceright, braceright ] }; 
+    key <AD13> { [ 0x01000256, 0x01000189,  backslash,  backslash ] };
+    key <AC07> { [ 0x01000192, 0x01000191,          j,          J ] };
+    key <AC05> { [          g,          G, 0x01000263, 0x01000194 ] };
+ 
+};
+
+partial alphanumeric_keys
+xkb_symbols "fula" {
+    include "gh(basic)"
+
+    name[Group1]= "Ghana - Fula";
+
+    key <AD01> { [ 0x01000071, 0x01000051,          q,          Q ] };
+    key <AD02> { [ udiaeresis, Udiaeresis,          w,          W ] };
+    key <AD03> { [          e,          E,   EuroSign,	     cent ] };
+    key <AD11> { [ 0x010001B4, 0x010001B3,bracketleft,  braceleft ] };
+    key <AD12> { [     gcaron,     Gcaron,bracketright, braceright] };
+    key <AC03> { [ 0x01000257, 0x0100018A,         d,           D ] };
+    key <AC10> { [ 0x01000131, 0x01000130, semicolon,       colon ] };
+    key <AC11> { [ 0x010001DD, 0x0100018E,apostrophe,    quotedbl ] };
+    key <AB01> { [ 0x01000272, 0x0100019D,         z,           Z ] };
+    key <AB07> { [     ntilde,     Ntilde,         m,           M ] };
+    key <AB09> { [   ccedilla,   Ccedilla,    period,     greater ] };
+    key <AB10> { [   scedilla,   Scedilla,     slash,    question ] };
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "hausa" {
+    include "gh(fula)"
+
+    name[Group1]= "Ghana - Hausa";
+};
+
+partial alphanumeric_keys
+xkb_symbols "generic" {
+    include "gh(basic)"
+
+    name[Group1]= "Ghana - Multilingual";
+
+    key <AD03> { [          e,	        E, 0x0100025b, 0x01000190 ] };
+    key <AB03> { [          c,          C, 0x01000254, 0x01000186 ] };
+    key <AC03> { [          d,          D, 0x01000256, 0x01000189 ] };
+    key <AC04> { [          f,          F, 0x01000192, 0x01000191 ] };
+    key <AC05> { [          g,          G, 0x01000263, 0x01000194 ] };
+    key <AB06> { [          n,          N, 0x0100014b, 0x0100014a ] };
+    key <AB01> { [          z,          Z, 0x010001B6, 0x010001B5 ] };
+    key <AB04> { [          v,          V, 0x0100028B, 0x010001B2 ] };
+	key <AE04> { [          4,     dollar, 0x010020B5,       cent ] };
+    include "level3(ralt_switch)"
+
+};
diff --git a/xorg-server/xkbdata.src/symbols/gn b/xorg-server/xkbdata.src/symbols/gn
new file mode 100644
index 000000000..fb47bfe4b
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/gn
@@ -0,0 +1,63 @@
+// $XKeyboardConfig$
+
+// based on us_intl keyboard map file and a Sinhala keyboard map
+// version 0.3
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    name[Group1]="Guinea";
+
+    key <AE01>	{ [0x010007F1, 0x010007C1 ]	};
+    key <AE02>	{ [0x010007EB, 0x010007C2 ]	};
+    key <AE03>	{ [0x010007F5, 0x010007C3,  numbersign,     sterling ]	};
+    key <AE04>	{ [0x010007F4, 0x010007C4,  0x01002E1C,       dollar ]	};
+    key <AE05>	{ [ parenleft, 0x010007C5,  0x01002E1D				 ]	};
+    key <AE06>	{ [     minus, 0x010007C6,         bar				 ]	};
+    key <AE07>	{ [0x010007EC, 0x010007C7,       grave				 ]	};
+    key <AE08>	{ [0x010007FA, 0x010007C8,   backslash				 ]	};
+    key <AE09>	{ [0x010007ED, 0x010007C9, asciicircum,    plusminus ]	};
+    key <AE10>	{ [0x010007EE, 0x010007C0,          at,       degree ]	};
+    key <AE11>	{ [parenright ]	};
+    key <AE12>	{ [     equal,       plus,   braceright ]	};
+
+    key <AD01>	{ [0x010007CA ]	};
+    key <AD02>	{ [0x010007E0, less ]	};
+    key <AD03>	{ [0x010007CD,0x010007CB ]	};
+    key <AD04>	{ [0x010007D9,0x010007DA ]	};
+    key <AD05>	{ [0x010007D5 ]	};
+    key <AD06>	{ [0x010007E6,0x010007E7 ]	};
+    key <AD07>	{ [0x010007CE,0x010007F6 ]	};
+    key <AD08>	{ [0x010007CC ]	};
+    key <AD09>	{ [0x010007D0,0x010007CF ]	};
+    key <AD10>	{ [0x010007D4 ]	};
+    key <AD11>	{ [0x010007F3 ] };
+    key <AD12>	{ [    dollar,   sterling,     currency ]	};
+
+    key <AC01>	{ [0x010007EB ]	};
+    key <AC02>	{ [0x010007DB ]	};
+    key <AC03>	{ [0x010007D8 ]	};
+    key <AC04>	{ [0x010007DD ]	};
+    key <AC05>	{ [0x010007DC,0x010007F7 ]	};
+    key <AC06>	{ [0x010007E4 ]	};
+    key <AC07>	{ [0x010007D6,0x010007E8 ]	};
+    key <AC08>	{ [0x010007DE ]	};
+    key <AC09>	{ [0x010007DF,0x010007EA ]	};
+    key <AC10>	{ [0x010007E1 ]	};
+    key <AC11>	{ [0x010007EF, 0x010007F8, percent ]	};
+    key <TLDE>	{ [0x010007EC, asciitilde,     notsign ]	};
+
+    key <BKSL>	{ [0x010007D1, asterisk ]	};
+    key <AB01>	{ [0x010007E5 ]	};
+    key <AB02>	{ [0x0100060C ]	};
+    key <AB03>	{ [0x010007D7,0x010007E9 ]	};
+    key <AB04>	{ [0x010007E2 ]	};
+    key <AB05>	{ [0x010007D3 ] };
+    key <AB06>	{ [0x010007E3,0x010007D2 ]	};
+    key <AB07>	{ [0x010007F8,0x0100061F ] };
+    key <AB08>	{ [0x0100061B ]	};
+    key <AB09>	{ [0x0100060C,      slash ]	};
+    key <AB10>	{ [0x010007F9] };
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/gr b/xorg-server/xkbdata.src/symbols/gr
new file mode 100644
index 000000000..5d7efc1a3
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/gr
@@ -0,0 +1,192 @@
+// $XKeyboardConfig$
+
+// Hellenic keyboard map for X.org
+//
+// 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" {
+	name[Group1] = "Greece";
+	include "eurosign(e)"
+	include "eurosign(5)"
+	include "gr(simple)"
+	include "kpdl(comma)"
+	key <AB01> { [       NoSymbol,       NoSymbol,          U037D,          U03FF ] };
+	key <AB02> { [       NoSymbol,       NoSymbol,     rightarrow,      leftarrow ] };
+	key <AB03> { [       NoSymbol,       NoSymbol,      copyright                 ] };
+	key <AB04> { [       NoSymbol,       NoSymbol,          U03D6                 ] };
+	key <AB05> { [       NoSymbol,       NoSymbol,          U03D0                 ] };
+	key <AB06> { [       NoSymbol,       NoSymbol,          U0374,          U0375 ] };
+	key <AB07> { [       NoSymbol,       NoSymbol,          U03FB,          U03FA ] };
+	key <AB08> { [       NoSymbol,       NoSymbol,  guillemotleft                 ] };
+	key <AB09> { [       NoSymbol,       NoSymbol, guillemotright, periodcentered ] };
+	key <AC03> { [       NoSymbol,       NoSymbol,      downarrow,        uparrow ] };
+	key <AC04> { [       NoSymbol,       NoSymbol,          U03D5                 ] };
+	key <AC05> { [       NoSymbol,       NoSymbol,          U03DD,          U03DC ] };
+	key <AC07> { [       NoSymbol,       NoSymbol,          U037C,          U03FE ] };
+	key <AC08> { [       NoSymbol,       NoSymbol,          U03DF,          U03DE ] };
+	key <AC09> { [       NoSymbol,       NoSymbol,          U03F2,          U03F9 ] };
+	key <AC10> { [       NoSymbol,       NoSymbol,     dead_acute,     dead_psili ] };
+	key <AC11> { [       NoSymbol,       NoSymbol,     dead_grave,     dead_dasia ] };
+	key <AD01> { [       NoSymbol,       NoSymbol, periodcentered                 ] };
+	key <AD02> { [       NoSymbol,       NoSymbol,          U03DB,          U03DA ] };
+	key <AD04> { [       NoSymbol,       NoSymbol,     registered,          U03F1 ] };
+	key <AD07> { [       NoSymbol,       NoSymbol,          U03D1,          U03F4 ] };
+	key <AD08> { [       NoSymbol,       NoSymbol,          U037B,          U03FD ] };
+	key <AD10> { [       NoSymbol,       NoSymbol,          U03E1,          U03E0 ] };
+	key <AD11> { [       NoSymbol,       NoSymbol,     dead_tilde,    dead_macron ] };
+	key <AD12> { [       NoSymbol,       NoSymbol,      dead_iota,     dead_breve ] };
+	key <AE01> { [       NoSymbol,       NoSymbol,       NoSymbol,    onesuperior ] };
+	key <AE02> { [       NoSymbol,       NoSymbol,        onehalf,    twosuperior ] };
+	key <AE03> { [       NoSymbol,       NoSymbol,       sterling,  threesuperior ] };
+	key <AE04> { [       NoSymbol,       NoSymbol,     onequarter,  threequarters ] };
+	key <AE07> { [       NoSymbol,       NoSymbol,          U03F0                 ] };
+	key <AE10> { [       NoSymbol,       NoSymbol,         degree                 ] };
+};
+
+partial alphanumeric_keys alternate_group
+xkb_symbols "simple" {
+
+    include "gr(bare)"
+
+    name[Group1] = "Greece - Simple";
+
+    key <TLDE> { [        grave,  asciitilde ] }; // ` ~
+    key <AE01> { [            1,      exclam ] }; // 1 !
+    key <AE02> { [            2,          at ] }; // 2 @
+    key <AE03> { [            3,  numbersign ] }; // 3 #
+    key <AE04> { [            4,      dollar ] }; // 4 $
+    key <AE05> { [            5,     percent ] }; // 5 %
+    key <AE06> { [            6, asciicircum ] }; // 6 ^
+    key <AE07> { [            7,   ampersand ] }; // 7 &
+    key <AE08> { [            8,    asterisk ] }; // 8 *
+    key <AE09> { [            9,   parenleft ] }; // 9 (
+    key <AE10> { [            0,  parenright ] }; // 0 )
+    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 ] }; // \ |
+
+    include "kpdl(comma)"
+};
+
+hidden partial alphanumeric_keys alternate_group
+xkb_symbols "bare" {
+
+    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 ] }; // « »
+};
+
+// ===========================================================================================
+// Greek - Extended                                                                          |
+// ===========================================================================================
+//
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲�����������┓
+// │ ~   │ !   │ @   │ #   │ $   │ %   │ ^   │ &   │ *   │ (   │ )   │ _   │ +   ┃Backspace  ┃
+// │ `   │ 1   │ 2   │ 3 £ │ 4   │ 5 € │ 6   │ 7   │ 8   │ 9   │ 0 ° │ - ± │ =   ┃           ┃
+// ┢�����┷�┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺�┳���������┫
+// ┃       ┃ :   │ Σ   │ Ε   │ Ρ   │ Τ   │ Υ   │ Θ   │ Ι   │ Ο   │ Π   │ {   │ }   ┃Enter    ┃
+// ┃Tab    ┃ ; · │ ς   │ ε € │ � ® │ τ   │ υ   │ θ   │ ι   │ ο   │ π   │ [   │ ]   ┃         ┃
+// ┣�������┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓        ┃
+// ┃Caps    ┃ Α   │ Σ   │ Δ   │ Φ   │ Γ   │ Η   │ Ξ   │ Κ   │ Λ   │ ¨   │ "   │ |   ┃        ┃
+// ┃Lock    ┃ α   │ σ   │ δ   │ φ   │ γ   │ η   │ ξ   │ κ   │ λ   │ ´   │ '   │ \   ┃        ┃
+// ┣�������┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷�����┻��������┫
+// ┃       ┃ »   │ Ζ   │ Χ   │ Ψ   │ Ω   │ Β   │ �   │ Μ   │ <   │ >   │ ?   ┃               ┃
+// ┃Shift  ┃ «   │ ζ   │ χ   │ ψ © │ ω   │ β   │ ν   │ μ   │ , « │ . » │ /   ┃Shift          ┃
+// ┣�������╋�����┷�┳���┷���┱─┴─────┴─────┴─────┴─────┴─────┴──┲��┷����┳┷�����┻┳�������┳������┫
+// ┃       ┃       ┃       ┃                                  ┃       ┃       ┃       ┃      ┃
+// ┃Ctrl   ┃Meta   ┃Alt    ┃              Space               ┃AltGr  ┃Meta   ┃Menu   ┃Ctrl  ┃
+// ┗�������┻�������┻�������┹──────────────────────────────────┺�������┻�������┻�������┻������┛
+
+partial alphanumeric_keys alternate_group
+xkb_symbols "extended" {
+
+    include "gr(simple)"
+
+    name[Group1] = "Greece - Extended";
+
+    key.type[Group1] = "THREE_LEVEL";
+
+    key <AE03> { [ NoSymbol, NoSymbol,       sterling ] }; // £
+    key <AE10> { [ NoSymbol, NoSymbol,         degree ] }; // °
+    key <AE11> { [ NoSymbol, NoSymbol,      plusminus ] }; // ±
+
+    key <AD01> { [ NoSymbol, NoSymbol, periodcentered ] }; // ·
+    key <AD04> { [ NoSymbol, NoSymbol,     registered ] }; // ®
+
+    key <AB03> { [ NoSymbol, NoSymbol,      copyright ] }; // ©
+    key <AB08> { [ NoSymbol, NoSymbol,  guillemotleft ] }; // «
+    key <AB09> { [ NoSymbol, NoSymbol, guillemotright ] }; // »
+
+    include "level3(ralt_switch)"
+    include "eurosign(5)"
+    include "eurosign(e)"
+};
+
+partial alphanumeric_keys alternate_group
+xkb_symbols "polytonic" {
+
+    include "gr(extended)"
+
+    name[Group1] = "Greece - Polytonic";
+
+    key.type[Group1] = "THREE_LEVEL";
+
+    key <AD11> { [ dead_tilde, dead_diaeresis, dead_macron ] }; // ~ ¨ ¯
+    key <AD12> { [  dead_iota,     VoidSymbol,  dead_breve ] }; // ͺ   ˘
+
+    key <AC10> { [ dead_acute, dead_psili  ] }; // ´ ̓ 
+    key <AC11> { [ dead_grave, dead_dasia  ] }; // ` Ì”
+};
+
+partial alphanumeric_keys alternate_group
+xkb_symbols "nodeadkeys" {
+
+    include "gr(simple)"
+
+    name[Group1] = "Greece - Eliminate dead keys";
+
+    key <AC10> { [ semicolon, colon ] }; // ; :
+};
diff --git a/xorg-server/xkbdata.src/symbols/group b/xorg-server/xkbdata.src/symbols/group
new file mode 100644
index 000000000..eaa6858c6
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/group
@@ -0,0 +1,321 @@
+// $XKeyboardConfig$
+// $Xorg: group,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
+// using the group(switch) map, the right alt key temporarily chooses 
+// the second keyboard group (until it is released).
+//
+// $XFree86: xc/programs/xkbcomp/symbols/group,v 3.9 2003/12/30 13:26:25 pascal Exp $
+partial modifier_keys 
+xkb_symbols "switch" {
+    key <RALT>	{ 	
+	symbols[Group1]= [	Mode_switch, Multi_key 	],
+	virtualMods= AltGr
+    };
+};
+
+// using the group(lswitch) map, the left alt key temporarily chooses
+// the second keyboard group (until it is released).
+//
+partial modifier_keys 
+xkb_symbols "lswitch" {
+    key <LALT>	{ 	
+	symbols[Group1]= [	Mode_switch, Multi_key 	],
+	virtualMods= AltGr
+    };
+};
+
+
+// using the group(win_switch) map, both Windows'logo keys temporarily
+// choose the second keyboard group (until release).  If you use this
+// map, you would declare you keyboard as pc101 or pc102 instead of
+// pc104 or pc105.
+partial modifier_keys
+xkb_symbols "win_switch" {
+    include "group(lwin_switch)"
+    include "group(rwin_switch)"
+};
+
+// using the group(lwin_switch) map, the left Windows' logo key
+// temporarily chooses the second keyboard group (until it is
+// released).  If you use this map, you would declare you keyboard as
+// pc101 or pc102 instead of pc104 or pc105.
+partial modifier_keys
+xkb_symbols "lwin_switch" {
+  key <LWIN> {
+    symbols[Group1] = [ Mode_switch, Multi_key ],
+    virtualMods= AltGr
+    };
+};
+
+// using the group(rwin_switch) map, the right Windows' logo key
+// temporarily chooses the second keyboard group (until it is
+// released).  If you use this map, you would declare you keyboard as
+// pc101 or pc102 instead of pc104 or pc105.
+partial modifier_keys
+xkb_symbols "rwin_switch" {
+  key <RWIN> {
+    symbols[Group1] = [ Mode_switch, Multi_key ],
+    virtualMods= AltGr
+    };
+};
+
+// Right Ctrl key temporary chooses the second keyboard group.
+// Needed mainly for Canadian keyboard
+partial modifier_keys
+xkb_symbols "rctrl_switch" {
+    key <RCTL>  {
+        symbols[Group1]= [ Mode_switch ]
+    };
+};
+
+// using the group(toggle) map, pressing the right alt key switches to
+// the next sequential group (until the next explicit group change).
+partial modifier_keys 
+xkb_symbols "toggle" {
+    virtual_modifiers AltGr;
+    key <RALT>	{	
+	symbols[Group1]= [	ISO_Next_Group	],
+	virtualMods= AltGr
+    };
+};
+
+// using the group(shifts_toggle) map, pressing both shift keys together
+// locks the next or previous sequential keyboard group 
+// (depending on which shift is pressed first - right or left, 
+// correspongingly)
+partial modifier_keys 
+xkb_symbols "shifts_toggle" {
+    key <LFSH>	{	[	Shift_L,	ISO_Prev_Group ]	};
+    key <RTSH>	{	[	Shift_R,	ISO_Next_Group ]	};
+};
+
+// using the group(ctrl_shift_toggle) map, pressing:
+//     Control_L+Shift_L locks the previous group
+//     Control_R+Shift_R locks the next group
+// If you have two groups and group wrap is enabled, the effect is
+// indistinguishable.
+partial modifier_keys 
+xkb_symbols "ctrl_shift_toggle" {
+    key <LFSH> {
+	type[Group1]="PC_CONTROL_LEVEL2",
+	symbols[Group1]= [ Shift_L,	ISO_Prev_Group ]
+    };
+    key <RTSH> {
+	type[Group1]="PC_CONTROL_LEVEL2",
+	symbols[Group1]= [ Shift_R,	ISO_Next_Group ]
+    };
+    key <LCTL>	{	[	Control_L,	ISO_Prev_Group ]	};
+    key <RCTL>	{	[	Control_R,	ISO_Next_Group ]	};
+};
+
+// using the group(lctrl_lshift_toggle) map, pressing:
+//     Control_L+Shift_L locks the next group
+// If you have two groups and group wrap is enabled, the effect is
+// indistinguishable.
+partial modifier_keys 
+xkb_symbols "lctrl_lshift_toggle" {
+    key <LFSH> {
+	type[Group1]="PC_CONTROL_LEVEL2",
+	symbols[Group1]= [ Shift_L,	ISO_Next_Group ]
+    };
+    key <LCTL>	{	[	Control_L,	ISO_Next_Group ]	};
+};
+
+// using the group(shift_caps_toggle) map, pressing:
+//     Shift+Caps Lock toggles group
+partial modifier_keys
+xkb_symbols "shift_caps_toggle" {
+    key	<CAPS> {	[  Caps_Lock,		ISO_Next_Group	]	};
+};
+
+// using the group(shift_caps_switch) map, pressing:
+// Caps Lock selects the first group
+// Shift+Caps Lock selects the last group
+partial modifier_keys
+xkb_symbols "shift_caps_switch" {
+    key <CAPS> { [ ISO_First_Group, ISO_Last_Group ] };
+};
+
+// using the group(ctrl_alt_toggle) map, pressing:
+//     Control_L+Alt_L locks the previous group
+//     Control_R+Alt_R locks the next group
+// If you have two groups and group wrap is enabled, the effect is
+// indistinguishable.
+partial modifier_keys 
+xkb_symbols "ctrl_alt_toggle" {
+    virtual_modifiers Alt;
+    key <LALT> {
+	type[Group1]="PC_CONTROL_LEVEL2",
+	symbols[Group1]= [ NoSymbol,	ISO_Prev_Group ],
+	virtualMods= Alt
+    };
+    key <RALT> {
+	type[Group1]="PC_CONTROL_LEVEL2",
+	symbols[Group1]= [ NoSymbol,	ISO_Next_Group ],
+	virtualMods= Alt
+    };
+    key <LCTL> {
+	type[Group1]="PC_ALT_LEVEL2",
+	symbols[Group1]= [ Control_L,	ISO_Prev_Group ]
+    };
+    key <RCTL> {
+	type[Group1]="PC_ALT_LEVEL2",
+	symbols[Group1]= [ Control_R,	ISO_Next_Group ]
+    };
+};
+
+// using the group(alt_shift_toggle) map, pressing:
+//     Shift_L+Alt_L locks the previous group
+//     Shift_R+Alt_R locks the next group
+// If you have two groups and group wrap is enabled, the effect is
+// indistinguishable.
+partial modifier_keys 
+xkb_symbols "alt_shift_toggle" {
+    virtual_modifiers Alt;
+    key <LALT> {
+	symbols[Group1]= [ NoSymbol,	ISO_Prev_Group ],
+	virtualMods= Alt
+    };
+    key <RALT> {
+	symbols[Group1]= [ NoSymbol,	ISO_Next_Group ],
+	virtualMods= Alt
+    };
+    key <LFSH> {
+	type[Group1]="PC_ALT_LEVEL2",
+	symbols[Group1]= [ Shift_L,	ISO_Prev_Group ]
+    };
+    key <RTSH> {
+	type[Group1]="PC_ALT_LEVEL2",
+	symbols[Group1]= [ Shift_R,	ISO_Next_Group ]
+    };
+};
+
+// using the group(menu_toggle) map, pressing:
+//     Menu key toggles groups
+//     Shift+Menu acts as Menu
+partial modifier_keys
+xkb_symbols "menu_toggle" {
+    key	<MENU> {	[  ISO_Next_Group,	 Menu	]	};
+};
+
+// using the group(lwin_toggle) map, pressing the left Windows' logo key
+// toggles groups.  If you use this map, you would declare you keyboard
+// as pc101 or pc102 instead of pc104 or pc105.
+partial modifier_keys
+xkb_symbols "lwin_toggle" {
+  virtual_modifiers AltGr;
+  key <LWIN> {
+    virtualMods= AltGr,
+    symbols[Group1] = [ ISO_Next_Group ]
+    };
+};
+
+// using the group(rwin_toggle) map, pressing the right Windows' logo key
+// toggles groups.  If you use this map, you would declare you keyboard
+// as pc101 or pc102 instead of pc104 or pc105.
+partial modifier_keys
+xkb_symbols "rwin_toggle" {
+  virtual_modifiers AltGr;
+  key <RWIN> {
+    virtualMods= AltGr,
+    symbols[Group1] = [ ISO_Next_Group ]
+    };
+};
+
+// Both Ctrls pressed together toggle group
+partial modifier_keys
+xkb_symbols "ctrls_toggle" {
+  virtual_modifiers LControl, RControl;
+    key <LCTL> {
+	type[Group1]="PC_RCONTROL_LEVEL2",
+	symbols[Group1]= [ NoSymbol,	ISO_Prev_Group ],
+	virtualMods= LControl
+    };
+    key <RCTL> {
+	type[Group1]="PC_LCONTROL_LEVEL2",
+	symbols[Group1]= [ NoSymbol,	ISO_Next_Group ],
+	virtualMods= RControl
+    };
+};
+
+// Both Alts pressed together toggle group
+partial modifier_keys
+xkb_symbols "alts_toggle" {
+  virtual_modifiers LAlt, RAlt;
+    key <LALT> {
+	type[Group1]="PC_RALT_LEVEL2",
+	symbols[Group1]= [ NoSymbol,	ISO_Prev_Group ],
+	virtualMods= LAlt
+    };
+    key <RALT> {
+	type[Group1]="PC_LALT_LEVEL2",
+	symbols[Group1]= [ NoSymbol,	ISO_Next_Group ],
+	virtualMods= RAlt
+    };
+};
+
+// Left Shift key toggles group
+partial modifier_keys
+xkb_symbols "lshift_toggle" {
+  virtual_modifiers AltGr;
+    key <LFSH>	{	
+	symbols[Group1]= [	ISO_Next_Group	],
+	virtualMods= AltGr
+    };
+};
+
+// Right Shift key toggles group
+partial modifier_keys
+xkb_symbols "rshift_toggle" {
+  virtual_modifiers AltGr;
+    key <RTSH>	{	
+	symbols[Group1]= [	ISO_Next_Group	],
+	virtualMods= AltGr
+    };
+};
+
+// Left Alt key toggles group
+partial modifier_keys
+xkb_symbols "lalt_toggle" {
+  virtual_modifiers AltGr;
+    key <LALT>	{	
+	symbols[Group1]= [	ISO_Next_Group	],
+	virtualMods= AltGr
+    };
+};
+
+// Left Ctrl key toggles group
+partial modifier_keys
+xkb_symbols "lctrl_toggle" {
+  virtual_modifiers AltGr;
+    key <LCTL>	{	
+	symbols[Group1]= [	ISO_Next_Group	],
+	virtualMods= AltGr
+    };
+};
+
+// Right Ctrl key toggles group
+partial modifier_keys
+xkb_symbols "rctrl_toggle" {
+  virtual_modifiers AltGr;
+    key <RCTL>	{	
+	symbols[Group1]= [	ISO_Next_Group	],
+	virtualMods= AltGr
+    };
+};
+
+// using the group(alt_caps_toggle) map, pressing:
+//     Alt+Caps Lock toggles group
+//     Caps Lock toggles caps lock
+partial modifier_keys
+xkb_symbols "alt_caps_toggle" {
+    key        <CAPS> {
+       type="PC_ALT_LEVEL2",
+       symbols[Group1]= [  Caps_Lock,  ISO_Next_Group]
+    };
+};
+
+partial hidden modifier_keys
+xkb_symbols "olpc" {
+  key <I219>  { [ ISO_Next_Group, ISO_Prev_Group ] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.am
new file mode 100644
index 000000000..6bcd4da3e
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.am
@@ -0,0 +1,4 @@
+symbolsdir = $(xkb_base)/symbols/hp_vndr
+
+dist_symbols_DATA = \
+us
diff --git a/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in
new file mode 100644
index 000000000..e37fe49a5
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in
@@ -0,0 +1,367 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = symbols/hp_vndr
+DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(symbolsdir)"
+dist_symbolsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_symbols_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+symbolsdir = $(xkb_base)/symbols/hp_vndr
+dist_symbols_DATA = \
+us
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/hp_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  symbols/hp_vndr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_symbolsDATA: $(dist_symbols_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_symbolsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  $(dist_symbolsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+
+uninstall-dist_symbolsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(symbolsdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_symbolsDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_symbolsDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_symbolsDATA uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/symbols/hp_vndr/us b/xorg-server/xkbdata.src/symbols/hp_vndr/us
new file mode 100644
index 000000000..18ce8aeae
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/hr b/xorg-server/xkbdata.src/symbols/hr
new file mode 100644
index 000000000..61c6eae18
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/hr
@@ -0,0 +1,76 @@
+// $XKeyboardConfig$
+//
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    name[Group1]="Croatia";
+
+    include "rs(latin)"
+
+    // Redefine these keys to match XFree86 Croatian layout
+    key <AE01> { [         1,     exclam,   asciitilde,   dead_tilde ] };
+    key <AE03> { [         3, numbersign,  asciicircum, dead_circumflex ] };
+    key <AE05> { [         5,    percent,       degree, dead_abovering ] };
+    key <AE07> { [         7,      slash,        grave,   dead_grave ] };
+    key <AB10> { [     minus, underscore, dead_belowdot, dead_abovedot ] };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "us" {
+
+    name[Group1]= "Croatia - US keyboard with Croatian letters";
+
+    include "us"
+
+    key <AD01> { [    any,    any,	backslash	        ] };
+    key <AD02> { [    any,    any,	bar      	        ] };
+    key <AD03> { [    any,    any, 	EuroSign 	        ] };
+    key <AD06> { [    any,    any,	z,		Z       ] };
+    key <AD11> { [    any,    any, 	scaron,		Scaron  ] };
+    key <AD12> { [    any,    any, 	dstroke, 	Dstroke ] };
+    key <AC04> { [    any,    any,	bracketleft             ] };
+    key <AC05> { [    any,    any,	bracketright            ] };
+    key <AC08> { [    any,    any, 	lstroke                 ] };
+    key <AC09> { [    any,    any,	Lstroke                 ] };
+    key <AC10> { [    any,    any,	ccaron,		Ccaron  ] };
+    key <AC11> { [    any,    any, 	cacute,		Cacute  ] };
+    key <LSGT> { [    any,    any, 	bar			] };
+    key <AB01> { [    any,    any,	y,		Y       ] };
+    key <AB04> { [    any,    any,	at                      ] };
+    key <AB05> { [    any,    any,	braceleft               ] };
+    key <AB06> { [    any,    any,	braceright              ] };
+    key <AB07> { [    any,    any,	section                 ] };
+    key <AB08> { [    any,    any, 	semicolon               ] };
+    key <AB09> { [    any,    any, 	colon			] };
+    key <AB10> { [    any,    any, 	minus,    underscore  	] };
+    key <BKSL> { [    any,    any,	zcaron,	    Zcaron      ] };
+
+    include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "alternatequotes" {
+
+    name[Group1]= "Croatia - Use guillemets for quotes";
+
+    include "rs(latinalternatequotes)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "unicode" {
+
+    name[Group1]= "Croatia - Use Croatian digraphs";
+
+    include "rs(latinunicode)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "unicodeus" {
+
+    name[Group1]= "Croatia - US keyboard with Croatian digraphs";
+
+    include "rs(latinunicodeyz)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/hu b/xorg-server/xkbdata.src/symbols/hu
new file mode 100644
index 000000000..428009818
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/hu
@@ -0,0 +1,425 @@
+// New style XKB layout for some widely used Hungarian keyboard layouts
+//
+// Based on old style 'xkb/symbols/hu"
+//
+// $XKeyboardConfig$
+// (C) 2002-2004 Soós Péter <sp@osb.hu>
+//
+// Permission is granted to anyone to use, distribute and modify
+// this file in any way, provided that the above copyright notice
+// is left intact and the author of the modification summarizes
+// the changes in this header.
+//
+// This file is distributed without any expressed or implied warranty.
+//
+// Changes:
+//  2004-04-17 - Moved to new style (only Unicode based layouts)
+//             - Added consistent dead key support
+//             - Fixed abovedot
+//             - Added adiaeresis
+//             - Added EuroSign and cent symbol
+
+
+// Default layout
+default partial
+xkb_symbols "basic" {
+    include "hu(102_qwertz_comma_dead)"
+    name[Group1] = "Hungary";
+};
+
+// Standard layout
+partial
+xkb_symbols "standard" {
+    include "hu(102_qwertz_comma_dead)"
+    name[Group1] = "Hungary - Standard";
+};
+
+// Standard layout without dead key support
+partial
+xkb_symbols "nodeadkeys" {
+    include "hu(102_qwertz_comma_nodead)"
+    name[Group1] = "Hungary - Eliminate dead keys";
+};
+
+// Qwerty layout
+partial
+xkb_symbols "qwerty" {
+    include "hu(101_qwerty_comma_dead)"
+    name[Group1] = "Hungary - qwerty";
+};
+
+// Main layouts
+
+// 101_qwertz_comma_dead
+// 101 key qwertz layout
+// with decimal comma on keypad
+// and with dead key support
+partial
+xkb_symbols "101_qwertz_comma_dead" {
+    name[Group1] = "Hungary - 101/qwertz/comma/Dead keys";
+    include "latin"
+    include "hu(def_101)"
+    include "hu(def_qwertz)"
+    include "kpdl(comma)"
+    include "hu(def_dead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 101_qwertz_comma_nodead
+// 101 key qwertz layout
+// with decimal comma on keypad
+// and without dead key support
+partial
+xkb_symbols "101_qwertz_comma_nodead" {
+    name[Group1] = "Hungary - 101/qwertz/comma/Eliminate dead keys";
+    include "latin"
+    include "hu(def_101)"
+    include "hu(def_qwertz)"
+    include "kpdl(comma)"
+    include "hu(def_nodead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 101_qwertz_dot_dead
+// 101 key qwertz layout
+// with decimal dot on keypad
+// and with dead key support
+partial
+xkb_symbols "101_qwertz_dot_dead" {
+    name[Group1] = "Hungary - 101/qwertz/dot/Dead keys";
+    include "latin"
+    include "hu(def_101)"
+    include "hu(def_qwertz)"
+    include "hu(def_dot)"
+    include "hu(def_dead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 101_qwertz_dot_nodead
+// 101 key qwertz layout
+// with decimal dot on keypad
+// and without dead key support
+partial
+xkb_symbols "101_qwertz_dot_nodead" {
+    name[Group1] = "Hungary - 101/qwertz/dot/Eliminate dead keys";
+    include "latin"
+    include "hu(def_101)"
+    include "hu(def_qwertz)"
+    include "hu(def_dot)"
+    include "hu(def_nodead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 101_qwerty_comma_dead
+// 101 key qwerty layout
+// with decimal comma on keypad
+// and with dead key support
+partial
+xkb_symbols "101_qwerty_comma_dead" {
+    name[Group1] = "Hungary - 101/qwerty/comma/Dead keys";
+    include "latin"
+    include "hu(def_101)"
+    include "hu(def_qwerty)"
+    include "kpdl(comma)"
+    include "hu(def_dead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 101_qwerty_comma_nodead
+// 101 key qwerty layout
+// with decimal comma on keypad
+// and without dead key support
+partial
+xkb_symbols "101_qwerty_comma_nodead" {
+    name[Group1] = "Hungary - 101/qwerty/comma/Eliminate dead keys";
+    include "latin"
+    include "hu(def_101)"
+    include "hu(def_qwerty)"
+    include "kpdl(comma)"
+    include "hu(def_nodead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 101_qwerty_dot_dead
+// 101 key qwerty layout
+// with decimal dot on keypad
+// and with dead key support
+partial
+xkb_symbols "101_qwerty_dot_dead" {
+    name[Group1] = "Hungary - 101/qwerty/dot/Dead keys";
+    include "latin"
+    include "hu(def_101)"
+    include "hu(def_qwerty)"
+    include "hu(def_dot)"
+    include "hu(def_dead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 101_qwerty_dot_nodead
+// 101 key qwerty layout
+// with decimal dot on keypad
+// and without dead key support
+partial
+xkb_symbols "101_qwerty_dot_nodead" {
+    name[Group1] = "Hungary - 101/qwerty/dot/Eliminate dead keys";
+    include "latin"
+    include "hu(def_101)"
+    include "hu(def_qwerty)"
+    include "hu(def_dot)"
+    include "hu(def_nodead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 102_qwertz_comma_dead
+// 102 key qwertz layout
+// with decimal comma on keypad
+// and with dead key support
+partial
+xkb_symbols "102_qwertz_comma_dead" {
+    name[Group1] = "Hungary - 102/qwertz/comma/Dead keys";
+    include "latin"
+    include "hu(def_102)"
+    include "hu(def_qwertz)"
+    include "kpdl(comma)"
+    include "hu(def_dead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 102_qwertz_comma_nodead
+// 102 key qwertz layout
+// with decimal comma on keypad
+// and without dead key support
+partial
+xkb_symbols "102_qwertz_comma_nodead" {
+    name[Group1] = "Hungary - 102/qwertz/comma/Eliminate dead keys";
+    include "latin"
+    include "hu(def_102)"
+    include "hu(def_qwertz)"
+    include "kpdl(comma)"
+    include "hu(def_nodead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 102_qwertz_dot_dead
+// 102 key qwertz layout
+// with decimal dot on keypad
+// and with dead key support
+partial
+xkb_symbols "102_qwertz_dot_dead" {
+    name[Group1] = "Hungary - 102/qwertz/dot/Dead keys";
+    include "latin"
+    include "hu(def_102)"
+    include "hu(def_qwertz)"
+    include "hu(def_dot)"
+    include "hu(def_dead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 102_qwertz_dot_nodead
+// 102 key qwertz layout
+// with decimal dot on keypad
+// and without dead key support
+partial
+xkb_symbols "102_qwertz_dot_nodead" {
+    name[Group1] = "Hungary - 102/qwertz/dot/Eliminate dead keys";
+    include "latin"
+    include "hu(def_102)"
+    include "hu(def_qwertz)"
+    include "hu(def_dot)"
+    include "hu(def_nodead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 102_qwerty_comma_dead
+// 102 key qwerty layout
+// with decimal comma on keypad
+// and with dead key support
+partial
+xkb_symbols "102_qwerty_comma_dead" {
+    name[Group1] = "Hungary - 102/qwerty/comma/Dead keys";
+    include "latin"
+    include "hu(def_102)"
+    include "hu(def_qwerty)"
+    include "kpdl(comma)"
+    include "hu(def_dead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 102_qwerty_comma_nodead
+// 102 key qwerty layout
+// with decimal comma on keypad
+// and without dead key support
+partial
+xkb_symbols "102_qwerty_comma_nodead" {
+    name[Group1] = "Hungary - 102/qwerty/comma/Eliminate dead keys";
+    include "latin"
+    include "hu(def_102)"
+    include "hu(def_qwerty)"
+    include "kpdl(comma)"
+    include "hu(def_nodead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 102_qwerty_dot_dead
+// 102 key qwerty layout
+// with decimal dot on keypad
+// and with dead key support
+partial
+xkb_symbols "102_qwerty_dot_dead" {
+    name[Group1] = "Hungary - 102/qwerty/dot/Dead keys";
+    include "latin"
+    include "hu(def_102)"
+    include "hu(def_qwerty)"
+    include "hu(def_dot)"
+    include "hu(def_dead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 102_qwerty_dot_nodead
+// 102 key qwerty layout
+// with decimal dot on keypad
+// and without dead key support
+partial
+xkb_symbols "102_qwerty_dot_nodead" {
+    name[Group1] = "Hungary - 102/qwerty/dot/Eliminate dead keys";
+    include "latin"
+    include "hu(def_102)"
+    include "hu(def_qwerty)"
+    include "hu(def_dot)"
+    include "hu(def_nodead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// Partial layouts
+
+// def_102:
+// The standard Hungarian 102 key layout
+hidden partial alphanumeric_keys
+xkb_symbols "def_102" {
+    key <TLDE>  { [            0,      section,           notsign                  ] };
+    key <LSGT>  { [       iacute,       Iacute,              less,         greater ] };
+
+};
+
+// def_101:
+// An alternative layout for 101 key keyboards
+hidden partial alphanumeric_keys
+xkb_symbols "def_101" {
+    key <TLDE>  { [       iacute,       Iacute,                 0,         section ] };
+    key <LSGT>  { [         less,      greater                                     ] };
+};
+
+// def_qwertz:
+// The standard Hungaryan qwertz layout
+hidden partial alphanumeric_keys
+xkb_symbols "def_qwertz" {
+    key <AD06>  { [            z,            Z                                     ] };
+    key <AB01>  { [            y,            Y,           greater                  ] };
+};
+
+
+// def_qwerty:
+// The qwerty layout for people who familiar with the standard US layout
+hidden partial alphanumeric_keys
+xkb_symbols "def_qwerty" {
+    key <AD06>  { [            y,            Y                                     ] };
+    key <AB01>  { [            z,            Z,           greater                  ] };
+};
+
+// def_dot: 	 
+// The Hungarian standard is the comma on the keypad not decimal dot, 	 
+// but programmers hate it 	 
+hidden partial keypad_keys 	 
+xkb_symbols "def_dot" { 	 
+    key <KPDL>  { [    KP_Delete,   KP_Decimal                                     ] }; 	 
+}; 	 
+ 
+
+// def_dead:
+// Dead keys support part
+hidden partial alphanumeric_keys
+xkb_symbols "def_dead" {
+    key <AE01>  { [            1,   apostrophe,        asciitilde,      dead_tilde ] };
+    key <AE02>  { [            2,     quotedbl,        dead_caron,           caron ] };
+    key <AE03>  { [            3,         plus,       asciicircum, dead_circumflex ] };
+    key <AE04>  { [            4,       exclam,        dead_breve,           breve ] };
+    key <AE05>  { [            5,      percent,    dead_abovering,          degree ] };
+    key <AE06>  { [            6,        slash,       dead_ogonek,          ogonek ] };
+    key <AE07>  { [            7,        equal,             grave,      dead_grave ] };
+    key <AE08>  { [            8,    parenleft,     dead_abovedot,        abovedot ] };
+    key <AE09>  { [            9,   parenright,        dead_acute,           acute ] };
+    key <AE10>  { [   odiaeresis,   Odiaeresis,  dead_doubleacute,     doubleacute ] };
+    key <AE11>  { [   udiaeresis,   Udiaeresis,    dead_diaeresis,       diaeresis ] };
+    key <AE12>  { [       oacute,       Oacute,      dead_cedilla,         cedilla ] };
+};
+
+// def_nodead:
+// Without dead keys support
+hidden partial alphanumeric_keys
+xkb_symbols "def_nodead" {
+    key <AE01>  { [            1,   apostrophe,        asciitilde                  ] };
+    key <AE02>  { [            2,     quotedbl,             caron                  ] };
+    key <AE03>  { [            3,         plus,       asciicircum                  ] };
+    key <AE04>  { [            4,       exclam,             breve                  ] };
+    key <AE05>  { [            5,      percent,            degree                  ] };
+    key <AE06>  { [            6,        slash,            ogonek                  ] };
+    key <AE07>  { [            7,        equal,             grave                  ] };
+    key <AE08>  { [            8,    parenleft,          abovedot                  ] };
+    key <AE09>  { [            9,   parenright,             acute                  ] };
+    key <AE10>  { [   odiaeresis,   Odiaeresis,       doubleacute                  ] };
+    key <AE11>  { [   udiaeresis,   Udiaeresis,         diaeresis                  ] };
+    key <AE12>  { [       oacute,       Oacute,           cedilla                  ] };
+};
+
+
+// def_common:
+// The common part of all Hungarian layout above
+hidden partial alphanumeric_keys
+xkb_symbols "def_common" {
+    key <AD01>  { [            q,            Q,         backslash                  ] };
+    key <AD02>  { [            w,            W,               bar                  ] };
+    key <AD07>  { [            u,            U,          EuroSign                  ] };
+    key <AD08>  { [            i,            I,            Iacute,          iacute ] };
+    key <AD11>  { [ odoubleacute, Odoubleacute,          division                  ] };
+    key <AD12>  { [       uacute,       Uacute,          multiply                  ] };
+
+    key <AC01>  { [            a,            A,        adiaeresis,      Adiaeresis ] };
+    key <AC02>  { [            s,            S,           dstroke                  ] };
+    key <AC03>  { [            d,            D,           Dstroke                  ] };
+    key <AC04>  { [            f,            F,       bracketleft                  ] };
+    key <AC05>  { [            g,            G,      bracketright                  ] };
+    key <AC07>  { [            j,            J,            iacute,          Iacute ] };
+    key <AC08>  { [            k,            K,           lstroke                  ] };
+    key <AC09>  { [            l,            L,           Lstroke                  ] };
+    key <AC10>  { [       eacute,       Eacute,            dollar,            cent ] };
+    key <AC11>  { [       aacute,       Aacute,            ssharp                  ] };
+
+    key <BKSL>  { [ udoubleacute, Udoubleacute,          currency                  ] };
+
+    key <AB02>  { [            x,            X,        numbersign                  ] };
+    key <AB03>  { [            c,            C,         ampersand                  ] };
+    key <AB04>  { [            v,            V,                at                  ] };
+    key <AB05>  { [            b,            B,         braceleft                  ] };
+    key <AB06>  { [            n,            N,        braceright                  ] };
+    key <AB07>  { [            m,            M,              less                  ] };
+    key <AB08>  { [        comma,     question,         semicolon                  ] };
+    key <AB09>  { [       period,        colon,           greater                  ] };
+    key <AB10>  { [        minus,   underscore,          asterisk                  ] };
+
+};
diff --git a/xorg-server/xkbdata.src/symbols/ie b/xorg-server/xkbdata.src/symbols/ie
new file mode 100644
index 000000000..22d857247
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/ie
@@ -0,0 +1,411 @@
+// $XKeyboardConfig$
+
+// $XFree86: xc/programs/xkbcomp/symbols/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] = "Ireland";
+
+    //
+    // 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.
+
+    include "compose(rwin)"
+};
+
+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] = "Ireland - CloGaelach";
+
+    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 "UnicodeExpert" {
+
+// This should eventually be a "Unicode Expert" layout like the Mac one.
+
+    name[Group1] = "Ireland - UnicodeExpert";
+
+    //
+    // 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)"
+
+    include "compose(rwin)"
+};
+
+//
+// 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.
+
+partial alphanumeric_keys
+xkb_symbols "ogam" {
+
+    name[Group1] = "Ireland - 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
+
+    include "compose(rwin)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "ogam_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] = "Ireland - 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
+    include "level3(ralt_switch)"
+
+    // 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 }; 
+
+    include "compose(rwin)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/il b/xorg-server/xkbdata.src/symbols/il
new file mode 100644
index 000000000..1d49bc874
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/il
@@ -0,0 +1,252 @@
+// $XKeyboardConfig$
+
+// based on a keyboard map from an 'xkb/symbols/il' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/il,v 1.3 2003/01/07 02:03:44 dawes Exp $
+
+// 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 default alphanumeric_keys 
+xkb_symbols "basic" {
+    // uses the kbd layout in use in Israel.
+
+    name[Group1]= "Israel";
+
+    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.type[Group1] = "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,    bar,  0x10005bb	]}; // Qubuts    
+};
+
+
+// nikud patter based on Dekel Tsur's Hebrew mapping for LyX
+partial alphanumeric_keys 
+xkb_symbols "lyx" {
+    name[Group1]= "Israel - lyx";
+
+    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
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "phonetic" {
+
+    // uses the phonetic layout from old Slackware 'il.map' file
+
+    name[Group1]= "Israel - 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	]	};
+};
+
+// The 'Biblical Hebrew' keyboard layout as defined by Tiro for use with the
+// 'SBL Hebrew' font was added 2006.11.13 by Sebastian J. Bronner
+// <waschtl@sbronner.com>.  Its primary features (as compared to the lyx layout)
+// are that the consonants are in the Israeli standard positions, that a great
+// multitude of glyphs can be input directly from the keyboard, and that it is
+// the closest thing to a standard layout a theologian can hope for.
+// Documentation (including printable keyboard tables), SBL Hebrew font, and
+// keyboard layout for Windows are available at
+// http://www.sbl-site.org/Resources/Resources_BiblicalFonts.aspx.
+//
+// It is of interest that the 'basic' layout defined first in this file (as
+// ships with x.org disagrees in the non-consonant characters that the Tiro-
+// layout claims to be the Israeli standard.  Tiros apparent diligence in the
+// PDF-documentation accompanying the keyboard-layout-files lead me to put
+// greater stock in their claim than in this file.  Therefore, the 'biblical'
+// layout below does not include 'il(basic)' but redoes the _whole_ thing from
+// scratch.
+
+partial alphanumeric_keys 
+xkb_symbols "biblical" {
+	name[Group1]= "Israel - Biblical Hebrew (Tiro)";
+	key.type = "FOUR_LEVEL_SEMIALPHABETIC";
+
+	key <TLDE> { [ U05C3, U05AE, semicolon, asciitilde ] };
+	key <AE01> { [ 1,     U05A9, VoidSymbol, exclam ] };
+	key <AE02> { [ 2,     U0599, VoidSymbol, at ] };
+	key <AE03> { [ 3,     U0592, VoidSymbol, numbersign ] };
+	key <AE04> { [ 4,     U05AF, NewSheqelSign, dollar ] };
+	key <AE05> { [ 5,     VoidSymbol, U200D, percent ] };
+	key <AE06> { [ 6,     U05B9, U200C, asciicircum ] };
+	key <AE07> { [ 7,     U05BF, U034F, ampersand ] };
+	key <AE08> { [ 8,     U05C2, U200E, asterisk ] };
+	key <AE09> { [ 9,     U05C1, U200F, parenright ] };
+	key <AE10> { [ 0,     U059D, U25CC, parenleft ] };
+	key <AE11> { [ U05BE, U05A0, minus, underscore ] };
+	key <AE12> { [ equal, U05BC, VoidSymbol, plus ] };
+
+	key <AD01> { [ U0307, U05C4, U0308, slash ] };
+	key <AD02> { [ U05F3, U05AC, U05F4, apostrophe ] };
+	key <AD03> { [ hebrew_qoph, U05AB, U20AC ] };
+	key <AD04> { [ hebrew_resh, U059F ] };
+	key <AD05> { [ hebrew_aleph, U0593 ] };
+	key <AD06> { [ hebrew_tet, U059E ] };
+	key <AD07> { [ hebrew_waw, U059C, U05F0 ] };
+	key <AD08> { [ hebrew_finalnun, U05A1 ] };
+	key <AD09> { [ hebrew_finalmem, U0595 ] };
+	key <AD10> { [ hebrew_pe, U0594 ] };
+	key <AD11> { [ bracketright, U0597, VoidSymbol, braceright ] };
+	key <AD12> { [ bracketleft, U0598, VoidSymbol, braceleft ] };
+	key <BKSL> { [ U05C0, U05A8, backslash, bar ] };
+
+	key <AC01> { [ hebrew_shin, U05BD ] };
+	key <AC02> { [ hebrew_dalet, U05B0 ] };
+	key <AC03> { [ hebrew_gimel, U05BB ] };
+	key <AC04> { [ hebrew_kaph, U05B4 ] };
+	key <AC05> { [ hebrew_ayin, U05B1 ] };
+	key <AC06> { [ hebrew_yod, U05B6, U05F2 ] };
+	key <AC07> { [ hebrew_chet, U05B5, U05F1 ] };
+	key <AC08> { [ hebrew_lamed, U05B3 ] };
+	key <AC09> { [ hebrew_finalkaph, U05B8, U05C7 ] };
+	key <AC10> { [ hebrew_finalpe, U05B2, VoidSymbol, colon ] };
+	key <AC11> { [ U059a, U05B7, comma, quotedbl ] };
+
+	key <AB01> { [ hebrew_zain, U05C5 ] };
+	key <AB02> { [ hebrew_samech, U05A4 ] };
+	key <AB03> { [ hebrew_bet, U05AA, U05A2 ] };
+	key <AB04> { [ hebrew_he, U05A6 ] };
+	key <AB05> { [ hebrew_nun, U05A5, U05C6 ] };
+	key <AB06> { [ hebrew_mem, U05A7 ] };
+	key <AB07> { [ hebrew_zade, U059B ] };
+	key <AB08> { [ hebrew_taw, U0591, VoidSymbol, greater ] };
+	key <AB09> { [ hebrew_finalzade, U0596, VoidSymbol, less ] };
+	key <AB10> { [ U05AD, U05A3, period, question ] };
+
+	key <SPCE> { [ space, space, thinspace, nobreakspace ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/in b/xorg-server/xkbdata.src/symbols/in
new file mode 100644
index 000000000..59e575de1
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/in
@@ -0,0 +1,1179 @@
+// $XKeyboardConfig$
+
+// This layout includes all Indian layouts, including:
+//     - Bengali
+//     - Gujarati 
+//     - Kannada 
+//     - Malayalam
+//     - Oriya 
+//     - Tamil
+//     - Telugu
+//     - Urdu
+
+// Links:
+// - Indic INSCRIPT keyboard layout diagrams:
+//     http://java.sun.com/products/jfc/tsc/articles/InputMethod/indiclayout.html
+// - Ekusheyr Shadhinota (Bengali layouts):
+//     http://ekushey.org/projects/shadhinota/index.html
+// - Microsoft Windows XP SP2: Indic Language Standards - an Introduction:
+//     http://www.bhashaindia.com/MSProducts/XpSp2/Articles/IndicLanguageStandards.aspx
+
+// based on a keyboard map from an 'xkb/symbols/dev' file
+
+// Devangari is the default. Kill me if I am wrong:)
+default partial alphanumeric_keys
+xkb_symbols "deva" {
+	// March 2004 -- David Holl <smyrph+dev_xkb@ece.wpi.edu>
+	name[Group1]="India";
+
+	key.type="FOUR_LEVEL";
+
+	key <TLDE> { [ U094a, U0912,   grave, asciitilde  ] };
+	key <AE01> { [ U0967, U090d,       1, exclam      ] };
+	key <AE02> { [ U0968, U0945,       2, at          ] };
+	// Shift+AE0[3-8] really need to return a macro of keys defined by
+	// INSCRIPT in place of the symbols that are here for now.  But this
+	// requires XKB to map 1 key into two to three other key presses.
+	key <AE03> { [ U0969, numbersign,  3, numbersign  ] };
+	key <AE04> { [ U096a, dollar,      4, dollar      ] };
+	key <AE05> { [ U096b, percent,     5, percent     ] };
+	key <AE06> { [ U096c, asciicircum, 6, asciicircum ] };
+	key <AE07> { [ U096d, ampersand,   7, ampersand   ] };
+	key <AE08> { [ U096e, asterisk,    8, asterisk    ] };
+	key <AE09> { [ U096f, parenleft,   9, parenleft   ] };
+	key <AE10> { [ U0966, parenright,  0, parenright  ] };
+	key <AE11> { [ minus, U0903, minus, underscore    ] };
+	key <AE12> { [ U0943, U090b, U0944, U0960 ] };
+
+	key <AD01> { [ U094c, U0914 ] };
+	key <AD02> { [ U0948, U0910 ] };
+	key <AD03> { [ U093e, U0906 ] };
+	key <AD04> { [ U0940, U0908, U0963, U0961 ] };
+	key <AD05> { [ U0942, U090a ] };
+	key <AD06> { [ U092c, U092d ] };
+	key <AD07> { [ U0939, U0919 ] };
+	key <AD08> { [ U0917, U0918, U095a ] };
+	key <AD09> { [ U0926, U0927 ] };
+	key <AD10> { [ U091c, U091d, U095b ] };
+	key <AD11> { [ U0921, U0922, U095c, U095d ] };
+	key <AD12> { [ U093c, U091e ] };
+	// I added \ / ? | for shell-convenience (file names and piping)
+	key <BKSL> { [ U0949, U0911, U005C, U007C ] };
+
+	key <AC01> { [ U094b, U0913 ] };
+	key <AC02> { [ U0947, U090f ] };
+	key <AC03> { [ U094d, U0905 ] };
+	key <AC04> { [ U093f, U0907, U0962, U090c ] };
+	key <AC05> { [ U0941, U0909 ] };
+	key <AC06> { [ U092a, U092b, NoSymbol, U095e ] };
+	key <AC07> { [ U0930, U0931 ] };
+	key <AC08> { [ U0915, U0916, U0958, U0959 ] };
+	key <AC09> { [ U0924, U0925 ] };
+	key <AC10> { [ U091a, U091b, U0952 ] };
+	key <AC11> { [ U091f, U0920, NoSymbol, U0951 ] };
+
+	key <AB01> { [ U0946, U090e, U0953 ] };
+	key <AB02> { [ U0902, U0901, NoSymbol, U0950 ] };
+	key <AB03> { [ U092e, U0923, U0954 ] };
+	key <AB04> { [ U0928, U0929 ] };
+	key <AB05> { [ U0935, U0934 ] };
+	key <AB06> { [ U0932, U0933 ] };
+	key <AB07> { [ U0938, U0936 ] };
+	key <AB08> { [ comma, U0937, U0970 ] };
+	key <AB09> { [ period, U0964, U0965, U093d ] };
+	// I added \ / ? | for shell-convenience (file names and piping)
+	key <AB10> { [ U092f, U095f, slash, question ] };
+
+	// space, space, Zero-Width-Non-Joiner (ZWNJ), Zero-Width-Joiner (ZWJ):
+	key <SPCE> { [ space, space, U200c, U200d ] };
+};
+
+//Name		:	Bolnagri (Combined)
+//Description	:	A phonetic keyboard layout for Devnagari(Hindi)
+//			http://www.indlinux.org/wiki/index.php/BolNagri
+//NOTE		: 	This is a combined map of bolnagri_matras and bolnagri_vowels.
+//Inspired by "devrom" keymap by Steve Smith for the windows tool "keyman"
+//Original Author :	Noah Levitt<nlevitt at columbia.edu>
+//Past Authors  : Pramod.R <pramodr at gmail.com> and Ravikant <ravikant at sarai.net>
+// Current Main.: G Karunakar <karunakar@sarai.net>
+
+partial alphanumeric_keys
+xkb_symbols "bolnagri" {
+     name[Group1] = "India - Hindi Bolnagri";
+     key.type="FOUR_LEVEL";
+    //Top Alphanumeric row
+    // Roman digits
+    key <TLDE>  { [   U0902,	U0901,		apostrophe, 	asciitilde ] }; // apostrophe: anusvara, candrabindu
+    key <AE01>  { [   1,	exclam,		U0967,		exclam	   ] };
+    key <AE02>  { [   2,	at,		U0968,		at	   ] };
+    key <AE03>  { [   3,    	numbersign, 	U0969,		numbersign ] };
+    key <AE04>  { [   4,	dollar,		U096A,		dollar     ] };
+    key <AE05>  { [   5,	percent,	U096B,		percent    ] };
+    key <AE06>  { [   6,	asciicircum,	U096C,		asciicircum ] };
+    key <AE07>  { [   7,	ampersand,	U096D,		ampersand  ] };
+    key <AE08>  { [   8,	asterisk,	U096E,		asterisk   ] };
+    key <AE09>  { [   9,	parenleft,	U096F,		parenleft  ] };
+    key <AE10>  { [   0,	parenright,	U0966,		parenright ] };
+    key <AE11>	{ [   minus,	underscore	     ] };
+    key <AE12>	{ [   equal,	plus		     ] };
+    key <BKSL>  { [   U0964,	U0965,		U007C,		U005C   ] }; //pipe : danda, double danda
+
+    //Q Row	
+    key <AD01>   { [   U200C, 	U200D   ] };  // Q: ZWNJ, ZWJ
+    key <AD02>   { [   U0935,  	U950	] };  // W: wa, OM
+    key <AD03>   { [   U0947,   U0948,	U090F,	U0910   ] };  // E: e, ai matras
+    key <AD04>   { [   U0930,	U0943  	] };  // R: ra, vocalic Ri
+    key <AD05>   { [   U0924,   U0925   ] };  // T: ta, tha
+    key <AD06>   { [   U092f,	U091E   ] };  // Y: ya, nya
+    key <AD07>   { [   U0941,   U0942,	U0909,	U090A   ] };  // U: u, uu matras
+    key <AD08>   { [   U093F,   U0940,	U0907,	U0908   ] };  // I: i, ii matras
+    key <AD09>   { [   U094B,   U094C,	U0913,	U0914   ] };  // O: o, au matras
+    key <AD10>   { [   U092A,   U092B   ] };  // P: pa, pha
+    key <AD11>   { [   bracketleft,   braceleft   ] };  
+    key <AD12>	 { [   bracketright, braceright   ] };
+    
+    //A Row
+    key <AC01>   { [   U093E,	 U0906,	U0905,	U0906  ] };   // A: aa
+    key <AC02>   { [   U0938,    U0937   ] };  // S: sa, ssa
+    key <AC03>   { [   U0926,    U0927   ] };  // D: da, dha
+    key <AC04>   { [   U091F,    U0920   ] };  // F: TA, THA
+    key <AC05>   { [   U0917,    U0918   ] };  // G: ga, gha
+    key <AC06>   { [   U0939,    U0903   ] };  // H: ha, visarg 
+    key <AC07>   { [   U091C,    U091D   ] };  // J: ja, jha
+    key <AC08>   { [   U0915,    U0916   ] };  // K: ka, kha
+    key <AC09>   { [   U0932,	 U0962   ] };  // L: la, vocalic L or lru matra`
+    key <AC10>   { [   semicolon, colon  ] }; 
+    key <AC11>   { [apostrophe, quotedbl ] };
+
+    //Z Row
+    key <AB01>   { [   U0936,	 U0945 	 ] };  // Z: sha, akaar candra
+    key <AB02>   { [   U094D,    U0949	 ] };  // X: halant, aakaar candra
+    key <AB03>   { [   U091A,    U091B   ] };  // C: ca, cha
+    key <AB04>   { [   U0921,    U0922   ] };  // V: da, dha
+    key <AB05>   { [   U092C,    U092D   ] };  // B: ba, bha
+    key <AB06>   { [   U0928,    U0923   ] };  // N: na, nha
+    key <AB07>   { [   U092E,    U093D,	U092E,	U093D   ] };  // M: ma, avagraha
+    key <AB08>   { [   comma,    U0970	 ] };// comma: comma, dev abbreviation sign
+    key <AB09>   { [   period,   U093C 	 ] };  // period: period, nukta
+    key <AB10>	 { [   slash,   question ] };
+
+   // begin modifier mappings
+//    modifier_map Shift  { Shift_L };
+//    modifier_map Lock   { Caps_Lock };
+//    modifier_map Control{ Control_L };
+//    modifier_map Mod3   { Mode_switch };
+    include "level3(ralt_switch)"
+};
+
+// based on a keyboard map from an 'xkb/symbols/ben' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/ben,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial alphanumeric_keys
+xkb_symbols "ben" {
+    name[Group1]= "India - Bengali";
+
+      // Mainly numbers.
+      key <AE01> { [      U09E7 		]	};
+      key <AE02> { [      U09E8 		]	};
+      key <AE03> { [      U09E9 		]	};
+      key <AE04> { [      U09EA 		]	};
+      key <AE05> { [      U09EB		]	};
+      key <AE06> { [      U09EC 		]	};
+      key <AE07> { [      U09ED	        ]	};
+      key <AE08> { [      U09EE 		]	};
+      key <AE09> { [      U09EF, parenleft	]	};
+      key <AE10> { [      U09E6, parenright	]	};
+      key <AE11> { [      minus, U0983 	]	};
+      key <AE12> { [      U098B, U09C3	]	};
+
+// Mainly long vowels
+
+      key <AD01> { [      U09CC,  U0994	]	};
+      key <AD02> { [      U09C8,  U0990	]	};
+      key <AD03> { [      U09BE,  U0986	]	};
+      key <AD04> { [      U09C0,  U0988	]	};
+      key <AD05> { [      U09C2,  U098A	]	};
+
+// Mainly voiced consonants
+
+      key <AD06> { [      U09AC,  U09AD	]	};
+      key <AD07> { [      U09B9,  U0999 ]	};
+      key <AD08> { [      U0997,  U0998 ]	};
+      key <AD09> { [      U09A6,  U09A7 ]	};
+      key <AD10> { [      U099C,  U099D ]	};
+      key <AD11> { [      U09A1, U09A2 	]	};
+      key <AD12> { [      U09BC, U099E 	]	};
+
+// Mainly short vowels
+      key <AC01> { [      U09CB,  U0993 ]	};
+      key <AC02> { [      U09C7,  U098F ]	};
+      key <AC03> { [      U09CD,  U0985 ]	};
+      key <AC04> { [      U09BF,  U0987 ]	};
+      key <AC05> { [      U09C1,  U0989 ]	};
+
+
+// Mainly unvoiced consonants
+
+      key <AC06> { [      U09AA,  U09AB ]	};
+      key <AC07> { [      U09B0,  U09DD ]	};
+      key <AC08> { [      U0995,  U0996 ]	};
+      key <AC09> { [      U09A4,  U09A5 ]	};
+      key <AC10> { [      U099A,  U099B ]	};
+      key <AC11> { [      U099F, U09A0 	]	};
+      key <BKSL> { [      U005C, U007C 	]	};
+
+      key <AB01> { [      z, Z  		]       };
+      key <AB02> { [      U0982,  U0981 ]       };
+      key <AB03> { [      U09AE,  U09A3 ]       };
+      key <AB04> { [      U09A8,  U09A8 ]       };
+      key <AB05> { [      U09AC,  U09AC ]       };
+      key <AB06> { [      U09B2,  U09B2 ]       };
+      key <AB07> { [      U09B8,  U09B6 ]       };
+      key <AB08> { [      comma,      U09B7 ]       };
+      key <AB09> { [      period,     U0964 ]       };
+      key <AB10> { [      U09DF,  U09AF	]       };
+};
+
+xkb_symbols "ben_probhat" {
+ name[Group1]= "India - Bengali Probhat";
+   key <ESC>  { [ Escape ] };
+
+// numbers
+   key <TLDE> { [ U200D, asciitilde   ] };
+   key <AE01> { [ U09E7, exclam       ] };
+   key <AE02> { [ U09E8, at           ] };
+   key <AE03> { [ U09E9, numbersign   ] };
+   key <AE04> { [ U09EA, U09F3    ] };
+   key <AE05> { [ U09EB, percent      ] };
+   key <AE06> { [ U09EC, asciicircum  ] };
+   key <AE07> { [ U09ED, U099E    ] };
+   key <AE08> { [ U09EE, U09CE    ] };
+   key <AE09> { [ U09EF, parenleft    ] };
+   key <AE10> { [ U09E6, parenright   ] };
+   key <AE11> { [ minus,     underscore   ] };
+   key <AE12> { [ equal,     plus         ] };
+   key <BKSP> { [ BackSpace               ] };
+
+// tab, q to ] 
+   key <TAB>  { [   Tab,  ISO_Left_Tab     ] };
+   key <AD01> { [   U09A6,  U09A7  ] };
+   key <AD02> { [   U09C2,  U098A  ] };
+   key <AD03> { [   U09C0,  U0988  ] };
+   key <AD04> { [   U09B0,  U09DC  ] };
+   key <AD05> { [   U099F,  U09A0  ] };
+   key <AD06> { [   U098F,  U0990  ] };
+   key <AD07> { [   U09C1,  U0989  ] };
+   key <AD08> { [   U09BF,  U0987  ] };
+   key <AD09> { [   U0993,  U0994  ] };
+   key <AD10> { [   U09AA,  U09AB  ] };
+   key <AD11> { [   U09C7,  U09C8  ] };
+   key <AD12> { [   U09CB,  U09CC  ] };
+   key <RTRN> { [   Return                 ] };
+
+// caps, a to ' 
+//   key <CAPS> { [   Caps_Lock              ] };
+   key <AC01> { [   U09BE,  U0985  ] };
+   key <AC02> { [   U09B8,  U09B7  ] };
+   key <AC03> { [   U09A1,  U09A2  ] };
+   key <AC04> { [   U09A4,  U09A5  ] };
+   key <AC05> { [   U0997,  U0998  ] };
+   key <AC06> { [   U09B9,  U0983  ] };
+   key <AC07> { [   U099C,  U099D  ] };
+   key <AC08> { [   U0995,  U0996  ] };
+   key <AC09> { [   U09B2,  U0982  ] };
+   key <AC10> { [   semicolon,  colon      ] };
+   key <AC11> { [   quoteright, quotedbl   ] };
+
+// shift, z to /
+//   key <LFSH> { [   Shift_L                ] };
+   key <AB01> { [   U09DF,  U09AF  ] };
+   key <AB02> { [   U09B6,  U09DD  ] };
+   key <AB03> { [   U099A,  U099B  ] };
+   key <AB04> { [   U0986,  U098B  ] };
+   key <AB05> { [   U09AC,  U09AD  ] };
+   key <AB06> { [   U09A8,  U09A3  ] };
+   key <AB07> { [   U09AE,  U0999  ] };
+   key <AB08> { [   comma,      U09C3  ] };
+   key <AB09> { [   U0964,  U0981  ] };
+   key <AB10> { [   U09CD,  question   ] };
+   key <BKSL> { [   U200C,  U0965  ] };
+
+//   key <LCTL> { [   Control_L              ] };
+//   key <SPCE> { [   space                  ] };
+
+//   modifier_map Shift  { Shift_L };
+//   modifier_map Lock   { Caps_Lock };
+//   modifier_map Control{ Control_L };
+
+};
+
+partial alphanumeric_keys 
+xkb_symbols "guj" {
+      name[Group1]= "India - Gujarati";
+
+      // Mainly numbers.
+      key <AE01> { [      U0AE7, U0A8D 	]	};
+      key <AE02> { [      U0AE8, U0AC5 	]	};
+      key <AE03> { [      U0AE9 	 	]	};
+      key <AE04> { [      U0AEA  	 	]	};
+      key <AE05> { [      U0AEB  	 	]	};
+      key <AE06> { [      U0AEC  	 	]	};
+      key <AE07> { [      U0AED 		]	};
+      key <AE08> { [      U0AEE  	 	]	};
+      key <AE09> { [      U0AEF, parenleft 	]	};
+      key <AE10> { [      U0AE6, parenright ]	};
+      key <AE11> { [      minus,     U0A83  ]	};
+      key <AE12> { [      U0A8B, U0AC3 	]	};
+
+// Mainly long vowels
+
+      key <AD01> { [      U0ACC, U0A94  ]	};
+      key <AD02> { [      U0AC8, U0A90  ]	};
+      key <AD03> { [      U0ABE, U0A86  ]	};
+      key <AD04> { [      U0AC0, U0A88  ]	};
+      key <AD05> { [      U0AC2, U0A8A  ]	};
+
+// Mainly voiced consonants
+
+      key <AD06> { [      U0AAC, U0AAD 	]	};
+      key <AD07> { [      U0AB9, U0A99 	]	};
+      key <AD08> { [      U0A97, U0A98 	]	};
+      key <AD09> { [      U0AA6, U0AA7 	]	};
+      key <AD10> { [      U0A9C, U0A9D 	]	};
+      key <AD11> { [      U0AA1, U0AA2 	]	};
+      key <AD12> { [      U0ABC, U0A9E 	]	};
+
+// Mainly short vowels
+      key <AC01> { [      U0ACB, U0A93	]	};
+      key <AC02> { [      U0AC7, U0A8F	]	};
+      key <AC03> { [      U0ACD, U0A85  ]	};
+      key <AC04> { [      U0ABF, U0A87  ]	};
+      key <AC05> { [      U0AC1, U0A89  ]	};
+
+// Mainly unvoiced consonants
+
+      key <AC06> { [      U0AAA, U0AAB 	]	};
+      key <AC07> { [      U0AB0, U0AB0 	]	};
+      key <AC08> { [      U0A95, U0A96 	]	};
+      key <AC09> { [      U0AA4, U0AA5 	]	};
+      key <AC10> { [      U0A9A, U0A9B 	]	};
+      key <AC11> { [      U0A9F, U0AA0 	]	};
+      key <BKSL> { [      U0AC9, U0A91 	]	};
+
+      key <AB01> { [      z        , Z		]       };
+      key <AB02> { [      U0A82, U0A81	]       };
+      key <AB03> { [      U0AAE, U0AA3  ]       };
+      key <AB04> { [      U0AA8, U0AA8   ]       };
+      key <AB05> { [      U0AB5, U0AB5   ]       };
+      key <AB06> { [      U0AB2, U0AB3  ]       };
+      key <AB07> { [      U0AB8, U0AB6  ]       };
+      key <AB08> { [      comma,     U0AB7  ]       };
+      key <AB09> { [      period,    U0964  ]       };
+      key <AB10> { [      U0AAF, question   ]       };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "kan" {
+
+    // 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]= "India - Kannada";
+
+    key <TLDE> { [  U0cca, U0c92	] };
+    key <AE01> { [  U0ce7			] };
+    key <AE02> { [  U0ce8			] };
+    key <AE03> { [  U0ce9			] };
+    key <AE04> { [  U0cea			] };
+    key <AE05> { [  U0ceb			] };
+    key <AE06> { [  U0cec			] };
+    key <AE07> { [  U0ced			] };
+    key <AE08> { [  U0cee			] };
+    key <AE09> { [  U0cef			] };
+    key <AE10> { [  U0ce6			] };
+    key <AE11> { [  U0c83			] };
+    key <AE12> { [  U0cc3, U0c8b	] };
+
+    key <AD01> { [  U0ccc, U0c94	] };
+    key <AD02> { [  U0cc8, U0c90	] };
+    key <AD03> { [  U0cbe, U0c86	] };
+    key <AD04> { [  U0cc0, U0c88	] };
+    key <AD05> { [  U0cc2, U0c8a	] };
+    key <AD06> { [  U0cac, U0cad	] };
+    key <AD07> { [  U0cb9, U0c99	] };
+    key <AD08> { [  U0c97, U0c98	] };
+    key <AD09> { [  U0ca6, U0ca7	] };
+    key <AD10> { [  U0c9c, U0c9d	] };
+    key <AD11> { [  U0ca1, U0ca2	] };
+    key <AD12> { [  U0cbc, U0c9e	] };
+ 
+    key <AC01> { [  U0ccb, U0c93	] };
+    key <AC02> { [  U0cc7, U0c8f	] };
+    key <AC03> { [  U0ccd, U0c85	] };
+    key <AC04> { [  U0cbf, U0c87	] };
+    key <AC05> { [  U0cc1, U0c89	] };
+    key <AC06> { [  U0caa, U0cab	] };
+    key <AC07> { [  U0cb0, U0cb1	] };
+    key <AC08> { [  U0c95, U0c96	] };
+    key <AC09> { [  U0ca4, U0ca5	] };
+    key <AC10> { [  U0c9a, U0c9b	] };
+    key <AC11> { [  U0c9f, U0ca0	] };
+
+    key <AB01> { [  U0cc6, U0c8e	] };
+    key <AB02> { [  U0c82			] };
+    key <AB03> { [  U0cae, U0ca3	] };
+    key <AB04> { [  U0ca8			] };
+    key <AB05> { [  U0cb5, U0cb4	] };
+    key <AB06> { [  U0cb2, U0cb3	] };
+    key <AB07> { [  U0cb8, U0cb6	] };
+    key <AB08> { [  comma     , U0cb7	] };
+    key <AB09> { [  period    				] };
+    key <AB10> { [  U0caf, U0040	] };
+
+    key <RALT> {
+	symbols[Group1] = [ Mode_switch, Multi_key ],
+	virtualMods = AltGr
+    };
+
+};
+
+// 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:
+
+partial alphanumeric_keys 
+xkb_symbols "mal" {
+
+    name[Group1] = "India - Malayalam";
+
+    //From grave to backslash (\)
+    
+    key <TLDE> { [ U0d4a , U0d12           ] };
+
+// svu: 
+// These lines were in former "mal" variant - 
+// but the digits are replaced with the ones from 'mal_plusnum' -
+// for the integrity of all Indian layouts
+//
+//    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 <AE01> { [ U0d67 ,      exclam ] };
+      key <AE02> { [ U0d68 ,          at ] };
+      key <AE03> { [ U0d69 ,  numbersign ] };
+      key <AE04> { [ U0d6a ,      dollar ] };
+      key <AE05> { [ U0d6b ,     percent ] };
+      key <AE06> { [ U0d6c , asciicircum ] };
+      key <AE07> { [ U0d6d ,   ampersand ] };
+      key <AE08> { [ U0d6e ,  asterisk ] };
+      key <AE09> { [ U0d6f ,   parenleft ] };
+      key <AE10> { [ U0d66 ,  parenright ] };
+
+    key <AE11> { [ minus      , U0d03           ] };
+    key <AE12> { [ U0d43 , U0d0b           ] };
+    key <BKSL>  { [U0200c, U05C ]};//bksl: ZWNJ 
+
+  
+    // From 'q' to right bracket (])
+    
+    key <AD01> { [ U0d4c , U0d14 ] };
+    key <AD02> { [ U0d48 , U0d10 ] };
+    key <AD03> { [ U0d3e , U0d06 ] };
+    key <AD04> { [ U0d40 , U0d08 ] };
+    key <AD05> { [ U0d42 , U0d0a ] };
+    key <AD06> { [ U0d2c , U0d2d ] };
+    key <AD07> { [ U0d39 , U0d19 ] };
+    key <AD08> { [ U0d17 , U0d18 ] };
+    key <AD09> { [ U0d26 , U0d27 ] };
+    key <AD10> { [ U0d1c , U0d1d ] };
+    key <AD11> { [ U0d21 , U0d22 ] };
+    key <AD12> { [ U0200d , U0d1e ] };
+
+    // From 'a' to apostrophe (')
+    
+    key <AC01> { [ U0d4b , U0d13 ] };
+    key <AC02> { [ U0d47 , U0d0f ] };
+    key <AC03> { [ U0d4d , U0d05 ] };
+    key <AC04> { [ U0d3f , U0d07 ] };
+    key <AC05> { [ U0d41 , U0d09 ] };
+    key <AC06> { [ U0d2a , U0d2b ] };
+    key <AC07> { [ U0d30 , U0d31 ] };
+    key <AC08> { [ U0d15 , U0d16 ] };
+    key <AC09> { [ U0d24 , U0d25 ] };
+    key <AC10> { [ U0d1a , U0d1b ] };
+    key <AC11> { [ U0d1f , U0d20 ] };
+    
+    // From 'z' to slash (/)
+    
+    key <AB01> { [ U0d46 , U0d0e ] };
+    key <AB02> { [ U0d02 , U200b ] };//X:ZWSP
+    key <AB03> { [ U0d2e , U0d23 ] };
+    key <AB04> { [ U0d28 ] };
+    key <AB05> { [ U0d35 , U0d34 ] };
+    key <AB06> { [ U0d32 , U0d33 ] };
+    key <AB07> { [ U0d38 , U0d36 ] };
+    key <AB08> { [ comma      , U0d37 ] };
+    key <AB09> { [ period     , U0200d ] };
+    key <AB10> { [ U0d2f , question   ] };
+
+};
+
+//Name		:	Lalitha
+//Description	:	A transliteration keyboard layout for Malayalam
+//Original Author :	Noah Levitt<nlevitt at columbia.edu>
+//Current Main  : 	Jinesh K.J<jinesh.k@gmail.com>, Swathantra Malayalam Computing (SMC)<smc-discuss@googlegroups.com>
+
+partial alphanumeric_keys
+xkb_symbols "mal_lalitha" {
+     name[Group1] = "India - Malayalam Lalitha";
+     key.type="FOUR_LEVEL";
+    //Top Alphanumeric row
+    // Roman digits
+    key <TLDE>  { [   U0D4D,	U0D02,		apostrophe, 	asciitilde ] }; // apostrophe: virama(chandrakala),anusvara
+    key <AE01>  { [   1,	exclam,	U0D67,		exclam	   ] };
+    key <AE02>  { [   2,	at,		U0D68,		at	   ] };
+    key <AE03>  { [   3,    	numbersign, 	U0D69,		numbersign ] };
+    key <AE04>  { [   4,	dollar,		U0D6A,		dollar     ] };
+    key <AE05>  { [   5,	percent,	U0D6B,		percent    ] };
+    key <AE06>  { [   6,	asciicircum,	U0D6C,		asciicircum ] };
+    key <AE07>  { [   7,	ampersand,	U0D6D,		ampersand  ] };
+    key <AE08>  { [   8,	asterisk,	U0D6E,		asterisk   ] };
+    key <AE09>  { [   9,	parenleft,	U0D6F,		parenleft  ] };
+    key <AE10>  { [   0,	parenright,	U0D66,		parenright ] };
+    key <AE11>	{ [   minus,	underscore	     ] };
+    key <AE12>	{ [   equal,	plus		     ] };
+    key <BKSL>  { [   U005C,	U007C,		U200C	] };//backslash:pipe,backslash,ZWNJ 
+
+    //Q Row	
+    key <AD01>   { [   U0D48,	U0D4C,	U0D10,	U0D14  ] }; // Q: ai and au matras 
+    key <AD02>   { [   U0D35	] };  // W: wa, OM
+    key <AD03>   { [   U0D46,   U0D47,	U0D0E,	U0D0F   ] };  // E: e,ee matras
+    key <AD04>   { [   U0D30,	U0D31,	U0D43,	U0D0B  	] };  // R: ra,rra, vocalic Ri
+    key <AD05>   { [   U0D24,   U0D25,	U0D1F,	U0D20   ] };  // T: tha, ttha,ta,tta
+    key <AD06>   { [   U0D2f    ] };  // Y: ya
+    key <AD07>   { [   U0D41,   U0D42,	U0D09,	U0D0A   ] };  // U: u, uu matras
+    key <AD08>   { [   U0D3F,   U0D40,	U0D07,	U0D08   ] };  // I: i, ii matras
+    key <AD09>   { [   U0D4A,   U0D4B,	U0D12,	U0D13   ] };  // O: o, oo matras
+    key <AD10>   { [   U0D2A   ] };  // P: pa
+    key <AD11>   { [   bracketleft,   braceleft   ] };//braceleft:   
+    key <AD12>	 { [   bracketright, braceright   ] };//braceright:
+    
+    //A Row
+    key <AC01>   { [   U0D3E,	 U0D05,	U0D06,	U0D05  ] };   // A: a,aa
+    key <AC02>   { [   U0D38,    U0D37   ] };  // S: sa, ssa
+    key <AC03>   { [   U0D26,    U0D27,	U0D21,	U0D22   ] };  // D: soft da,soft dda,hard da,hard dda,
+    key <AC04>   { [   U0D2B     ] };  // F: pha
+    key <AC05>   { [   U0D17,    U0D18   ] };  // G: ga, gha
+    key <AC06>   { [   U0D39,    U0D03   ] };  // H: ha, visarg 
+    key <AC07>   { [   U0D1C,    U0D1D   ] };  // J: ja, jha
+    key <AC08>   { [   U0D15,    U0D16   ] };  // K: ka, kha
+    key <AC09>   { [   U0D32,	 U0D33   ] };  // L: la, vocalic L or lru matra`
+    key <AC10>   { [   semicolon, colon  ] }; 
+    key <AC11>   { [apostrophe, quotedbl ] };
+
+    //Z Row
+    key <AB01>   { [   U0D34,	 U0D36 	 ] };  // Z: sha,zha
+    key <AB02>   { [   U0D4D,	 U200B  ] };  // X: chandrakala,ZWSP
+    key <AB03>   { [   U0D1A,    U0D1B   ] };  // C: ca, cha
+    key <AB04>   { [   U0D35,	 U200D  ] };  // V: va,ZWJ
+    key <AB05>   { [   U0D2C,    U0D2D   ] };  // B: ba, bha
+    key <AB06>   { [   U0D28,    U0D23,	U0D19,	U0D1E   ] };  // N: na, hard na,nga,nha
+    key <AB07>   { [   U0D2E,	 U0D02  ] };  // M: ma
+    key <AB08>   { [   comma,    U003C ] };// comma: comma
+    key <AB09>   { [   period, 	 U003E ] };  // period: period
+    key <AB10>	 { [   slash,   question ] };
+
+   // begin modifier mappings
+//    modifier_map Shift  { Shift_L };
+//    modifier_map Lock   { Caps_Lock };
+//    modifier_map Control{ Control_L };
+//    modifier_map Mod3   { Mode_switch };
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "ori" {
+    // Inscript layout for Oriya  
+    // Author: G Karunakar <karunakar@freedomink.org>
+    // Date: Wed Nov 13 18:16:19 IST 2002
+
+    name[Group1]= "India - Oriya";
+    
+    key <AE01> { [  U0b67			] };
+    key <AE02> { [  U0b68			] };
+    key <AE03> { [  U0b69			] };
+    key <AE04> { [  U0b6a			] };
+    key <AE05> { [  U0b6b			] };
+    key <AE06> { [  U0b6c			] };
+    key <AE07> { [  U0b6d			] };
+    key <AE08> { [  U0b6e			] };
+    key <AE09> { [  U0b6f			] };
+    key <AE10> { [  U0b66			] };
+    key <AE11> { [  U0b03			] };
+    key <AE12> { [  U0b43, U0b0b	] };
+
+    key <AD01> { [  U0b4c, U0b14	] };
+    key <AD02> { [  U0b48, U0b10	] };
+    key <AD03> { [  U0b3e, U0b06	] };
+    key <AD04> { [  U0b40, U0b08	] };
+    key <AD05> { [  U0b42, U0b0a	] };
+    key <AD06> { [  U0b2c, U0b2d	] };
+    key <AD07> { [  U0b39, U0b19	] };
+    key <AD08> { [  U0b17, U0b18	] };
+    key <AD09> { [  U0b26, U0b27	] };
+    key <AD10> { [  U0b1c, U0b1d	] };
+    key <AD11> { [  U0b21, U0b22	] };
+    key <AD12> { [  U0b3c, U0b1e	] };
+ 
+    key <AC01> { [  U0b4b, U0b13	] };
+    key <AC02> { [  U0b47, U0b0f	] };
+    key <AC03> { [  U0b4d, U0b05	] };
+    key <AC04> { [  U0b3f, U0b07	] };
+    key <AC05> { [  U0b41, U0b09	] };
+    key <AC06> { [  U0b2a, U0b2b	] };
+    key <AC07> { [  U0b30			] };
+    key <AC08> { [  U0b15, U0b16	] };
+    key <AC09> { [  U0b24, U0b25	] };
+    key <AC10> { [  U0b1a, U0b1b	] };
+    key <AC11> { [  U0b1f, U0b20	] };
+ 
+    key <AB02> { [  U0b02, U0b01	] };
+    key <AB03> { [  U0b2e, U0b23	] };
+    key <AB04> { [  U0b28			] };
+    key <AB05> { [  U0b35			] };
+    key <AB06> { [  U0b32, U0b33	] };
+    key <AB07> { [  U0b38, U0b36	] };
+    key <AB08> { [  comma     , U0b37	] };
+    key <AB09> { [  period    				] };
+    key <AB10> { [  U0b2f, U0040	] };
+
+    key <RALT> {
+	symbols[Group1] = [ Mode_switch, Multi_key ],
+	virtualMods = AltGr
+    };
+};
+
+// based on a keyboard map from an 'xkb/symbols/tml' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/tml,v 1.2 2002/11/22 04:03:28 dawes Exp $
+// INSCRIPT
+partial alphanumeric_keys 
+xkb_symbols "tam" {
+      name[Group1]= "India - Tamil";
+
+      key <TLDE> { [      U0BCA, U0B92	]	};
+
+      // Mainly numbers.
+      key <AE01> { [      U0BE7 		]	};
+      key <AE02> { [      U0BE8 		]	};
+      key <AE03> { [      U0BE9 		]	};
+      key <AE04> { [      U0BEA 		]	};
+      key <AE05> { [      U0BEB 		]	};
+      key <AE06> { [      U0BEC 		]	};
+      key <AE07> { [      U0BED        	]	};
+      key <AE08> { [      U0BEE 		]	};
+      key <AE09> { [      U0BEF, parenleft	]	};
+      key <AE10> { [      U0BF0, parenright	]	};
+      key <AE11> { [      U0BF1, U0B83  ]	};
+      key <AE12> { [      U0BF2, plus	] 	};
+
+// Mainly long vowels
+
+      key <AD01> { [      U0BCC,  U0B94 ]	};
+      key <AD02> { [      U0BC8,  U0B90 ]	};
+      key <AD03> { [      U0BBE,  U0B86 ]	};
+      key <AD04> { [      U0BC0,  U0B88 ]	};
+      key <AD05> { [      U0BC2,  U0B8A ]	};
+
+// Mainly voiced consonants
+
+      key <AD07> { [      U0BB9, U0B99	]	};
+      key <AD12> { [      U0B9E				]	};
+
+// Mainly short vowels
+      key <AC01> { [      U0BCB,  U0B93 ]	};
+      key <AC02> { [      U0BC7,  U0B8F ]	};
+      key <AC03> { [      U0BCD,  U0B85 ]	};
+      key <AC04> { [      U0BBF,  U0B87 ]	};
+      key <AC05> { [      U0BC1,  U0B89 ]	};
+
+// Mainly unvoiced consonants
+
+      key <AC06> { [      U0BAA 		]	};
+      key <AC07> { [      U0BB0,  U0BB1 ]	};
+      key <AC08> { [      U0B95 		]	};
+      key <AC09> { [      U0BA4 		]	};
+      key <AC10> { [      U0B9A 		]	};
+      key <AC11> { [      U0B9F 		]	};
+      key <BKSL> { [      U005C, U007C	]	};//backslash-bar  - Changed to Unicode
+
+      key <AB01> { [      U0BC6,  U0B8E	]	};
+      key <AB02> { [      U0B82   		]       };
+      key <AB03> { [      U0BAE,  U0BA3 ]       };
+      key <AB04> { [      U0BA8,  U0BA9 ]       };
+      key <AB05> { [      U0BB5,  U0BB4 ]       };
+      key <AB06> { [      U0BB2,  U0BB3 ]       };
+      key <AB07> { [      U0BB8		]       };
+      key <AB08> { [      comma,      U0BB7 ]       };
+      key <AB09> { [      period,     U0964 ]       };
+      key <AB10> { [      U0BAF,  question  ]       };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "tam_unicode" {
+
+// 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]= "India - Tamil Unicode";
+
+    // granthas
+    key <AE01> {  [ U0b83 ] } ;
+    key <AE03> {  [ U0b9c ] } ;
+    key <AE04> {  [ U0bb7 ] } ;
+    key <AE05> {  [ U0bb8 ] } ;
+    key <AE06> {  [ U0bb9 ] } ;
+	
+    // Qrow
+    key <AD01> {  [ U0b9e ] };
+    key <AD02> {  [ U0bb1 ] };
+    key <AD03> {  [ U0ba8 ] };
+    key <AD04> {  [ U0b9a ] };
+    key <AD05> {  [ U0bb5 ] };
+    key <AD06> {  [ U0bb2 ] };
+    key <AD07> {  [ U0bb0 ] };
+    key <AD08> {  [ U0bc8, U0b90 ] };
+    key <AD09> {  [ U0bca, U0bcb ] };
+    key <AD10> {  [ U0bbf, U0bc0 ] };
+    key <AD11> {  [ U0bc1, U0bc2 ] };
+
+    // Arow
+    key <AC01> { [ U0baf ] };
+    key <AC02> { [ U0bb3 ] };
+    key <AC03> { [ U0ba9 ] };
+    key <AC04> { [ U0b95 ] };
+    key <AC05> { [ U0baa ] };
+    key <AC06> { [ U0bbe, U0bb4 ] };
+    key <AC07> { [ U0ba4 ] };
+    key <AC08> { [ U0bae ] };
+    key <AC09> { [ U0b9f ] };
+    key <AC10> { [ U0bcd ] };
+    key <AC11> { [ U0b99 ] };
+    
+    // Zrow
+    key <AB01> { [ U0ba3 ]  };
+    key <AB02> { [ U0b92, U0b93 ]  };
+    key <AB03> { [ U0b89, U0b8a ]  };
+    key <AB04> { [ U0b8e, U0b8f ]  };
+    key <AB05> { [ U0bc6, U0bc7 ]  };
+    key <AB06> { [ U0b94, U0bcc ]  };
+    key <AB07> { [ U0b85, U0b86 ]  };
+    key <AB08> { [ U0b87, U0b88 ]  };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "tam_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]= "India - Tamil TSCII Typewriter";
+
+    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 "tam_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]= "India - Tamil TAB Typewriter";
+
+    // 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 "tel" {
+
+    // 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]= "India - Telugu";
+
+    key <TLDE> { [  U0c4a, U0c12	] };
+    key <AE01> { [  U0c67			] };
+    key <AE02> { [  U0c68			] };
+    key <AE03> { [  U0c69, numbersign	] };
+    key <AE04> { [  U0c6a, dollar		] };
+    key <AE05> { [  U0c6b, percent		] };
+    key <AE06> { [  U0c6c, asciicircum	] };
+    key <AE07> { [  U0c6d, ampersand	] };
+    key <AE08> { [  U0c6e, asterisk	] };
+    key <AE09> { [  U0c6f, parenleft	] };
+    key <AE10> { [  U0c66, parenright	] };
+    key <AE11> { [  U0c03, underscore	] };
+    key <AE12> { [  U0c43, U0c0b	] };
+    key <BKSP> { [  BackSpace			] };    
+ 
+    key <AD01> { [  U0c4c, U0c14	] };
+    key <AD02> { [  U0c48, U0c10	] };
+    key <AD03> { [  U0c3e, U0c06	] };
+    key <AD04> { [  U0c40, U0c08	] };
+    key <AD05> { [  U0c42, U0c0a	] };
+    key <AD06> { [  U0c2c, U0c2d	] };
+    key <AD07> { [  U0c39, U0c19	] };
+    key <AD08> { [  U0c17, U0c18	] };
+    key <AD09> { [  U0c26, U0c27	] };
+    key <AD10> { [  U0c1c, U0c1d	] };
+    key <AD11> { [  U0c21, U0c22	] };
+    key <AD12> { [  U0c1e			] };
+  
+    key <AC01> { [  U0c4b, U0c13	] };
+    key <AC02> { [  U0c47, U0c0f	] };
+    key <AC03> { [  U0c4d, U0c05	] };
+    key <AC04> { [  U0c3f, U0c07	] };
+    key <AC05> { [  U0c41, U0c09	] };
+    key <AC06> { [  U0c2a, U0c2b	] };
+    key <AC07> { [  U0c30, U0c31	] };
+    key <AC08> { [  U0c15, U0c16	] };
+    key <AC09> { [  U0c24, U0c25	] };
+    key <AC10> { [  U0c1a, U0c1b	] };
+    key <AC11> { [  U0c1f, U0c20	] };
+ 
+    key <AB01> { [  U0c46, U0c0e	] };
+    key <AB02> { [  U0c02, U0c01	] };
+    key <AB03> { [  U0c2e, U0c23	] };
+    key <AB04> { [  U0c28			] };
+    key <AB05> { [  U0c35			] };
+    key <AB06> { [  U0c32, U0c33	] };
+    key <AB07> { [  U0c38, U0c36	] };
+    key <AB08> { [  comma     , U0c37	] };
+    key <AB09> { [  period    				] };
+    key <AB10> { [  U0c2f, U0040	] };
+
+    key <RALT> {        
+        symbols[Group1] = [ Mode_switch, Multi_key ],
+        virtualMods = AltGr
+    };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "urd" {
+    include "pk(urd)"
+    name[Group1]= "India - Urdu";
+};
+
+// based on a keyboard map from an 'xkb/symbols/gur' file
+
+partial alphanumeric_keys
+xkb_symbols "guru" {
+      name[Group1]= "India - Gurmukhi";
+
+      // Mainly numbers.
+      key <AE01> { [      U0A67 		]	};
+      key <AE02> { [      U0A68		]	};
+      key <AE03> { [      U0A69, U0A71	]	};
+      key <AE04> { [      U0A6A, U0A74	 	]	};
+      key <AE05> { [      U0A6B, U262C		]	};
+      key <AE06> { [      U0A6C  	 	]	};
+      key <AE07> { [      U0A6D 		]	};
+      key <AE08> { [      U0A6e  	 	]	};
+      key <AE09> { [      U0A6F, parenleft 	]	};
+      key <AE10> { [      U0A66, parenright ]	};
+      key <AE11> { [      gur_visarga 	 	]	};
+      key <AE12> { [      equal,	plus 	]	};
+
+// Mainly long vowels
+
+      key <AD01> { [      U0A4C, U0A14  ]	};
+      key <AD02> { [      U0A48, U0A10  ]	};
+      key <AD03> { [      U0A3E, U0A06  ]	};
+      key <AD04> { [      U0A40, U0A08  ]	};
+      key <AD05> { [      U0A42, U0A0A  ]	};
+
+// Mainly voiced consonants
+
+      key <AD06> { [      U0A2C, U0A2D 	]	};
+      key <AD07> { [      U0A39, U0A19 	]	};
+      key <AD08> { [      U0A17, U0A18 	]	};
+      key <AD09> { [      U0A26, U0A27 	]	};
+      key <AD10> { [      U0A1C, U0A1D 	]	};
+      key <AD11> { [      U0A21, U0A22 	]	};
+      key <AD12> { [      U0A3C, U0A1E 	]	};
+
+// Mainly short vowels
+      key <AC01> { [      U0A4B, U0A13  ]	};
+      key <AC02> { [      U0A47, U0A0F  ]	};
+      key <AC03> { [      U0A4D, U0A05  ]	};
+      key <AC04> { [      U0A3F, U0A07  ]	};
+      key <AC05> { [      U0A41, U0A09  ]	};
+
+// Mainly unvoiced consonants
+
+      key <AC06> { [      U0A2A, U0A2B 	]	};
+      key <AC07> { [      U0A30, U0A5C 	]	};
+      key <AC08> { [      U0A15, U0A16 	]	};
+      key <AC09> { [      U0A24, U0A25 	]	};
+      key <AC10> { [      U0A1A, U0A1B 	]	};
+      key <AC11> { [      U0A1F, U0A20 	]	};
+      key <BKSL> { [      U005C, U007C	]	};
+
+      key <AB01> { [      z, 	 U0A01	]       };
+      key <AB02> { [      U0A02, U0A70, U0A71  ]       };
+      key <AB03> { [      U0A2E, U0A23  ]       };
+      key <AB04> { [      U0A28, U0A28  ]       };
+      key <AB05> { [      U0A35, U0A35  ]       };
+      key <AB06> { [      U0A32, U0A33  ]       };
+      key <AB07> { [      U0A38, U0A36  ]       };
+      key <AB08> { [      comma,     less       ]       };
+      key <AB09> { [      period,    U0964  ]       };
+      key <AB10> { [      U0A2F, question   ]       };
+};
+
+//Name		:	Jhelum (Refind Inscript)
+//Description	:	A Jhelum keyboard layout for Gurmukhi (Punjabi)
+//			http://www.satluj.org/Jhelum.html
+//Modified for Inscript to make
+//Original Author :	Amanpreet Singh Alam <apreet.alam@gmail.com
+ 
+partial alphanumeric_keys
+xkb_symbols "jhelum" {
+      name[Group1] = "India - Gurmukhi Jhelum";
+          key.type="FOUR_LEVEL";
+     //Top Alphanumeric row
+     // Roman digits
+     key <TLDE>  { [  apostrophe, asciitilde, U0A02,U0A01 ] }; // apostrophe: anusvara, candrabindu
+     key <AE01>  { [   1,exclam,	U0A67,	exclam	   ] };
+     key <AE02>  { [   2,at,	U0A68,	at	   ] };
+     key <AE03>  { [   3,numbersign, U0A69,	numbersign ] };
+     key <AE04>  { [   4,dollar,	U0A6A,	dollar     ] };
+     key <AE05>  { [   5,percent,U0A6B,	percent    ] };
+     key <AE06>  { [   6,asciicircum, U0A6C,asciicircum ] };
+     key <AE07>  { [   7,ampersand,U0A6D,ampersand  ] };
+     key <AE08>  { [   8,asterisk,U0A6E,	asterisk   ] };
+     key <AE09>  { [   9,parenleft,U0A6F,parenleft  ] };
+     key <AE10>  { [   0,parenright,U0A66,parenright ] };
+     key <AE11>	{ [   minus,underscore] };
+     key <AE12>	{ [   equal,plus] };
+     key <BKSL>  { [   U0964,U0965,U007C,U005C] }; //pipe : danda, double danda
+ 
+     //Q Row	
+     key <AD01>   { [   U0A4C, 	U0A14   ] };  // Q: oo, ooh
+     key <AD02>   { [   U0A48,  	U0A10	] };  // W: ee, ae
+     key <AD03>   { [   U0A3E,   U0A06  ] };  // E: a, aa
+     key <AD04>   { [   U0A40,	U0A08  	] };  // R: ee, ai
+     key <AD05>   { [   U0A42,   U0A0A   ] };  // T: u, uu
+     key <AD06>   { [   U0A30,	U0A5C   ] };  // Y: ra, raa
+     key <AD07>   { [   U0A26,   U0A27   ] };  // U: tha, thha
+     key <AD08>   { [   U0A17,   U0A18   ] };  // I:ga, gha
+     key <AD09>   { [   U0A24,   U0A1F   ] };  // O: ta, tha
+     key <AD10>   { [   U0A2A,   U0A5E   ] };  // P: pa, pha
+     key <AD11>   { [   U0A21,   U0A22,   bracketleft,   braceleft   ] };  
+     key <AD12>	 { [   U0A19,   U0A1E,   bracketright, braceright   ] };
+     
+     //A Row
+     key <AC01>   { [   U0A4B,	 U0A13  ] };   // A: o, oo
+     key <AC02>   { [   U0A40,    U0A0F   ] };  // S: e, ee
+     key <AC03>   { [   U0A4D,    U0A05   ] };  // D: halant, aa
+     key <AC04>   { [   U0A3F,    U0A07   ] };  // F: i, aa
+     key <AC05>   { [   U0A41,    U0A09   ] };  // G: u, uh
+     key <AC06>   { [   U0A39,    U0A20   ] };  // H: ha, thha
+     key <AC07>   { [   U0A1C,    U0A1D   ] };  // J: ja, jha
+     key <AC08>   { [   U0A15,    U0A16   ] };  // K: ka, kha
+     key <AC09>   { [   U0A32,	 U0A25   ] };  // L: la, tha
+     key <AC10>   { [   U0A38,   semicolon, colon  ] }; //; sa
+     key <AC11>   { [apostrophe, quotedbl ] };
+ 
+     //Z Row
+     key <AB01>   { [   U0A71,	 U0A3C 	 ] };  // Z: addak, par bindi
+     key <AB02>   { [   U0A02,    U0A70	 ] };  // X: bindi, tippi
+     key <AB03>   { [   U0A1A,    U0A1B   ] };  // C: ca, cha
+     key <AB04>   { [   U0A35,    U0A2F   ] };  // V: va, ya
+     key <AB05>   { [   U0A2C,    U0A2D   ] };  // B: ba, bha
+     key <AB06>   { [   U0A28,    U0A23   ] };  // N: na, nha
+     key <AB07>   { [   U0A2E, U0A2E       ] };  // M: ma
+     key <AB08>   { [   comma,    U262C	 ] };// comma: comma, dev abbreviation sign
+     key <AB09>   { [   period,   U0A74 	 ] };  // period: period, nukta
+     key <AB10>	 { [   slash,   question ] };
+ 
+// begin modifier mappings
+//    modifier_map Shift  { Shift_L };
+//    modifier_map Lock   { Caps_Lock };
+//    modifier_map Control{ Control_L };
+//    modifier_map Mod3   { Mode_switch };
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+// Contact: Walter Bender <walter@laptop.org>
+
+  include "in(deva)"
+  key <TLDE> { [	U094A,	U0912 ] }; // DEVANAGARI VOWEL SIGN SHORT O; DEVANAGARI LETTER SHORT O
+  key <AE01> { [	U0967,	U090D ] }; // DEVANAGARI DIGIT ONE; DEVANAGARI LETTER CANDRA E
+  key <AE02> { [	U0968,	U0945 ] }; // DEVANAGARI DIGIT TWO; DEVANAGARI VOWEL SIGN CANDRA E
+  key <AE03> { [	U0969	 ] }; // DEVANAGARI DIGIT THREE; 
+  key <AE04> { [	U096A	 ] }; // DEVANAGARI DIGIT FOUR; 
+  key <AE05> { [	U096B	 ] }; // DEVANAGARI DIGIT FIVE; 
+  key <AE06> { [	U096C	 ] }; // DEVANAGARI DIGIT SIX; 
+  key <AE07> { [	U096D	 ] }; // DEVANAGARI DIGIT SEVEN; 
+  key <AE08> { [	U096E	 ] }; // DEVANAGARI DIGIT EIGHT; 
+  key <AE09> { [	U096F,	parenleft ] }; // DEVANAGARI DIGIT NINE; 
+  key <AE10> { [	U0966,	parenright ] }; // DEVANAGARI DIGIT ZERO; 
+  key <AE11> { [	minus,		U0903 ] }; // DEVANAGARI SIGN VISARGA; 
+  key <AE12> { [	U0943,	U090B ] }; // DEVANAGARI VOWEL SIGN VOCALIC R; DEVANAGARI LETTER VOCALIC R
+
+  key <AD01> { [	U094C,	U0914 ] }; // DEVANAGARI VOWEL SIGN AU; DEVANAGARI LETTER AU
+  key <AD02> { [	U0948,	U0910 ] }; // DEVANAGARI VOWEL SIGN AI; DEVANAGARI LETTER AI
+  key <AD03> { [	U093E,	U0906 ] }; // DEVANAGARI VOWEL SIGN AA; DEVANAGARI LETTER AA
+  key <AD04> { [	U0940,	U0908 ] }; // DEVANAGARI VOWEL SIGN II; DEVANAGARI LETTER II
+  key <AD05> { [	U0942,	U090A ] }; // DEVANAGARI VOWEL SIGN UU; DEVANAGARI LETTER UU
+  key <AD06> { [	U092C,	U092D ] }; // DEVANAGARI LETTER BA; DEVANAGARI LETTER BHA
+  key <AD07> { [	U0939,	U0919 ] }; // DEVANAGARI LETTER HA; DEVANAGARI LETTER NGA
+  key <AD08> { [	U0917,	U0918 ] }; // DEVANAGARI LETTER GA; DEVANAGARI LETTER GHA
+  key <AD09> { [	U0926,	U0927 ] }; // DEVANAGARI LETTER DA; DEVANAGARI LETTER DHA
+  key <AD10> { [	U091C,	U091D ] }; // DEVANAGARI LETTER JA; DEVANAGARI LETTER JHA
+  key <AD11> { [	U0921,	U0922 ] }; // DEVANAGARI LETTER DDA; DEVANAGARI LETTER DDHA
+  key <AD12> { [	U093C,	U091E ] }; // DEVANAGARI SIGN NUKTA; DEVANAGARI LETTER NYA
+
+  key <BKSL> { [	U0949,	U0911 ] }; // DEVANAGARI VOWEL SIGN CANDRA O; DEVANAGARI LETTER CANDRA O
+
+  key <AC01> { [	U094B,	U0913 ] }; // DEVANAGARI VOWEL SIGN O; DEVANAGARI LETTER O
+  key <AC02> { [	U0947,	U090F ] }; // DEVANAGARI VOWEL SIGN E; DEVANAGARI LETTER E
+  key <AC03> { [	U094D,	U0905 ] }; // DEVANAGARI SIGN VIRAMA; DEVANAGARI LETTER A
+  key <AC04> { [	U093F,	U0907 ] }; // DEVANAGARI VOWEL SIGN I; DEVANAGARI LETTER I
+  key <AC05> { [	U0941,	U0909 ] }; // DEVANAGARI VOWEL SIGN U; DEVANAGARI LETTER U
+  key <AC06> { [	U092A,	U092B ] }; // DEVANAGARI LETTER PA; DEVANAGARI LETTER PHA
+  key <AC07> { [	U0930,	U0931 ] }; // DEVANAGARI LETTER RA; DEVANAGARI LETTER RRA
+  key <AC08> { [	U0915,	U0916 ] }; // DEVANAGARI LETTER KA; DEVANAGARI LETTER KHA
+  key <AC09> { [	U0924,	U0925 ] }; // DEVANAGARI LETTER TA; DEVANAGARI LETTER THA
+  key <AC10> { [	U091A,	U091B ] }; // DEVANAGARI LETTER CA; DEVANAGARI LETTER CHA
+  key <AC11> { [	U091F,	U0920 ] }; // DEVANAGARI LETTER TTA; DEVANAGARI LETTER TTHA
+
+  key <AB01> { [	U0946,	U090E ] }; // DEVANAGARI VOWEL SIGN SHORT E; DEVANAGARI LETTER SHORT E
+  key <AB02> { [	U0902,	U0901 ] }; // DEVANAGARI SIGN ANUSVARA; DEVANAGARI SIGN CANDRABINDU
+  key <AB03> { [	U092E,	U0923 ] }; // DEVANAGARI LETTER MA; DEVANAGARI LETTER NNA
+  key <AB04> { [	U0928,	U0929 ] }; // DEVANAGARI LETTER NA; DEVANAGARI LETTER NNNA
+  key <AB05> { [	U0935,	U0934 ] }; // DEVANAGARI LETTER VA; DEVANAGARI LETTER LLLA
+  key <AB06> { [	U0932,	U0933 ] }; // DEVANAGARI LETTER LA; DEVANAGARI LETTER LLA
+  key <AB07> { [	U0938,	U0936 ] }; // DEVANAGARI LETTER SA; DEVANAGARI LETTER SHA
+  key <AB08> { [	comma,		U0937 ] }; // DEVANAGARI LETTER SSA
+  key <AB09> { [	period,		U0964 ] }; // DEVANAGARI DANDA
+  key <AB10> { [	U092F,	U095F ] }; // DEVANAGARI LETTER YA; DEVANAGARI LETTER YYA
+
+  key <SPCE> { [	space,		space,	U200C,	U200D ] }; // ZERO-WIDTH-NON-JOINER (ZWNJ); ZERO-WIDTH-JOINER (ZWJ)
+
+  include "group(olpc)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/inet b/xorg-server/xkbdata.src/symbols/inet
new file mode 100644
index 000000000..54ec2418c
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/inet
@@ -0,0 +1,2236 @@
+// $XKeyboardConfig$
+
+// $XFree86: xc/programs/xkbcomp/symbols/inet,v 1.38 2004/01/17 14:59:37 pascal Exp $
+
+// EAK (Easy Access, Internet, Multimedia, PDA) keyboards
+// Copyright (C) 2002 Stanislav Brabec <sbrabec@suse.cz>
+//
+// Based on LinEAK project
+// LinEAK - Linux support for Easy Access and Internet Keyboards      
+// Copyright (C) 2001, 2002 Mark Smulders <Mark@PIRnet.nl>
+
+// Usage in XF86Config:
+// Option "XkbLayout"	"my_kb_layout"
+// Option "XkbVariant"	"my_kb_variant"
+// Option "XkbModel"	"my_eak_type"
+// Option "XkbRules"	"xfree86"
+// Simple command line usage:
+// setxkbmap 'my_kb_layout' -variant 'my_kb_variant' -model 'my_eak_type'
+
+// All keyboards listed here should be also mentioned in
+// rules/base, base.lst and base.xml.
+
+// Very common set of media keys
+partial hidden alphanumeric_keys
+xkb_symbols "media_common" {
+    key <I10>   {       [ XF86AudioPrev         ] };
+    key <I19>   {       [ XF86AudioNext         ] };
+    key <I20>   {       [ XF86AudioMute         ] };
+    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ] };
+    key <I24>   {       [ XF86AudioStop, XF86Eject ] };
+    key <I2E>   {       [ XF86AudioLowerVolume  ] };	
+    key <I30>   {       [ XF86AudioRaiseVolume  ] };
+};
+
+// popular web navigation combination
+partial hidden alphanumeric_keys
+xkb_symbols "nav_common" {
+    key <I69>   {       [ XF86Forward           ]       };
+    key <I6A>   {       [ XF86Back              ]       };
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "media_nav_common" {
+    include "inet(media_common)"
+    include "inet(nav_common)"
+};
+
+// Evdev Standardized Keycodes
+partial alphanumeric_keys
+xkb_symbols "evdev" {
+    key <MUTE>   {      [ XF86AudioMute         ]       };
+    key <VOL->   {      [ XF86AudioLowerVolume  ]       };
+    key <VOL+>   {      [ XF86AudioRaiseVolume  ]       };
+    key <POWR>   {      [ XF86PowerOff          ]       };
+    key <STOP>   {      [ Cancel                ]       };
+    key <AGAI>   {      [ Redo                  ]       };
+    key <PROP>   {      [ SunProps              ]       };
+    key <UNDO>   {      [ Undo                  ]       };
+    key <FRNT>   {      [ SunFront              ]       };
+    key <COPY>   {      [ XF86Copy              ]       };
+    key <OPEN>   {      [ SunOpen               ]       };
+    key <PAST>   {      [ XF86Paste             ]       };
+    key <FIND>   {      [ Find                  ]       };
+    key <CUT>    {      [ XF86Cut               ]       };
+    key <HELP>   {      [ Help                  ]       };
+    key <LNFD>   {      [ Linefeed              ]       };
+
+    key <HZTG>   {      [ Zenkaku_Hankaku       ]       };
+    key <HKTG>   {      [ Hiragana_Katakana     ]       };
+    key <HENK>   {      [ Henkan                ]       };
+    key <MUHE>   {      [ Muhenkan              ]       };
+    key <KATA>   {      [ Katakana              ]       };
+    key <HIRA>   {      [ Hiragana              ]       };
+    key <RO>     {      [ Romaji                ]       };
+
+    key <HNGL>   {      [ Hangul                ]       };
+    key <HJCV>   {      [ Hangul_Hanja          ]       };
+
+//  key <I120>   {      [ ]       }; // KEY_MACRO 
+    key <I126>   {      [ plusminus             ]       };
+    key <I129>   {      [ KP_Separator          ]       };
+    key <I147>   {      [ XF86MenuKB            ]       };
+    key <I148>   {      [ XF86Calculator        ]       };
+//  key <I149>   {      [ ]       }; // KEY_SETUP
+    key <I150>   {      [ XF86Sleep             ]       };
+    key <I151>   {      [ XF86WakeUp            ]       };
+    key <I152>   {      [ XF86Explorer          ]       };
+    key <I153>   {      [ XF86Send              ]       };
+//  key <I154>   {      [ ]       }; // KEY_DELETEFILE
+    key <I155>   {      [ XF86Xfer              ]       };
+    key <I156>   {      [ XF86Launch1           ]       };
+    key <I157>   {      [ XF86Launch2           ]       };
+    key <I158>   {      [ XF86WWW               ]       };
+    key <I159>   {      [ XF86DOS               ]       };
+    key <I160>   {      [ XF86ScreenSaver       ]       };
+//  key <I161>   {      [ ]       }; // KEY_DIRECTION
+    key <I162>   {      [ XF86RotateWindows     ]       };
+    key <I163>   {      [ XF86Mail              ]       };
+    key <I164>   {      [ XF86Favorites         ]       };
+    key <I165>   {      [ XF86MyComputer        ]       };
+    key <I166>   {      [ XF86Back              ]       };
+    key <I167>   {      [ XF86Forward           ]       };
+//  key <I168>   {      [ ]       }; // KEY_CLOSECD (opposite of eject)
+    key <I169>   {      [ XF86Eject             ]       };
+    key <I170>   {      [ XF86Eject, XF86Eject  ]       };
+    key <I171>   {      [ XF86AudioNext         ]       };
+    key <I172>   {      [ XF86AudioPlay, XF86AudioPause ] };
+    key <I173>   {      [ XF86AudioPrev         ]       };
+    key <I174>   {      [ XF86AudioStop, XF86Eject ]    };
+    key <I175>   {      [ XF86AudioRecord       ]       };
+    key <I176>   {      [ XF86AudioRewind       ]       };
+    key <I177>   {      [ XF86Phone             ]       };
+//  key <I178>   {      [ ]       }; // KEY_ISO
+    key <I179>   {      [ XF86Tools             ]       };
+    key <I180>   {      [ XF86HomePage          ]       };
+    key <I181>   {      [ XF86Refresh           ]       };
+    key <I182>   {      [ XF86Close             ]       };
+//  key <I183>   {      [ ]       }; // KEY_MOVE
+//  key <I184>   {      [ ]       }; // KEY_EDIT
+    key <I185>   {      [ XF86ScrollUp          ]       };
+    key <I186>   {      [ XF86ScrollDown        ]       };
+    key <I187>   {      [ parenleft             ]       };
+    key <I188>   {      [ parenright            ]       };
+    key <I189>   {      [ XF86New               ]       };
+    key <I190>   {      [ Redo                  ]       };
+    key <I208>   {      [ XF86AudioPlay         ]       };
+    key <I209>   {      [ XF86AudioPause        ]       };
+    key <I210>   {      [ XF86Launch3           ]       };
+    key <I211>   {      [ XF86Launch4           ]       };
+    key <I213>   {      [ XF86Standby           ]       };
+    key <I214>   {      [ XF86Close             ]       };
+    key <I215>   {      [ XF86AudioPlay         ]       };
+    key <I216>   {      [ XF86Forward           ]       };
+//  key <I217>   {      [ ]       }; // KEY_BASSBOOST
+    key <I218>   {      [ Print                 ]       };
+//  key <I219>   {      [ ]       }; // KEY_HP
+    key <I220>   {      [ XF86WebCam            ]       };
+//  key <I221>   {      [ ]       }; // KEY_SOUND
+//  key <I222>   {      [ ]       }; // KEY_QUESTION
+    key <I223>   {      [ XF86Mail              ]       };
+//  key <I224>   {      [ XF86Messenger         ]       }; // KEY_CHAT
+    key <I225>   {      [ XF86Search            ]       };
+//  key <I226>   {      [ XF86Go                ]       }; // KEY_CONNECT
+    key <I227>   {      [ XF86Finance           ]       };
+//  key <I228>   {      [ XF86Game              ]       }; // KEY_SPORT
+    key <I229>   {      [ XF86Shop              ]       };
+//  key <I230>   {      [ ]       }; // KEY_ALTERASE
+    key <I231>   {      [ Cancel                ]       };
+    key <I232>   {      [ XF86MonBrightnessDown ]       };
+    key <I233>   {      [ XF86MonBrightnessUp   ]       };
+    key <I234>   {      [ XF86AudioMedia        ]       };
+    key <I235>   {      [ XF86Display           ]       };
+    key <I236>   {      [ XF86KbdLightOnOff     ]       }; // KEY_KBDILLUMTOGGLE
+    key <I237>   {      [ XF86KbdBrightnessDown ]       }; // KEY_KBDILLUMDOWN
+    key <I238>   {      [ XF86KbdBrightnessUp   ]       }; // KEY_KBDILLUMUP
+    key <I239>   {      [ XF86Send              ]       };
+    key <I240>   {      [ XF86Reply             ]       };
+    key <I241>   {      [ XF86MailForward       ]       };
+    key <I242>   {      [ XF86Save              ]       };
+    key <I243>   {      [ XF86Documents         ]       };
+//  key <I244>   {      [ ]       }; // KEY_BATTERY
+//  key <I245>   {      [ ]       }; // KEY_BLUETOOTH
+//  key <I246>   {      [ ]       }; // KEY_WLAN
+//  key <I249>   {      [ ]       }; // KEY_VIDEO_NEXT  --  drive next video source
+//  key <I250>   {      [ ]       }; // KEY_VIDEO_PREV  --  drive previous video source
+//  key <I251>   {      [ ]       }; // KEY_BRIGHTNESS_CYCLE  --  bright up, max++ == min
+//  key <I252>   {      [ ]       }; // KEY_BRIGHTNESS_ZERO  --  brightness off
+//  key <I253>   {      [ ]       }; // KEY_DISPLAY_OFF  --  turn off display
+ 
+};
+
+
+// A4Tech KB-21
+partial alphanumeric_keys
+xkb_symbols "a4techKB21" {
+    include "inet(media_nav_common)"
+    key <I32>   {       [ XF86HomePage          ]       };
+    key <I65>   {       [ XF86Search            ]       };
+    key <I66>   {       [ XF86Favorites         ]       };
+    key <I67>   {       [ XF86Refresh           ]       };
+    key <I68>   {       [ XF86Stop              ]       };
+    key <I6B>   {       [ XF86MyComputer        ]       };
+    key <I6C>   {       [ XF86Mail              ]       };
+};
+
+// A4 KBS-8. Contributed by ojo at force dot sk
+partial alphanumeric_keys 
+xkb_symbols "a4techKBS8" { 
+    include "inet(a4techKB21)"
+    key <I21>   {       [ XF86Calculator        ]       }; 
+    key <I5F>   {       [ XF86Standby           ]       }; 
+    key <I6D>   {       [ XF86AudioMedia        ]       }; 
+};
+
+// A4Tech Wireless Desktop (RFKB-23)
+partial alphanumeric_keys
+xkb_symbols "a4_rfkb23" {
+    include "inet(media_common)"
+    key <I21>   {       [ XF86Calculator                ]       };
+    key <I32>   {       [ XF86HomePage                  ]       };
+    key <I32>   {       [ XF86WWW                       ]       };
+    key <I5F>   {       [ XF86Sleep                     ]       };
+    key <I65>   {       [ XF86Search                    ]       };
+    key <I66>   {       [ XF86Favorites                 ]       };
+    key <I67>   {       [ XF86Refresh                   ]       };
+    key <I68>   {       [ XF86Stop                      ]       };
+// should they be swapped?
+    key <I69>   {       [ XF86Back                      ]       };
+    key <I6A>   {       [ XF86Forward                   ]       };
+
+    key <I6B>   {       [ XF86MyComputer                ]       };
+    key <I6C>   {       [ XF86Mail                      ]       };
+    key <I6D>   {       [ XF86AudioMedia                ]       };
+};
+
+// Acer AirKey V
+partial alphanumeric_keys
+xkb_symbols "airkey" {
+    key <I13>	{	[ XF86AudioNext		]	};
+    key <I15>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I16>	{	[ XF86Mail		]	};
+    key <I18>	{	[ XF86AudioPrev		]	};
+    key <I19>	{	[ XF86AudioMute		]	};
+    key <I24>	{	[ XF86WWW		]	};
+    key <I26>	{	[ XF86AudioLowerVolume	]	};
+    key <I2D>	{	[ XF86AudioRaiseVolume	]	};
+    key <I2F>	{	[ XF86Terminal		]	};
+    key <I31>	{	[ XF86AudioStop, XF86Eject ]	};
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I63>	{	[ XF86Standby		]	};
+};
+
+// Acer C300 Laptop
+partial alphanumeric_keys
+xkb_symbols "acer_c300" {
+
+    key <I17>   {       [ F14                   ]       };
+    key <I1F>   {       [ F13                   ]       };
+    key <I20>   {       [ XF86AudioMute         ]       };
+    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
+    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
+    key <I32>   {       [ XF86Mail              ]       };
+    key <I5E>   {       [ XF86Launch2           ]       };
+    key <I6C>   {       [ XF86WWW               ]       };
+    key <I75>   {       [ Help                  ]       };
+    key <XFER>  {       [ XF86Launch1           ]       };
+};
+
+// Acer Ferrari 4000 Keyboard
+// From Alex Dubov <oakad@yahoo.com>
+partial alphanumeric_keys
+xkb_symbols "acer_ferrari4k" {
+    include "inet(media_common)"
+    key <I24>   {       [ dollar                ]       };
+    key <I25>   {       [ EuroSign              ]       };
+    key <I26>   {       [ XF86Display           ]       };
+    key <I32>   {       [ XF86WWW               ]       }; //"Saturn" button
+    key <I6C>   {       [ XF86Mail              ]       }; //"mail" button
+    // Missing keycodes - set-up with setkeycodes
+    key <I70>   {       [ Help                  ]       };
+    key <I71>   {       [ XF86Launch1           ]       };
+    key <I72>   {       [ XF86Launch2           ]       };
+    key <I73>   {       [ XF86Launch3           ]       };
+    key <I74>   {       [ XF86Launch4           ]       };
+};
+
+// Acer Laptop (Generic layout for Acer laptops from 2004 onwards)
+// From Carlos Corbacho <cathectic@gmail.com>
+// Keys marked (HAL) require HAL 0.5.10 (or newer) to be set up correctly
+// (Your laptop must also be added to hal-info)
+// (Not all these keys will be available on every Acer laptop)
+partial alphanumeric_keys
+xkb_symbols "acer_laptop" {
+    include "inet(media_common)"
+    key <I17>   {       [ XF86Launch2           ]        }; // "P" or "P2" (HAL)
+    key <I1F>   {       [ XF86Launch1           ]        }; // "e" or "P1" (HAL)
+
+    // Hotkeys (Function)
+    // Launch Keys
+    // Device keys
+    key <I32>   {       [ XF86WWW               ]        }; // "Saturn" button
+    key <I56>   {       [ XF86Display           ]        }; // Fn+F5 (HAL)
+    key <I5F>   {       [ XF86Sleep             ]        }; // Fn+F4
+    key <I6C>   {       [ XF86Mail              ]        }; // "mail" button
+    key <I71>   {       [ XF86Launch4           ]        }; // Fn+F3 (HAL)
+    key <I72>   {       [ XF86LaunchB           ]        }; // Bluetooth (HAL)
+    key <I73>   {       [ XF86LaunchA           ]        }; // Wireless (HAL)
+    key <I75>   {       [ Help                  ]        }; // Fn+F1 (HAL)
+    key <I79>   {       [ XF86Launch5           ]        }; // Fn+F7 (HAL)
+    key <K66>   {       [ XF86Launch3           ]        }; // Fn+F2 (HAL)
+
+    // Special Characters
+    // To avoid setting a precedent/ standard that will be broken in later
+    // versions of HAL, these keys are commented out for now. When they are no
+    // longer marked 'FIXME' and have saner keycodes, these two entries can be
+    // fixed and permanently uncommented. In the meantime, just uncomment these
+    // to make the keys work
+//  key <K5D>   {       [ EuroSign              ]        }; // Euro (HAL)
+//  key <K5E>   {       [ dollar                ]        }; // Dollar (HAL)
+};
+
+// Asus
+partial alphanumeric_keys
+xkb_symbols "asus_laptop" {
+    include "inet(media_common)"
+    key <I32>   {       [ XF86WWW               ]       };
+    key <I6C>   {       [ XF86Mail              ]       };
+};
+
+// Azona
+
+// Azona RF2300 wireless Internet Keyboard
+partial alphanumeric_keys
+xkb_symbols "azonaRF2300" {
+    // From Radics Laszlo <garaboncias@mailbox.hu>
+    include "inet(nav_common)"
+    key <I02>   {       [ XF86WWW               ]       };
+    key <I17>   {       [ XF86AudioStop         ]       };
+    key <I1E>   {       [ XF86AudioRaiseVolume  ]       };
+    key <I1F>   {       [ XF86AudioPlay, XF86AudioPause ] };
+    key <I21>   {       [ XF86Calculator        ]       };
+    key <I22>   {       [ XF86AudioNext         ]       };
+    key <I24>   {       [ XF86AudioPrev         ]       };
+    key <I25>   {       [ XF86AudioLowerVolume  ]       };
+    key <I26>   {       [ XF86AudioMute         ]       };
+    key <I3C>   {       [ XF86Copy              ]       };
+    key <I5F>   {       [ XF86Standby           ]       };
+    key <I65>   {       [ XF86Search            ]       };
+    key <I66>   {       [ XF86Favorites         ]       };
+    key <I6C>   {       [ XF86Mail              ]       };
+    key <I78>   {       [ XF86Cut               ]       };
+//  key <RCTL>  {       [ XF86Paste             ]       };
+};
+
+// ACPI Standard
+partial alphanumeric_keys
+xkb_symbols "acpi" {
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I63>	{	[ XF86WakeUp		]	};
+};
+
+
+// Advance
+
+// Advance Scorpius KI
+partial alphanumeric_keys
+xkb_symbols "scorpius" {
+    include "inet(media_nav_common)"
+    key <I21>	{	[ XF86Calculator	]	};
+    key <I32>	{	[ XF86HomePage		]	};
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I63>	{	[ XF86WakeUp		]	};
+    key <I65>	{	[ XF86Search		]	};
+    key <I66>	{	[ XF86Favorites		]	};
+    key <I67>	{	[ XF86Reload		]	};
+    key <I68>	{	[ XF86Stop		]	};
+    key <I6B>	{	[ XF86MyComputer	]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <I6D>	{	[ XF86AudioMedia	]	};
+};
+
+
+// Brother
+
+// Brother Internet Keyboard
+partial alphanumeric_keys
+xkb_symbols "brother" {
+    key <I10>	{	[ XF86ScrollUp		]	};
+    key <I12>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I17>	{	[ XF86AudioPrev		]	};
+    key <I18>	{	[ XF86ScrollDown	]	};
+    key <I19>	{	[ XF86ZoomOut		]	};
+    key <I1E>	{	[ XF86AudioMute		]	};
+    key <I21>	{	[ XF86WWW		]	};
+    key <I22>	{	[ Menu			]	};
+    key <I23>	{	[ XF86AudioStop		]	};
+    key <I24>	{	[ XF86Calculator	]	};
+    key <I25>	{	[ XF86Xfer		]	};
+    key <I26>	{	[ XF86Mail		]	};
+    key <I2E>	{	[ XF86AudioNext		]	};
+    key <I30>	{	[ XF86AudioRaiseVolume	]	};
+    key <I32>	{	[ XF86ZoomIn		]	};
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I63>	{	[ XF86WakeUp		]	};
+    key <I68>	{	[ XF86AudioLowerVolume	]	};
+};
+
+
+// BTC
+
+// BTC 5113RF Multimedia
+partial alphanumeric_keys
+xkb_symbols "btc5113rf" {
+    key <I10>	{	[ XF86AudioStop		]	};
+    key <I12>	{	[ XF86AudioMute		]	};
+    key <I19>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I1E>	{	[ XF86AudioRaiseVolume	]	};
+    key <I20>	{	[ XF86Favorites		]	};
+    key <I21>	{	[ XF86Eject		]	};
+    key <I22>	{	[ XF86AudioPrev		]	};
+    key <I24>	{	[ XF86AudioNext		]	};
+    key <I25>	{	[ XF86AudioLowerVolume	]	};
+    key <I26>	{	[ XF86Back		]	};
+    key <I30>	{	[ XF86WWW		]	};
+    key <I32>	{	[ XF86Search		]	};
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I63>	{	[ XF86WakeUp		]	};
+};
+
+// BTC 5126T
+partial alphanumeric_keys
+xkb_symbols "btc5126t" {
+    key <I32>	{	[ XF86WWW		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+};
+
+// BTC 6301URF
+partial alphanumeric_keys
+xkb_symbols "btc6301urf" {
+    include "inet(media_nav_common)"
+    include "inet(btc5126t)"
+    key <I66>	{	[ XF86Favorites		]	};
+};
+
+// BTC 9000
+partial alphanumeric_keys
+xkb_symbols "btc9000" {
+    key <I10>	{	[ XF86AudioStop		]	};
+    key <I12>	{	[ XF86AudioMute		]	};
+    key <I19>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I1E>	{	[ XF86AudioRaiseVolume	]	};
+    key <I20>	{	[ XF86Favorites		]	};
+    key <I21>	{	[ XF86AudioMedia	]	};
+    key <I22>	{	[ XF86AudioPrev		]	};
+    key <I24>	{	[ XF86AudioNext		]	};
+    key <I25>	{	[ XF86AudioLowerVolume	]	};
+    key <I26>	{	[ XF86Reload		]	};
+    key <I2E>	{	[ XF86Mail		]	};
+    key <I30>	{	[ XF86HomePage		]	};
+    key <I32>	{	[ XF86Search		]	};
+    key <I5E>   {	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I63>   {	[ XF86WakeUp		]	};
+};
+
+// BTC 9000A
+partial alphanumeric_keys
+xkb_symbols "btc9000a" {
+    key <I10>	{	[ XF86AudioStop		]	};
+    key <I12>	{	[ XF86AudioMute		]	};
+    key <I19>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I1E>	{	[ XF86AudioRaiseVolume	]	};
+    key <I20>	{	[ XF86Favorites		]	};
+    key <I21>	{	[ XF86Eject		]	};
+    key <I22>	{	[ XF86AudioPrev		]	};
+    key <I24>	{	[ XF86AudioNext		]	};
+    key <I25>	{	[ XF86AudioLowerVolume	]	};
+    key <I26>	{	[ XF86HomePage		]	};
+    key <I2E>	{	[ Help			]	};
+    key <I30>	{	[ XF86WWW		]	};
+    key <I32>	{	[ XF86Search		]	};
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I63>	{	[ XF86WakeUp		]	};
+};
+
+// BTC 9001AH
+xkb_symbols "btc9001ah" {
+    key <I02>   {       [ XF86WWW               ]       };
+    key <I17>   {       [ XF86AudioStop         ]       };
+    key <I1E>   {       [ XF86AudioRaiseVolume  ]       };
+    key <I1F>   {       [ XF86AudioPlay, XF86AudioPause ] };
+    key <I22>   {       [ XF86AudioNext         ]       };
+    key <I24>   {       [ XF86AudioPrev         ]       };
+    key <I25>   {       [ XF86AudioLowerVolume  ]       };
+    key <I26>   {       [ XF86AudioMute         ]       };
+    key <I5F>   {       [ XF86PowerOff          ]       };
+    key <I6C>   {       [ XF86Mail              ]       };
+    key <RWIN>  {       [ XF86Eject             ]       };
+};
+
+// BTC 5090
+partial alphanumeric_keys
+xkb_symbols "btc5090" {
+    include "inet(media_common)"
+    key <I26>   {       [ XF86Start             ]       };
+    key <I32>   {       [ XF86WWW               ]       };
+    key <I33>   {       [ XF86Eject             ]       };
+    key <I5E>   {       [ XF86PowerOff          ]       };
+    key <I5F>   {       [ XF86Standby           ]       };
+    key <I63>   {       [ XF86WakeUp            ]       };
+    key <I65>   {       [ XF86Search            ]       };
+    key <I66>   {       [ XF86Favorites         ]       };
+};
+
+// BTC 9019U
+partial alphanumeric_keys
+xkb_symbols "btc9019u" {
+    include "inet(media_common)"
+    key <FK17> {	[ XF86Search		]	};
+    key <I02>  {	[ XF86HomePage		]	};
+    key <I5F>  {	[ XF86Sleep		]	};
+    key <I66>  {	[ XF86Favorites		]	};
+    key <I6C>  {	[ XF86Mail		]	};
+    key <K6C>  {	[ XF86Eject		]	};
+};
+
+// Cherry Blue Line
+
+// Cherry Blue Line CyBo@rd
+partial alphanumeric_keys
+xkb_symbols "cherryblue" {
+    include "inet(nav_common)"
+    key <FK16>	{	[ XF86Reload		]	};
+    key <I02>	{	[ XF86HomePage		]	};
+    key <I17>	{	[ XF86AudioStop		]	};
+    key <I1E>	{	[ XF86AudioRaiseVolume	]	};
+    key <I1F>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I21>	{	[ XF86Calculator	]	};
+    key <I22>	{	[ XF86AudioNext		]	};
+    key <I24>	{	[ XF86AudioPrev		]	};
+    key <I25>	{	[ XF86AudioLowerVolume	]	};
+    key <I26>	{	[ XF86AudioMute		]	};
+    key <I63>	{	[ XF86Standby		]	};
+    key <I65>	{	[ XF86Search		]	};
+    key <I66>	{	[ XF86MyComputer	]	};
+    key <I68>	{	[ XF86Stop		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <PRSC>	{	[ XF86Terminal		]	};
+    key <XFER>	{	[ XF86Go		]	};
+};
+
+// Cherry CyMotion Master XPress
+partial alphanumeric_keys
+xkb_symbols "cherryblueb" {
+    include "inet(media_nav_common)"
+    key <FK16>  {       [ XF86Reload            ]       };
+    key <I02>   {       [ XF86HomePage          ]       };
+    key <I07>   {       [ XF86Forward           ]       };
+    key <I08>   {       [ XF86Back              ]       };
+    key <I0A>   {       [ XF86Copy              ]       };
+    key <I0B>	{	[ XF86ScrollUp		]	};
+    key <I12>   {       [ XF86ScrollDown        ]       };
+    key <I17>   {       [ XF86Cut               ]       };
+    key <I18>   {       [ XF86Paste             ]       };
+    key <I1E>   {       [ XF86AudioRaiseVolume  ]       };
+    key <I21>   {       [ XF86Calculator        ]       };
+    key <I25>   {       [ XF86AudioLowerVolume  ]       };
+    key <I26>   {       [ XF86AudioMute         ]       };
+    key <I2C>   {       [ XF86Book              ]       };
+    key <I32>   {       [ XF86Finance           ]       };
+    key <I63>   {       [ XF86Standby                   ] };
+    key <I65>   {       [ XF86Search            ]       };
+    key <I66>   {       [ XF86MyComputer        ]       };
+    key <I67>   {       [ XF86AudioRewind       ]       };
+    key <I68>   {       [ XF86Stop              ]       };
+    key <I6C>   {       [ XF86Mail              ]       };
+    key <I6D>   {       [ XF86AudioMedia        ]       };
+    key <I70>   {       [ XF86Eject             ]       };
+    key <I71>   {       [ XF86Book              ]       };
+    key <I72>   {       [ XF86Book              ]       };
+    key <PRSC>  {       [ XF86Terminal          ]       };
+    key <XFER>  {       [ XF86Go                ]       };
+};
+
+// Cherry Blue Line CyBo@rd (alternate option)
+partial alphanumeric_keys
+xkb_symbols "cherrybluea" {
+    include "inet(media_nav_common)"
+    key <I21>	{	[ XF86Calculator	]	};
+    key <I32>	{	[ XF86HomePage		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I65>	{	[ XF86Search		]	};
+    key <I66>	{	[ XF86MyComputer	]	};
+    key <I67>	{	[ XF86Reload		]	};
+    key <I68>	{	[ XF86Stop		]	};
+    key <I6B>	{	[ XF86Terminal		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <I6D>	{	[ XF86Go		]	};
+};
+
+// Cherry CyBo@rd USB-Hub
+partial alphanumeric_keys
+xkb_symbols "cherrycyboard" {
+    include "inet(media_nav_common)"
+    key <FK17>    {   [ XF86Search        ]   };
+    key <I02> {   [ XF86HomePage      ]   };
+    key <I21> {   [ XF86Calculator    ]   };
+    key <I5F> {   [ XF86Standby       ]   };
+    key <I66> {   [ XF86MyComputer    ]   };
+    key <I67> {   [ XF86Reload        ]   };
+    key <I68> {   [ XF86Stop          ]   };
+    key <I6C> {   [ XF86Mail          ]   };
+    key <K67> {   [ XF86Terminal      ]   };
+    key <XFER>    {   [ XF86AudioMedia    ]   };
+};
+
+
+// Chicony
+
+// Chicony Internet Keyboard
+partial alphanumeric_keys 
+xkb_symbols "chicony" {
+    key <I12>	{	[ XF86AudioMute		]	};
+    key <I17>	{	[ XF86Mail		]	};
+    key <I19>	{	[ XF86AudioLowerVolume	]	};
+    key <I1E>	{	[ XF86Forward		]	};
+    key <I20>	{	[ XF86AudioNext		]	};
+    key <I21>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I22>	{	[ XF86AudioPrev		]	};
+    key <I23>	{	[ XF86AudioRaiseVolume	]	};
+    key <I24>	{	[ XF86AudioStop		]	};
+    key <I25>	{	[ XF86Back		]	};
+    key <I26>	{	[ XF86LaunchB		]	};
+    key <I2E>	{	[ XF86LaunchC		]	};
+    key <I30>	{	[ XF86LaunchA		]	};
+    key <I32>	{	[ XF86HomePage		]	};
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86ContrastAdjust	]	};
+    key <I63>	{	[ XF86BrightnessAdjust	]	};
+};
+
+// Chicony KU-0108
+partial alphanumeric_keys 
+xkb_symbols "chicony0108" {
+    include "inet(cherrycyboard)"
+    key <I66>	{	[ XF86New		]	};
+};
+
+// Chicony KB-9885
+partial alphanumeric_keys
+xkb_symbols "chicony9885" {
+    key <I12>	{	[ XF86AudioMute		]	};
+    key <I17>	{	[ XF86Mail		]	};
+    key <I19>	{	[ XF86AudioLowerVolume	]	};
+    key <I1E>	{	[ XF86Forward		]	};
+    key <I20>	{	[ XF86AudioNext		]	};
+    key <I21>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I22>	{	[ XF86AudioPrev		]	};
+    key <I23>	{	[ XF86AudioRaiseVolume	]	};
+    key <I24>	{	[ XF86AudioStop		]	};
+    key <I25>	{	[ XF86Back		]	};
+    key <I26>	{	[ XF86LaunchB		]	};
+    key <I2E>	{	[ XF86LaunchC		]	};
+    key <I30>	{	[ XF86LaunchA		]	};
+    key <I32>	{	[ XF86WWW		]	};
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I63>	{	[ XF86WakeUp		]	};
+};
+
+
+// Compaq
+
+// Compaq Easy Access Keyboard
+partial alphanumeric_keys
+xkb_symbols "compaqeak8" {
+    key <I13>	{	[ XF86Community		]	};
+    key <I14>	{	[ XF86Market		]	};
+    key <I15>	{	[ XF86Meeting		]	};
+    key <I1A>	{	[ XF86Search		]	};
+    key <I1B>	{	[ XF86News		]	};
+    key <I1E>	{	[ XF86Mail		]	};
+    key <I1F>	{	[ XF86HomePage		]	};
+    key <I23>	{	[ XF86WWW		]	};
+};
+
+// Compaq Internet Keyboard (7 keys)
+partial alphanumeric_keys 
+xkb_symbols "compaqik7" {
+    key <I12>	{	[ XF86LightBulb		]	};
+    key <I1E>	{	[ XF86Mail		]	};
+    key <I21>	{	[ XF86Search		]	};
+    key <I23>	{	[ Help			]	};
+    key <I25>	{	[ XF86VendorHome	]	};
+    key <I26>	{	[ XF86HomePage		]	};
+    key <I32>	{	[ XF86Shop		]	};
+};
+
+// Compaq Internet Keyboard (13 keys)
+partial alphanumeric_keys
+xkb_symbols "compaqik13" {
+    include "inet(media_common)"
+    key <I1E>	{	[ XF86Mail		]	};
+    key <I1F>	{	[ XF86Go		]	};
+    key <I21>	{	[ XF86Search		]	};
+    key <I23>	{	[ XF86WWW		]	};
+    key <I32>	{	[ XF86Shop		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+};
+
+// Compaq Internet Keyboard (18 keys)
+partial alphanumeric_keys
+xkb_symbols "compaqik18" {
+    include "inet(media_common)"
+    key <I12>	{	[ XF86LightBulb		]	};
+    key <I18>	{	[ XF86Eject		]	};
+    key <I1E>	{	[ XF86Mail		]	};
+    key <I1F>	{	[ XF86Go		]	};
+    key <I21>	{	[ XF86Search		]	};
+    key <I23>	{	[ XF86WWW		]	};
+    key <I25>	{	[ XF86VendorHome	]	};
+    key <I26>	{	[ XF86Community		]	};
+    key <I32>	{	[ XF86Shop		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I68>	{	[ Print			]	};
+};
+
+
+// Laptop/notebook Compaq (eg. Armada, Evo) Laptop Keyboard
+partial alphanumeric_keys
+xkb_symbols "armada" {
+    include "inet(media_common)"
+    key <I1A>	{	[ XF86Search		]	};
+    key <I1E>	{	[ XF86Mail		]	};
+    key <I1F>	{	[ XF86HomePage		]	};
+    key <I23>	{	[ XF86WWW		]	};
+    key <I59>   {       [ XF86Launch2           ]       }; // Battery Monitor 
+    key <I5F>   {       [ XF86Standby           ]       }; 
+    key <I6F>	{	[ XF86AudioMedia	]	};
+    key <I75>   {       [ XF86Launch0           ]       }; // Info Center 
+};
+
+// Laptop/notebook Compaq (eg. Presario) Internet Keyboard
+partial alphanumeric_keys
+xkb_symbols "presario" {
+    include "inet(media_common)"
+    key <I14>	{	[ XF86Q			]	};
+    key <I18>	{	[ XF86Launch2		]	};
+    key <I1E>	{	[ XF86Mail		]	};
+    key <I1F>	{	[ XF86Launch1		]	};
+    key <I23>	{	[ XF86WWW		]	};
+    key <I32>	{	[ XF86Shop		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I75>	{	[ XF86AudioMedia	]	};
+};
+
+// Compaq iPaq Keyboard
+partial alphanumeric_keys
+xkb_symbols "ipaq" {
+    key <FK16>	{	[ XF86Shop		]	};
+    key <I02>	{	[ XF86Standby		]	};
+    key <I65>	{	[ XF86Search		]	};
+    key <I66>	{	[ XF86Travel		]	};
+    key <I69>	{	[ XF86BackForward	]	};
+    key <I6A>	{	[ XF86Q			]	};
+    key <I6C>	{	[ XF86Mail		]	};
+};
+
+
+// Dell
+
+partial alphanumeric_keys
+xkb_symbols "dell" {
+    key <I12>	{	[ XF86Mail		]	};
+    key <I1E>	{	[ XF86Search		]	};
+    key <I26>	{	[ XF86HomePage		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+};
+
+// Dell Precision M65
+partial alphanumeric_keys
+xkb_symbols "dellm65" {
+    include "inet(media_common)"
+    key <I04>   {       [ XF86PowerOff          ]       };
+    key <LWIN>  {       [ Super_L               ]       };
+};
+
+// Genius KB-19e NB
+partial alphanumeric_keys
+xkb_symbols "geniuskb19e" {
+    include "inet(media_nav_common)"
+    key <I21>   {      [ XF86Calculator        ]       };
+    key <I32>   {      [ XF86HomePage          ]       };
+    key <I5F>   {      [ XF86Sleep             ]       };
+    key <I65>   {      [ XF86Search            ]       };
+    key <I66>   {      [ XF86Favorites         ]       };
+    key <I67>   {      [ XF86Refresh           ]       };
+    key <I68>   {      [ XF86Stop              ]       };
+    key <I6B>   {      [ XF86MyComputer        ]       };
+    key <I6C>   {      [ XF86Mail              ]       };
+    key <I6D>   {      [ XF86AudioMedia        ]       };
+};
+
+// Laptop/notebook Dell Inspiron 8xxx
+partial alphanumeric_keys
+xkb_symbols "inspiron" {
+    include "inet(media_common)"
+    key <I02>   {       [ XF86AudioStop         ]       };
+    key <I04>   {       [ XF86AudioNext         ]       };
+    key <I21>   {       [ XF86Eject             ]       };
+    key <I56>   {       [ XF86Display           ]       };
+    key <NFER>  {       [ XF86AudioPrev         ]       };
+    key <XFER>  {       [ XF86AudioPlay, XF86AudioPause ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "latitude" {
+    include "inet(media_common)"
+};
+
+// Laptop/notebook Dell Precision-M series
+partial alphanumeric_keys
+xkb_symbols "precision_m" {
+    // Describes the extra keys on a Precision M series
+    // From Olivier Lahaye <olivier dot lahaye at motorola dot com>
+    include "inet(media_common)"
+    key <I32>	{	[ XF86HomePage		]	};
+};
+
+// DELL USB Multimedia Keyboard (former 8135, generalized, superset of 8125)
+partial alphanumeric_keys
+xkb_symbols "dellusbmm" {
+    // Describes the extra keys on a SK-8135 Multimedia keyboard
+    // From Olivier Lahaye <olivier dot lahaye at motorola dot com>
+    include "inet(media_nav_common)"
+    key <I02>	{	[ XF86HomePage		]	};
+    key <I21>	{	[ XF86Calculator	]	};
+    key <I67>	{	[ XF86Reload		]	};
+    key <I68>	{	[ XF86Stop		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <K67>	{	[ XF86MyComputer	]	}; 
+    key <XFER>	{	[ XF86AudioMedia	]	};  
+};
+
+
+// Dexxa
+
+// Dexxa Wireless Desktop Keyboard
+partial alphanumeric_keys
+xkb_symbols "dexxa" {
+    include "inet(media_common)"
+    key <I32>	{	[ XF86WWW		]	};
+    key <I65>	{	[ XF86Search		]	};
+    key <I66>	{	[ XF86Favorites		]	};
+    key <I67>	{	[ XF86Reload		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+};
+
+
+// Diamond
+
+// Diamond 9801 / 9802 series
+partial alphanumeric_keys
+xkb_symbols "diamond" {
+    include "inet(media_nav_common)"
+    key <I21>	{	[ XF86Calculator	]	};
+    key <I32>	{	[ XF86HomePage		]	};
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I63>	{	[ XF86WakeUp		]	};
+    key <I65>	{	[ XF86Search		]	};
+    key <I66>	{	[ XF86Favorites		]	};
+    key <I67>	{	[ XF86Reload		]	};
+    key <I68>	{	[ XF86Stop		]	};
+    key <I6B>	{	[ XF86MyComputer	]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <I6D>	{	[ XF86Go		]	};
+};
+
+// DTK
+
+// DTK2000
+partial alphanumeric_keys
+xkb_symbols "dtk2000" {
+    // Describes the extra keys on a DTK2000 Internet keyboard.
+    // From Radics Laszlo <garaboncias@mailbox.hu>
+    include "inet(media_nav_common)"
+    key <I21>   {       [ XF86Calculator        ]       };
+    key <I32>   {       [ XF86HomePage          ]       };
+    key <I5E>   {       [ XF86PowerOff          ]       };
+    key <I5F>   {       [ XF86Sleep             ]       };
+    key <I63>   {       [ XF86WakeUp            ]       };
+    key <I65>   {       [ XF86Search            ]       };
+    key <I66>   {       [ XF86Favorites         ]       };
+    key <I67>   {       [ XF86Refresh           ]       };
+    key <I68>   {       [ XF86Stop              ]       };
+    key <I6B>   {       [ XF86MyComputer        ]       };
+    key <I6C>   {       [ XF86Mail              ]       };
+    key <I6D>   {       [ XF86AudioMedia        ]       };
+};
+
+
+// Ennyah
+
+// Ennyah DKB-1008
+partial alphanumeric_keys
+xkb_symbols "ennyah_dkb1008" {
+    include "inet(media_nav_common)"
+    key <I32>	{	[ XF86HomePage		]	};
+    key <I5E>   {	[ XF86PowerOff		]	};
+    key <I5F>   {	[ XF86Standby		]	};
+    key <I63>   {	[ XF86WakeUp		]	};
+    key <I65>	{	[ XF86Search		]	};
+    key <I66>	{	[ XF86Favorites		]	};
+    key <I67>	{	[ XF86Refresh		]	};
+    key <I68>	{	[ XF86Stop		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <XFER>  {	[ XF86AudioMedia	]	};
+};
+
+
+// Fujitsu-Siemens Computers
+
+// Fujitsu-Siemens Computers AMILO A1667G laptop
+partial alphanumeric_keys
+xkb_symbols "fscaa1667g" {
+   include "inet(media_common)"
+   key <I32>   {       [ XF86WWW               ]       };
+   key <I6C>   {       [ XF86Mail              ]       };
+};
+
+
+// Genius
+
+// Genius Comfy KB-16M / Genius MM Keyboard KWD-910
+partial alphanumeric_keys
+xkb_symbols "genius" {
+    key <I12>   {	[ XF86AudioRaiseVolume	]	};
+    key <I17>   {	[ XF86Calculator	]	};
+    key <I19>   {	[ XF86AudioLowerVolume	]	};
+    key <I1E>   {	[ XF86Forward		]	};
+    key <I20>   {	[ XF86AudioMute		]	};
+    key <I21>   {	[ XF86AudioNext		]	};
+    key <I22>   {	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I23>	{	[ XF86AudioPrev		]	};
+    key <I24>   {	[ XF86AudioStop		]	};
+    key <I25>   {	[ XF86Back		]	};
+    key <I26>   {	[ XF86ScreenSaver	]	};
+    key <I2E>   {	[ XF86Mail		]	};
+    key <I30>   {	[ XF86Eject		]	};
+    key <I32>   {	[ XF86WWW		]	};
+    key <I5F>   {	[ XF86Standby		]	};
+    key <I63>   {	[ XF86WakeUp		]	};
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "geniuscomfy" {
+    // Describes the extra keys on a Genius Comfy KB-12e
+    // From Jurica Vukadin <jura@webit.hr>
+    include "inet(media_nav_common)"
+    key <I21>   {       [ XF86Calculator        ]       };
+    key <I32>   {       [ XF86WWW	        ]       };
+    key <I5F>   {       [ XF86Sleep             ]       };
+    key <I6B>   {       [ XF86MyComputer        ]       };
+    key <I6C>   {       [ XF86Mail              ]       };
+    key <I6D>   {       [ XF86AudioMedia        ]       };
+};
+
+
+// GeniusComfy21e
+partial alphanumeric_keys
+xkb_symbols "geniuscomfy2" {
+    // Describes the extra keys on a Genius Comfy KB-21e-Scroll
+    // From Radics Laszlo <garaboncias@mailbox.hu>
+    include "inet(geniuscomfy)"
+    key <I23>   {       [ Return                ]       };
+    key <I65>   {       [ XF86Search            ]       };
+    key <I66>   {       [ XF86Favorites         ]       };
+    key <I67>   {       [ XF86Refresh           ]       };
+    key <I68>   {       [ XF86Stop              ]       };
+};
+
+// Gyration
+
+partial alphanumeric_keys
+xkb_symbols "gyration" {
+    include "inet(nav_common)"
+    key <FK16>	{	[ XF86Reload		]	};
+    key <I02>	{	[ XF86WWW		]	};
+    key <I17>	{	[ XF86AudioStop		]	};
+    key <I1E>	{	[ XF86AudioRaiseVolume	]	};
+    key <I1F>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I22>	{	[ XF86AudioNext		]	};
+    key <I24>	{	[ XF86AudioPrev		]	};
+    key <I25>	{	[ XF86AudioLowerVolume	]	};
+    key <I26>	{	[ XF86AudioMute		]	};
+    key <I65>	{	[ XF86Search		]	};
+    key <I66>	{	[ XF86Favorites		]	};
+    key <I68>	{	[ XF86Stop		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+};
+
+
+// Hewlett-Packard
+
+// Hewlett-Packard Internet Keyboard
+partial alphanumeric_keys 
+xkb_symbols "hpi6" {
+    include "inet(media_common)"
+    key <I12>	{	[ XF86Search		]	};
+    key <I26>	{	[ Help			]	};
+    key <I5F>	{	[ XF86Standby		]	};
+};
+
+// Hewlett-Packard SK-2501 Multimedia Keyboard
+partial alphanumeric_keys
+xkb_symbols "hp2501" {
+    key <I12>	{	[ XF86Tools		]	};
+    key <I17>	{	[ XF86Search		]	};
+    key <I1E>	{	[ XF86Mail		]	};
+    key <I20>	{	[ XF86AudioMute		]	};
+    key <I21>	{	[ XF86Launch5		]	};
+    key <I22>	{	[ XF86Launch3		]	};
+    key <I23>	{	[ XF86Launch2		]	};
+    key <I24>	{	[ XF86Launch4		]	};
+    key <I25>	{	[ XF86Standby		]	};
+    key <I26>	{	[ Help			]	};
+    key <I2E>	{	[ XF86AudioLowerVolume	]	};
+    key <I30>	{	[ XF86AudioRaiseVolume	]	};
+    key <I32>	{	[ XF86WWW		]	};
+};
+
+// Hewlett-Packard SK-2505 Internet Keyboard
+partial alphanumeric_keys
+xkb_symbols "hp2505" {
+    include "inet(media_common)"
+    key <I18>	{	[ XF86Eject		]	};
+    key <I1E>	{	[ XF86Mail		]	};
+    key <I25>	{	[ XF86Standby		]	};
+    key <I32>	{	[ XF86WWW		]	};
+};
+
+// Hewlett-Packard 5181 Internet Keyboard
+partial alphanumeric_keys
+xkb_symbols "hp5181" {
+    include "inet(media_common)"
+    key <I12>	{	[ XF86Search		]	};
+    key <I14>	{	[ XF86VendorHome	]	};
+    key <I15>	{	[ XF86Community		]	};
+    key <I16>	{	[ XF86AudioMedia	]	};
+    key <I18>	{	[ XF86Eject		]	};
+    key <I1E>	{	[ XF86Shop		]	};
+    key <I1F>	{	[ XF86Launch1		]	};
+    key <I26>	{	[ Help			]	};
+    key <I27>	{	[ XF86Finance		]	};
+    key <I32>	{	[ XF86HomePage		]	};
+    key <I39>	{	[ Print			]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+};
+
+// Hewlett-Packard 5185 Internet Keyboard
+partial alphanumeric_keys
+xkb_symbols "hp5185" {
+    include "inet(media_common)"
+    key <I02>   {       [ XF86WWW               ]       };
+    key <I12>   {       [ XF86Go                ]       };
+    key <I14>   {       [ XF86VendorHome        ]       };
+    key <I15>   {       [ XF86Community         ]       };
+    key <I16>   {       [ XF86AudioMedia        ]       };
+    key <I18>   {       [ XF86Eject             ]       };
+    key <I1E>   {       [ XF86Shop              ]       };
+    key <I1F>   {       [ XF86Pictures          ]       };
+    key <I26>   {       [ Help                  ]       };
+    key <I27>   {       [ XF86Finance           ]       };
+    key <I32>   {       [ XF86WWW               ]       };
+    key <I39>   {       [ Print                 ]       };
+    key <I5F>   {       [ XF86Standby           ]       };
+    key <I65>   {       [ XF86Search            ]       };
+    key <I6C>   {       [ XF86Mail              ]       };
+    key <I75>   {       [ Help                  ]       };
+};
+
+// Hewlett-Packard Omnibook XE3 GC, GD, GE and Pavilion N5xxx
+partial alphanumeric_keys
+xkb_symbols "hpxe3gc" {
+    // Describes the OneTouch buttons on HP Omnibook XE3 GC and
+    // HP Pavilion N52XX models.
+    // See http://sourceforge.net/projects/omke for details on enabling
+    // these keys
+    include "inet(media_common)"
+    key <I71>	{	[ Help			]	};
+    key <I72>	{	[ XF86Launch1		]	};
+    key <I73>	{	[ XF86WWW		]	};
+    key <I74>	{	[ XF86Mail		]	};
+};
+
+// Hewlett-Packard Omnibook XE3 GF
+partial alphanumeric_keys
+xkb_symbols "hpxe3gf" {
+    // Describes the OneTouch buttons on HP Omnibook XE3 GF models.
+    // See http://sourceforge.net/projects/omke for details on enabling
+    // these keys
+    include "inet(media_common)"
+    key <I32>	{	[ XF86WWW		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <I73>	{	[ Help			]	};
+    key <I74>	{	[ XF86Launch1		]	};
+};
+
+// Hewlett-Packard Omnibook XT1000
+partial alphanumeric_keys
+xkb_symbols "hpxt1000" {
+    // Describes the OneTouch buttons on HP Omnibook XT1000 models.
+    // See http://sourceforge.net/projects/omke for details on enabling
+    // these keys
+    include "inet(media_common)"
+    key <I32>	{	[ XF86WWW		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <I71>	{	[ XF86Launch3		]	};
+    key <I72>	{	[ Help			]	};
+    key <I73>	{	[ XF86Launch2		]	};
+    key <I74>	{	[ XF86Launch1		]	};
+};
+
+// Hewlett-Packard Pavilion ZT11xx
+partial alphanumeric_keys
+xkb_symbols "hpzt11xx" {
+    // Describes the OneTouch buttons on HP Pavilion ZT11xx models.
+    // See http://sourceforge.net/projects/omke for details on enabling
+    // these keys
+    include "inet(media_common)"
+    key <I32>	{	[ XF86WWW		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <I71>	{	[ XF86Launch3		]	};
+    key <I72>	{	[ Help			]	};
+    key <I73>	{	[ XF86Launch2		]	};
+    key <I74>	{	[ XF86Launch1		]	};
+};
+
+// Hewlett-Packard Omnibook XE4xxx and ZE4xxx
+partial alphanumeric_keys
+xkb_symbols "hpxe4xxx" {
+    // Describes the OneTouch buttons on HP Omnibook XE4xxx and ZE4xxx
+    // See http://sourceforge.net/projects/omke for details on enabling
+    // models.
+    // these keys
+    include "inet(media_common)"
+    key <I32>	{	[ XF86WWW		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <I70>	{	[ Help			]	};
+    key <I71>	{	[ XF86Launch2		]	};
+    key <I73>	{	[ XF86Launch1		]	};
+};
+
+// Hewlett-Packard Omnibook 500 FA
+partial alphanumeric_keys
+xkb_symbols "hp500fa" {
+    // Describes the OneTouch buttons on HP Omnibook 500 FA models.
+    // See http://sourceforge.net/projects/omke for details on enabling
+    // these keys
+    key <I73>	{	[ Help			]	};
+    key <I74>	{	[ XF86Launch1		]	};
+};
+
+// Hewlett-Packard Omnibook 5xx
+partial alphanumeric_keys
+xkb_symbols "hp5xx" {
+    // Describes the OneTouch buttons on HP Omnibook 5xx models.
+    // See http://sourceforge.net/projects/omke for details on enabling
+    // these keys
+    include "inet(media_common)"
+    key <I73>	{	[ Help			]	};
+    key <I74>	{	[ XF86Launch1		]	};
+};
+
+
+// Honeywell
+
+
+// Honeywell Euroboard
+partial alphanumeric_keys
+xkb_symbols "honeywell_euroboard" {
+    // January 2002
+    // Scott Penrose <scottp@dd.com.au>
+    // http://linux.dd.com.au/quest/linux/keyboard/honeywell/
+    key <I10>	{	[ XF86Game		]	};
+    key <I12>	{	[ XF86AudioPrev		]	};
+    key <I17>	{	[ XF86Eject		]	};
+    key <I18>	{	[ XF86Launch2		]	};
+    key <I19>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I1E>	{	[ XF86Launch1		]	};
+    key <I20>	{	[ XF86AudioMute		]	};
+    key <I22>	{	[ XF86AudioNext		]	};
+    key <I23>	{	[ XF86AudioStop		]	};
+    key <I24>	{	[ XF86Mail		]	};
+    key <I25>	{	[ XF86ScreenSaver	]	};
+    key <I26>	{	[ XF86Calculator	]	};
+    key <I2E>	{	[ XF86AudioLowerVolume	]	};
+    key <I30>	{	[ XF86AudioRaiseVolume	]	};
+    key <I32>	{	[ XF86WWW		]	};
+};
+
+
+// IBM
+
+
+// IBM Rapid Access
+partial alphanumeric_keys 
+xkb_symbols "rapidaccess" {
+    key <I12>	{	[ XF86AudioMute		]	};
+    key <I17>	{	[ XF86Launch2		]	};
+    key <I1E>	{	[ XF86AudioLowerVolume	]	};
+    key <I20>	{	[ XF86AudioRaiseVolume	]	};
+    key <I21>	{	[ XF86AudioNext		]	};
+    key <I22>	{	[ XF86AudioPause	]	};
+    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I23>	{	[ XF86AudioPrev		]	};
+    key <I24>	{	[ XF86AudioStop		]	};
+    key <I25>	{	[ XF86Standby		]	};
+    key <I26>	{	[ Help			]	};
+    key <I2E>	{	[ XF86Launch4		]	};
+    key <I30>	{	[ XF86Launch3		]	};
+    key <I32>	{	[ XF86Launch1		]	};
+};
+
+// IBM Rapid Access II
+partial alphanumeric_keys 
+xkb_symbols "rapidaccess2" {
+    key <I12>	{	[ XF86AudioNext		]	};
+    key <I17>	{	[ XF86Favorites		]	};
+    key <I1E>	{	[ XF86AudioMute		]	};
+    key <I20>	{	[ XF86AudioStop		]	};
+    key <I21>	{	[ XF86AudioLowerVolume	]	};
+    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I23>	{	[ XF86AudioRaiseVolume	]	};
+    key <I24>	{	[ XF86AudioPrev		]	};
+    key <I25>	{	[ XF86HomePage		]	};
+    key <I26>	{	[ XF86Shop		]	};
+    key <I2E>	{	[ XF86Search		]	};
+    key <I30>	{	[ XF86MyComputer	]	};
+    key <I32>	{	[ XF86VendorHome	]	};
+    key <I5F>	{	[ XF86Standby		]	};
+};
+
+// IBM Rapid Access II (alternate option)
+partial alphanumeric_keys
+xkb_symbols "rapidaccess2a" {
+    key <I12>	{	[ XF86AudioNext		]	};
+    key <I17>	{	[ XF86Favorites		]	};
+    key <I1E>	{	[ XF86AudioMute		]	};
+    key <I20>	{	[ XF86AudioStop		]	};
+    key <I21>	{	[ XF86AudioLowerVolume	]	};
+    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I23>	{	[ XF86AudioRaiseVolume	]	};
+    key <I24>	{	[ XF86AudioPrev		]	};
+    key <I25>	{	[ XF86WWW		]	};
+    key <I26>	{	[ XF86Shop		]	};
+    key <I2E>	{	[ Help			]	};
+    key <I30>	{	[ XF86Option		]	};
+    key <I32>	{	[ XF86VendorHome	]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <MENU>	{	[ Menu			]	};
+};
+
+// IBM ThinkPad 41
+partial alphanumeric_keys
+xkb_symbols "thinkpad" {
+    include "inet(media_nav_common)"
+};
+
+
+// IBM ThinkPad 60 series
+partial alphanumeric_keys
+xkb_symbols "thinkpad60" {
+    include "inet(media_nav_common)"
+
+    key <I1F> { [ XF86VendorHome ] };
+};
+
+
+// IBM Space Saver
+partial alphanumeric_keys
+xkb_symbols "ibm_spacesaver" {
+    key <NMLK>  { [ Num_Lock, Num_Lock ] };
+};
+
+// Logitech
+
+// Logitech common definitions
+partial alphanumeric_keys
+xkb_symbols "logitech_base" {
+
+    include "inet(media_nav_common)"
+    key <I01> {	[ XF86AudioMedia ] };
+    key <I02> { [ XF86WWW ] };
+    key <I15> { [ XF86Community ] };
+    key <I16> { [ XF86ScrollClick ] };
+    key <I21> {	[ XF86VendorHome ] };
+    key <I32> { [ XF86HomePage ] };
+    key <I3B> { [ XF86New ] };
+    key <I3C> { [ XF86Reply ] };
+    key <I43> { [ XF86MyComputer ] };
+    key <I44> { [ XF86Documents ] };
+    key <I57> { [ XF86Pictures ] };
+    key <I58> { [ XF86Music ] };
+    key <I5F> { [ XF86Standby ] };
+    key <I65> { [ XF86Search ] };
+    key <I66> {	[ XF86Favorites	] };
+    key <I6C> { [ XF86Mail ] };
+    key <I6D> { [ XF86AudioMedia ] };
+};
+
+// Logitech second set of common keys
+partial hidden alphanumeric_keys
+xkb_symbols "logitech_set3" {
+    key <I17>	{	[ XF86AudioStop		]	};
+    key <I1E>	{	[ XF86AudioRaiseVolume	]	};
+    key <I1F>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I22>	{	[ XF86AudioNext		]	};
+    key <I24>	{	[ XF86AudioPrev		]	};
+    key <I25>	{	[ XF86AudioLowerVolume	]	};
+    key <I26>	{	[ XF86AudioMute		]	};
+    key <I44>   {       [ XF86New               ]       };      // F1
+    key <I45>   {       [ XF86Reply             ]       };      // F2
+    key <I4A>   {       [ XF86Send              ]       };      // F4
+    key <I54>   {       [ Print                 ]       };      // F7
+    key <I55>   {       [ XF86Save              ]       };      // F8
+    key <I56>   {       [ XF86Documents         ]       };      // F10
+    key <I69>   {       [ XF86Go                ]       };
+    key <XFER>  {       [ XF86AudioMedia        ]       };
+};
+
+// Logitech Access Keyboard
+partial alphanumeric_keys
+xkb_symbols "logiaccess" {
+    include "inet(logitech_base)"
+
+    key <FK13>	{	[ XF86MailForward	]	}; 
+    key <FK14>	{	[ XF86Send		]	}; 
+    key <I11>	{	[ XF86Messenger		]	};
+    key <I12>	{	[ XF86WebCam		]	};
+    key <I65>	{	[ XF86Search		]	}; 
+};
+
+// Logitech Cordless Desktop (alternate option)
+partial alphanumeric_keys
+xkb_symbols "logicda" {
+    include "inet(logitech_base)"
+    include "inet(logitech_set3)"
+};
+
+// Logitech Internet Navigator Keyboard
+partial alphanumeric_keys
+xkb_symbols "logicink" {
+    include "inet(logitech_base)"
+    key <I11>	{	[ XF86Shop		]	};
+    key <I12>	{	[ XF86VendorHome	]	};
+    key <I13>	{	[ XF86Finance		]	};
+    key <I14>	{	[ XF86Start		]	};
+};
+
+// Logitech Cordless Desktop EX110
+partial alphanumeric_keys
+xkb_symbols "logiex110" {
+    include "inet(logitech_base)"
+
+    key <I2F>   {       [ XF86Close             ]       };      // Close
+    key <I21>   {       [ XF86Calculator        ]       };
+
+// Extended function keys
+// In the Console before starting X
+// Using setkeycodes e03b 212 e03c 213 e03d 214 e03e 215 e03f 216 e040 217 
+//       setkeycodes e041 218 e042 219 e043 220 e044 221 e057 222 e058 223 6d 206
+// *=keys that are there but need different symbol names.
+
+    key <I3B>   {       [ Help                  ]       };      // F1
+    key <FK13>  {       [ XF86Word              ]       };      // F2
+    key <FK14>  {       [ XF86Excel             ]       };      // F3
+    key <FK15>  {       [ XF86Pictures          ]       };      // F4
+    key <FK16>  {       [ Undo                  ]       };      // F5
+    key <I65>   {       [ Redo                  ]       };      // F6 *
+    key <I42>   {       [ Print                 ]       };      // F7
+    key <I43>   {       [ XF86Save              ]       };      // F8
+    key <I44>   {       [ XF86Launch1           ]       };      // F9 *
+    key <I45>   {       [ XF86Launch2           ]       };      // F10
+    key <I14>   {       [ XF86Launch3           ]       };      // F11
+    key <I4A>   {       [ XF86Launch4           ]       };      // F12
+};
+
+// Logitech iTouch Internet Navigator Keyboard SE
+partial alphanumeric_keys
+xkb_symbols "logiinkse" {
+    include "inet(logitech_base)"
+
+    key <FK13>	{	[ XF86MailForward	]	};	// F3
+    key <FK14>	{	[ XF86Send		]	};	// F4
+    key <FK15>	{	[ Undo			]	};	// F5
+    key <FK16>	{	[ Redo			]	};	// F6
+    key <FK17>	{	[ Print			]	};	// F7
+    key <I11>	{	[ XF86Messenger		]	};
+    key <I12>	{	[ XF86WebCam		]	};
+    key <I13>	{	[ XF86VendorHome	]	};
+    key <I14>	{	[ XF86Shop		]	};
+    key <I42>	{	[ XF86Save		]	};	// F8
+};
+
+// Logitech iTouch Internet Navigator Keyboard SE (USB)
+partial alphanumeric_keys
+xkb_symbols "logiinkseusb" {
+    include "inet(logitech_base)"
+    include "inet(logitech_set3)"
+};
+
+// Logitech iTouch Cordless Keyboard (model Y-RB6)
+partial alphanumeric_keys
+xkb_symbols "logiitc" {
+    include "inet(logitech_base)"
+
+    key <I2F> {	[ XF86AudioRaiseVolume ] };
+
+    // Just to override RaiseVolume from logitech_base,
+    // since no keysym can have two keycodes, see
+    // https://bugs.freedesktop.org/show_bug.cgi?id=7095
+    key <I30> {	[ XF86Launch1 ] };
+};
+
+// Logitech Internet Keyboard
+partial alphanumeric_keys
+xkb_symbols "logiik" {
+    include "inet(logitech_base)"
+
+    key <I12>	{	[ Find			]	};
+    key <I17>	{	[ Print			]	};
+    key <I18>	{	[ XF86Favorites		]	};
+    key <I19>	{	[ XF86Reload		]	};
+    key <I1E>	{	[ XF86Search		]	};
+    key <I20>	{	[ XF86HotLinks		]	};
+    key <I22>	{	[ XF86Forward		]	};
+    key <I23>	{	[ XF86HomePage		]	};
+    key <I24>	{	[ XF86Stop		]	};
+    key <I25>	{	[ XF86OpenURL		]	};
+    key <I26>	{	[ XF86AddFavorite	]	};
+    key <I32>	{	[ XF86History		]	};
+    key <I7A>	{	[ XF86WWW		]	};
+};
+
+// Logitech iTouch
+partial alphanumeric_keys
+xkb_symbols "itouch" {
+    include "inet(logitech_base)"
+
+    key <I1F>	{	[ XF86AudioMute		]	};
+    key <I2B>	{	[ XF86AudioLowerVolume	]	};
+    key <I2D>	{	[ XF86AudioRaiseVolume	]	};
+};
+
+// Logitech UltraX Cordless Media Desktop
+partial alphanumeric_keys
+xkb_symbols "logiultraxc" {
+    key <FK16>  {       [ XF86AudioMute ]       };
+    key <FK17>  {       [ XF86AudioLowerVolume  ]       };
+    key <I2B>   {       [ XF86AudioNext ]       };
+    key <I2D>   {       [ XF86AudioPrev ]       };
+    key <I2C>   {       [ XF86AudioPlay, XF86AudioPause ]       };
+    key <KPDC>  {       [ XF86AudioRaiseVolume  ]       };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "logidinovo" {
+    include "inet(media_common)"
+    key <I02>	{	[ XF86HomePage		]	};
+    key <I12>	{	[ XF86Standby		]	};
+    key <I17>	{	[ XF86Search		]	};
+    key <I21>	{	[ XF86AudioRaiseVolume	]	};
+    key <I66>	{	[ XF86Start		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <K66>	{	[ XF86AudioLowerVolume	]	};
+    key <KPDC>	{	[ XF86AudioMute		]	};
+    key <XFER>	{	[ XF86AudioMedia	]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "logidinovoedge" {
+    include "inet(media_common)"
+    key <I02>	{	[ XF86HomePage		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <FK17>  {       [ XF86Search            ]       };
+    key <XFER>	{	[ XF86AudioMedia	]	};
+};
+
+// Memorex
+
+// Memorex MX1998
+partial alphanumeric_keys
+xkb_symbols "mx1998" {
+    include "inet(media_common)"
+    key <DOWN>	{	[ XF86ScrollDown	]	};
+    key <I12>	{	[ XF86AudioRewind	]	};
+    key <I17>	{	[ XF86Close		]	};
+    key <I18>	{	[ XF86Xfer		]	};
+    key <I1E>	{	[ XF86AudioRecord	]	};
+    key <I21>	{	[ XF86Documents		]	};
+    key <I23>	{	[ XF86Game		]	};
+    key <I25>	{	[ XF86Calculator	]	};
+    key <I26>	{	[ Menu			]	};
+    key <I32>	{	[ XF86WWW		]	};
+    key <I57>	{	[ XF86WakeUp		]	};
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I68>	{	[ XF86DOS		]	};
+    key <I7A>	{	[ XF86ScreenSaver	]	};
+    key <UP>	{	[ XF86ScrollUp		]	};
+};
+
+// Memorex MX2500 EZ-Access Keyboard
+partial alphanumeric_keys
+xkb_symbols "mx2500" {
+    include "inet(media_common)"
+    key <I12>	{	[ XF86Clear		]	};
+    key <I13>	{	[ XF86Phone		]	};
+    key <I14>	{	[ XF86DOS		]	};
+    key <I17>	{	[ XF86Close		]	};
+    key <I18>	{	[ XF86Xfer		]	};
+    key <I1E>	{	[ XF86Eject		]	};
+    key <I1F>	{	[ XF86Documents		]	};
+    key <I21>	{	[ XF86Calculator	]	};
+    key <I26>	{	[ XF86News		]	};
+    key <I32>	{	[ XF86WWW		]	};
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I6B>	{	[ XF86WakeUp		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <I6D>	{	[ XF86RotateWindows	]	};
+    key <LWIN>	{	[ Meta_L		]	};
+    key <MENU>	{	[ Menu			]	};
+    key <RWIN>	{	[ Meta_R		]	};
+};
+
+// Memorex MX2750
+partial alphanumeric_keys
+xkb_symbols "mx2750" {
+    include "inet(media_nav_common)"
+    key <I32>	{	[ XF86Launch0		]	};
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I63>	{	[ XF86WakeUp		]	};
+    key <I65>	{	[ XF86Search		]	};
+    key <I66>	{	[ XF86Favorites		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+};
+
+
+// Microsoft
+
+// Microsoft Natural Wireless Ergonomic Keyboard 7000
+partial alphanumeric_keys
+xkb_symbols "microsoft7000" {
+    include "inet(media_nav_common)"
+    key <I07>	{	[ Undo			]	};
+    key <I09>	{	[ XF86New		]	};
+    key <I0A>	{	[ Redo			]	};
+    key <I0E>	{	[ XF86MailForward	]	};
+    key <I21>	{	[ XF86Calculator	]	};
+    key <I2F>	{	[ XF86Close		]	};
+    key <I32>	{	[ XF86HomePage		]	};
+    key <I39>	{	[ Print			]	};
+    key <I55>	{	[ XF86Save		]	};
+    key <I5A>	{	[ XF86Send		]	};
+    key <I62>	{	[ Help			]	};
+    key <I64>	{	[ XF86Reply		]	};
+    key <I65>	{	[ XF86Search		]	};
+    key <I66>	{	[ XF86Favorites		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <I76>	{	[ parenleft		]	};
+    key <I7B>	{	[ parenright		]	};
+    key <K59>	{	[ KP_Equal		]	};
+    key <K64>	{	[ XF86Open		]	};
+//  Missing because of lack of support from kbd driver: Spell, Launch,
+//  and Zoom in and out buttons.
+};
+
+// Microsoft Internet Keyboard
+partial alphanumeric_keys
+xkb_symbols "microsoftinet" {
+    include "inet(nav_common)"
+    key <I21>	{	[ XF86Calculator	]	};
+    key <I32>	{	[ XF86WWW		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I65>	{	[ XF86Search		]	};
+    key <I66>	{	[ XF86Favorites		]	};
+    key <I68>	{	[ XF86AudioStop		]	};
+    key <I6B>	{	[ XF86MyComputer	]	};
+    key <I6C>	{	[ XF86Mail		]	};
+};
+
+// Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
+partial alphanumeric_keys 
+xkb_symbols "microsoftpro" {
+    include "inet(media_nav_common)"
+    key <I21>	{	[ XF86Calculator	]	};
+    key <I32>	{	[ XF86HomePage		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I65>	{	[ XF86Search		]	};
+    key <I66>	{	[ XF86Favorites		]	};
+    key <I67>	{	[ XF86Reload		]	};
+    key <I68>	{	[ XF86Stop		]	};
+    key <I6B>	{	[ XF86MyComputer	]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <I6D>	{	[ XF86AudioMedia	]	};
+//   Internet Section -- Left Side
+//   Multimedia Section -- Right Side
+//   My Computer Section -- Far Right
+};
+
+// Microsoft Natural Keyboard Pro USB  
+partial alphanumeric_keys  
+ xkb_symbols "microsoftprousb" {  
+    include "inet(nav_common)"
+     key <FK16>   {   [ XF86Reload      ]   };  
+     key <I01>   {   [ XF86AudioMedia   ]   };  
+     key <I02>   {   [ XF86HomePage      ]   };  
+     key <I17>   {   [ XF86AudioStop      ]   };  
+     key <I1E>   {   [ XF86AudioRaiseVolume   ]   };  
+     key <I1F>   {   [ XF86AudioPlay, XF86AudioPause ] };  
+     key <I21>   {   [ XF86Calculator   ]   };  
+     key <I22>   {   [ XF86AudioNext      ]   };  
+     key <I24>   {   [ XF86AudioPrev      ]   };  
+     key <I25>   {   [ XF86AudioLowerVolume   ]   };  
+     key <I26>   {   [ XF86AudioMute      ]   };  
+     key <I63>   {   [ XF86Standby      ]   };  
+     key <I65>   {   [ XF86Search      ]   };  
+     key <I66>   {   [ XF86Favorites      ]   };  
+     key <I68>   {   [ XF86Stop      ]   };  
+     key <I6C>   {   [ XF86Mail      ]   };  
+ //   Internet Section -- Left Side  
+ //   Multimedia Section -- Right Side  
+ //   My Computer Section -- Far Right  
+ //  My computer maps to printscreen, so leaving commented out for now   
+ //  key <PRSC>   {   [ XF86MyComputer   ]   };  
+}; 
+
+// Microsoft Natural Keyboard Pro OEM 
+partial alphanumeric_keys  
+xkb_symbols "microsoftprooem" { 
+    include "inet(media_nav_common)"
+    key <FK17>	{	[ XF86Search		]	}; 
+    key <I01>	{	[ XF86AudioMedia	]	}; 
+    key <I02>	{	[ XF86HomePage		]	}; 
+    key <I21>	{	[ XF86Calculator	]	}; 
+    key <I63>	{	[ XF86Standby		]	}; 
+    key <I66>	{	[ XF86Favorites		]	}; 
+    key <I67>	{	[ XF86Reload		]	}; 
+    key <I68>	{	[ XF86Stop		]	}; 
+    key <I6C>	{	[ XF86Mail		]	}; 
+    key <K67>	{	[ XF86MyComputer	]	}; 
+//   Internet Section -- Left Side 
+//   Multimedia Section -- Right Side 
+//   My Computer Section -- Far Right 
+};
+
+// Microsoft Internet Keyboard Pro, Swedish
+partial alphanumeric_keys
+xkb_symbols "microsoftprose" {
+    include "inet(nav_common)"
+    key <FK16>	{	[ XF86Reload		]	};
+    key <I02>	{	[ XF86HomePage		]	};
+    key <I17>	{	[ XF86AudioStop		]	};
+    key <I1E>	{	[ XF86AudioRaiseVolume	]	};
+    key <I1F>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I21>	{	[ XF86Calculator	]	};
+    key <I22>	{	[ XF86AudioNext		]	};
+    key <I24>	{	[ XF86AudioPrev		]	};
+    key <I25>	{	[ XF86AudioLowerVolume	]	};
+    key <I26>	{	[ XF86AudioMute		]	};
+    key <I63>	{	[ XF86Standby		]	};
+    key <I65>	{	[ XF86Search		]	};
+    key <I66>	{	[ XF86Favorites		]	};
+    key <I68>	{	[ XF86AudioStop		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <PRSC>	{	[ XF86MyComputer	]	};
+    key <XFER>	{	[ XF86AudioMedia	]	};
+};
+
+// Microsoft Office Keyboard
+partial alphanumeric_keys
+xkb_symbols "microsoftoffice" {
+    include "inet(nav_common)"
+    key <BRK>	{	[ XF86Calendar		]	};
+    key <END>	{	[ Undo			]	};
+    key <I02>	{	[ XF86WWW		]	};
+    key <I1E>	{	[ XF86AudioLowerVolume	]	};
+    key <I21>	{	[ XF86Calculator	]	};
+    key <I25>	{	[ XF86AudioRaiseVolume	]	};
+    key <I26>	{	[ XF86AudioMute		]	};
+    key <I3C>	{	[ XF86Cut		]	};
+    key <I4A>	{	[ XF86LogOff		]	};
+    key <I54>	{	[ XF86ApplicationLeft	]	};
+    key <I55>	{	[ XF86TaskPane		]	};
+    key <I56>	{	[ XF86Spell		]	};
+    key <I57>	{	[ XF86HomePage		]	};
+    key <I58>	{	[ XF86New		]	};
+    key <I59>	{	[ XF86Open		]	};
+    key <I5A>	{	[ XF86Close		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I62>	{	[ Help			]	};
+    key <I64>	{	[ XF86Save		]	};
+    key <I67>	{	[ Print			]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <I6D>	{	[ XF86OfficeHome	]	};
+    key <I70>	{	[ Redo			]	};
+    key <I71>	{	[ XF86Reply		]	};
+    key <I72>	{	[ XF86MailForward	]	};
+    key <I73>	{	[ XF86Send		]	};
+    key <I78>	{	[ XF86Copy		]	};
+    key <MOAR>	{	[ XF86ApplicationRight	]	};
+    key <RCTL>	{	[ XF86Paste		]	};
+};
+
+// Microsoft Wireless Multimedia Keyboard 1.0A 
+partial alphanumeric_keys 
+xkb_symbols "microsoftmult" { 
+    include "inet(media_common)"
+    key <AE13>  {       [ XF86Messenger         ]       }; 
+    key <FK14>	{	[ XF86New		]	}; 
+    key <FK15>	{	[ XF86Open		]	}; 
+    key <FK16>	{	[ XF86Close		]	}; 
+    key <FK17>	{	[ XF86Reply		]	}; 
+    key <I07>	{	[ Redo			]	}; 
+    key <I08>	{	[ Undo			]	}; 
+    key <I16>   {       [ XF86LogOff            ]       }; 
+    key <I21>   {       [ XF86Calculator        ]       }; 
+    key <I23>	{	[ XF86Spell		]	}; 
+    key <I32>   {       [ XF86HomePage          ]       }; 
+    key <I3B>	{	[ Help			]	}; 
+    key <I3C>   {       [ XF86Music     ]       }; 
+    key <I42>	{	[ XF86Forward		]	}; 
+    key <I43>	{	[ XF86Send		]	}; 
+    key <I57>	{	[ XF86Save		]	}; 
+    key <I58>	{	[ Print			]	}; 
+    key <I5F>   {       [ XF86Sleep             ]       }; 
+    key <I64>   {       [ XF86Pictures  ]       }; 
+    key <I6C>   {       [ XF86Mail              ]       }; 
+    key <I6D>   {       [ XF86AudioMedia        ]       }; 
+    key <I80>   {       [ XF86Documents ]       }; 
+//   Control Section -- Far Right 
+//   F-Locked Function keys 
+//   Internet Section -- Right Side 
+//   Multimedia Section -- Centre 
+//   My Computer Section -- Left Side 
+}; 
+
+// Oretec
+
+// Oretec MCK-800 MM/Internet keyboard
+partial alphanumeric_keys
+xkb_symbols "oretec" {
+    key <I10>	{	[ XF86ScrollUp		]	};
+    key <I12>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I17>	{	[ XF86AudioPrev		]	};
+    key <I18>	{	[ XF86ScrollDown	]	};
+    key <I19>	{	[ XF86ZoomOut		]	};
+    key <I1E>	{	[ XF86AudioMute		]	};
+    key <I21>	{	[ XF86WWW		]	};
+    key <I22>	{	[ Menu			]	};
+    key <I23>	{	[ XF86AudioStop		]	};
+    key <I24>	{	[ XF86Calculator	]	};
+    key <I25>	{	[ XF86Xfer		]	};
+    key <I26>	{	[ XF86Mail		]	};
+    key <I2E>	{	[ XF86AudioNext		]	};
+    key <I30>	{	[ XF86AudioRaiseVolume	]	};
+    key <I32>	{	[ XF86ZoomIn		]	};
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I63>	{	[ XF86WakeUp		]	};
+    key <I68>	{	[ XF86AudioLowerVolume	]	};
+};
+
+
+// Propeller
+
+// Propeller Voyager (KTEZ-1000)
+partial alphanumeric_keys
+xkb_symbols "propeller" {
+    include "inet(media_common)"
+    key <I12>	{	[ XF86AudioRewind	]	};
+    key <I17>	{	[ XF86Close		]	};
+    key <I18>	{	[ XF86Xfer		]	};
+    key <I1E>	{	[ XF86AudioRecord	]	};
+    key <I21>	{	[ XF86Documents		]	};
+    key <I23>	{	[ XF86Game		]	};
+    key <I25>	{	[ XF86Calculator	]	};
+    key <I26>	{	[ Menu			]	};
+    key <I32>	{	[ XF86WWW		]	};
+    key <I68>	{	[ XF86DOS		]	};
+    key <I7A>	{	[ XF86Standby		]	};
+};
+
+
+// QTronix
+
+// QTronix Scorpius 98N+
+partial alphanumeric_keys
+xkb_symbols "qtronix" {
+    key <I10>	{	[ XF86ScrollDown	]	};
+    key <I12>	{	[ XF86Forward		]	};
+    key <I13>	{	[ XF86WakeUp		]	};
+    key <I17>	{	[ XF86Search		]	};
+    key <I18>	{	[ XF86Standby		]	};
+    key <I19>	{	[ XF86ScrollUp		]	};
+    key <I1E>	{	[ XF86Back		]	};
+    key <I1F>	{	[ XF86Reload		]	};
+    key <I20>	{	[ XF86AudioRaiseVolume	]	};
+    key <I21>	{	[ XF86AudioPrev		]	};
+    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I23>	{	[ XF86AudioNext		]	};
+    key <I24>	{	[ XF86AudioStop		]	};
+    key <I25>	{	[ XF86HomePage		]	};
+    key <I26>	{	[ XF86AudioMute		]	};
+    key <I2E>	{	[ XF86AudioLowerVolume	]	};
+    key <I30>	{	[ XF86AudioRecord	]	};
+    key <I31>	{	[ XF86PowerOff		]	};
+    key <I32>	{	[ XF86Stop		]	};
+    key <I68>	{	[ XF86Calculator	]	};
+};
+
+
+// Samsung
+
+// Samsung SDM 4500P
+partial alphanumeric_keys
+xkb_symbols "samsung4500" {
+    include "inet(media_common)"
+    key <AE13>	{	[ XF86Launch4		]	};
+    key <I02>	{	[ XF86Launch1		]	};
+    key <I04>	{	[ XF86Launch3		]	};
+    key <I06>	{	[ XF86Launch5		]	};
+    key <I09>	{	[ XF86Close		]	};
+    key <I0A>	{	[ XF86Book		]	};
+    key <I18>	{	[ XF86Eject		]	};
+    key <I26>	{	[ Help			]	};
+    key <I32>	{	[ XF86WWW		]	};
+    key <I59>	{	[ XF86Explorer		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <NFER>	{	[ XF86Launch2		]	};
+};
+
+// Samsung SDM 4510P
+partial alphanumeric_keys
+xkb_symbols "samsung4510" {
+    include "inet(media_common)"
+    key <I02>	{	[ XF86Launch1		]	};
+    key <I04>	{	[ XF86Launch3		]	};
+    key <I18>	{	[ XF86Eject		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <NFER>	{	[ XF86Launch2		]	};
+};
+
+
+// SK
+
+// SK-1300
+partial alphanumeric_keys
+xkb_symbols "sk1300" {
+    include "inet(media_common)"
+    key <I12>	{	[ XF86Eject		]	};
+    key <I1E>	{	[ XF86Forward		]	};
+    key <I20>	{	[ XF86WWW		]	};
+    key <I25>	{	[ XF86Standby		]	};
+    key <I26>	{	[ XF86Back		]	};
+    key <I32>	{	[ XF86Stop		]	};
+};
+
+// SK-2500
+partial alphanumeric_keys
+xkb_symbols "sk2500" {
+    include "inet(media_common)"
+    key <I12>	{	[ XF86AudioRewind	]	};
+    key <I17>	{	[ XF86Close		]	};
+    key <I18>	{	[ XF86Eject		]	};
+    key <I18>	{	[ XF86Eject		]	};
+    key <I19>	{	[ XF86Forward		]	};
+    key <I1E>	{	[ XF86AudioRecord	]	};
+    key <I21>	{	[ XF86Calculator	]	};
+    key <I23>	{	[ XF86Xfer		]	};
+    key <I25>	{	[ XF86PowerOff		]	};
+    key <I26>	{	[ Menu			]	};
+    key <I32>	{	[ XF86WWW		]	};
+    key <I7A>	{	[ XF86ScreenSaver	]	};
+};
+
+// SK-6200
+partial alphanumeric_keys
+xkb_symbols "sk6200" {
+    key <I12>	{	[ XF86Favorites		]	};
+    key <I14>	{	[ XF86AudioLowerVolume	]	};
+    key <I16>	{	[ XF86AudioRaiseVolume	]	};
+    key <I17>	{	[ XF86Back		]	};
+    key <I19>	{	[ XF86Forward		]	};
+    key <I1E>	{	[ XF86WWW		]	};
+    key <I20>	{	[ XF86AudioMute		]	};
+    key <I21>	{	[ XF86AudioNext		]	};
+    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I23>	{	[ XF86AudioPrev		]	};
+    key <I24>	{	[ XF86AudioStop		]	};
+    key <I32>	{	[ XF86Mail		]	};
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+};
+
+// SK-7100
+partial alphanumeric_keys
+xkb_symbols "sk7100" {
+    include "inet(media_common)"
+    key <I12>	{	[ XF86AudioPause	]	};
+    key <I17>	{	[ XF86Close		]	};
+    key <I18>	{	[ XF86Video		]	};
+    key <I1E>	{	[ XF86Eject		]	};
+    key <I25>	{	[ XF86CD		]	};
+    key <I26>	{	[ XF86Display		]	};
+    key <I32>	{	[ XF86WWW		]	};
+};
+
+
+// Sven
+
+// SVEN Ergonomic 2500
+partial alphanumeric_keys
+xkb_symbols "sven" {
+    key <I10>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I12>	{	[ XF86Forward		]	};
+    key <I17>	{	[ XF86AudioRaiseVolume	]	};
+    key <I18>	{	[ XF86ZoomOut		]	};
+    key <I19>	{	[ XF86AudioPrev		]	};
+    key <I1A>	{	[ XF86AudioStop		]	};
+    key <I1E>	{	[ XF86HomePage		]	};
+    key <I20>	{	[ XF86Mail		]	};
+    key <I21>	{	[ XF86ZoomIn		]	};
+    key <I22>	{	[ XF86MyComputer	]	};
+    key <I23>	{	[ XF86Stop		]	};
+    key <I24>	{	[ XF86ScreenSaver	]	};
+    key <I25>	{	[ XF86AudioLowerVolume	]	};
+    key <I26>	{	[ XF86AudioMute		]	};
+    key <I28>	{	[ XF86Calculator	]	};
+    key <I29>	{	[ XF86Reload		]	};
+    key <I2E>	{	[ XF86Search		]	};
+    key <I30>	{	[ XF86Favorites		]	};
+    key <I31>	{	[ XF86ScrollUp		]	};
+    key <I32>	{	[ XF86ScrollDown	]	};
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I62>	{	[ XF86AudioNext		]	};
+    key <I63>	{	[ XF86WakeUp		]	};
+    key <I68>	{	[ XF86Back		]	};
+};
+
+// SVEN Slim 303
+partial alphanumeric_keys
+xkb_symbols "sven303" {
+    key <I11>	{	[ XF86PowerOff		]	};
+    key <I12>	{	[ XF86Sleep		]	};
+    key <I16>	{	[ XF86WakeUp		]	};
+};
+
+
+// Symplon
+
+// Symplon PaceBook (tablet PC)
+partial alphanumeric_keys
+xkb_symbols "symplon" {
+    key <HOME>	{	[ XF86RotationPB	]	};
+    key <I13>	{	[ XF86SplitScreen	]	};
+    key <I14>	{	[ XF86Support		]	};
+    key <I17>	{	[ XF86New		]	};
+    key <I21>	{	[ XF86User2KB		]	};
+    key <I25>	{	[ XF86RotationKB	]	};
+    key <I26>	{	[ XF86MenuKB		]	};
+    key <I32>	{	[ XF86WWW		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I6B>	{	[ XF86User1KB		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+    key <PAUS>	{	[ XF86UserPB		]	};
+    key <UP>	{	[ XF86MenuPB		]	};
+};
+
+// Toshiba
+
+// Toshiba Satellite S3000
+partial alphanumeric_keys
+xkb_symbols "toshiba_s3000" {
+    include "inet(media_common)"
+    // Describes the Special buttons on Toshiba Satellite 3000 models.
+    // See http://sourceforge.net/projects/omke for details on enabling
+    // these keys
+    key <I06>	{	[ XF86Launch1		]	};
+    key <I13>	{	[ XF86Launch2		]	};
+    key <I71>	{	[ XF86WWW		]	};
+    key <I73>	{	[ XF86Mail		]	};
+    key <I75>	{	[ XF86AudioRaiseVolume	]	};
+    key <I76>	{	[ XF86AudioLowerVolume	]	};
+};
+
+// Trust
+
+// Trust Wireless Keyboard Classic
+partial alphanumeric_keys
+xkb_symbols "trust" {
+    include "inet(media_nav_common)"
+    key <I11>	{	[ XF86ScreenSaver	]	};
+    key <I1E>	{	[ XF86Eject		]	};
+    key <I21>	{	[ XF86Calculator	]	};
+    key <I32>	{	[ XF86WWW		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I63>	{	[ XF86WakeUp		]	};
+    key <I6C>	{	[ XF86Mail		]	};
+};
+
+
+// Trust Direct Access Keyboard
+partial alphanumeric_keys
+xkb_symbols "trustda" {
+    include "inet(media_common)"
+    key <I12>	{	[ XF86AudioRewind	]	};
+    key <I17>	{	[ XF86Close		]	};
+    key <I18>	{	[ XF86Eject		]	};
+    key <I1E>	{	[ XF86AudioRecord	]	};
+    key <I21>	{	[ XF86Calculator	]	};
+    key <I23>	{	[ XF86Xfer		]	};
+    key <I25>	{	[ XF86Standby		]	};
+    key <I26>	{	[ Help			]	};
+    key <I32>	{	[ XF86WWW		]	};
+    key <I7A>	{	[ XF86Away		]	};
+};
+
+
+// YaHoo!
+
+// Yahoo! Internet Keyboard
+partial alphanumeric_keys
+xkb_symbols "yahoo" {
+    key <I11>	{	[ XF86AudioPrev		]	};
+    key <I12>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I1E>	{	[ XF86AudioStop		]	};
+    key <I1F>	{	[ XF86AudioNext		]	};
+    key <I20>	{	[ XF86AudioRecord	]	};
+    key <I21>	{	[ XF86AudioLowerVolume	]	};
+    key <I22>	{	[ XF86AudioRaiseVolume	]	};
+    key <I23>	{	[ XF86AudioMute		]	};
+    key <I24>	{	[ XF86Close		]	};
+    key <I25>	{	[ XF86Calculator	]	};
+    key <I26>	{	[ Help			]	};
+    key <I27>	{	[ XF86Mail		]	};
+    key <I28>	{	[ XF86WWW		]	};
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I63>	{	[ XF86WakeUp		]	};
+};
+
+// Super Power Internet Keyboard 
+ 
+// Super Power Multimedia Keyboard 
+xkb_symbols "sp_inet" { 
+    include "inet(media_nav_common)"
+    key <I32>	{	[ XF86HomePage		]	}; 
+    key <I5E>	{	[ XF86PowerOff		]	}; 
+    key <I5F>	{	[ XF86Standby		]	}; 
+    key <I63>	{	[ XF86WakeUp		]	};       
+    key <I66>	{	[ XF86Favorites		]	}; 
+    key <I67>	{	[ XF86Refresh		]	}; 
+    key <I68>	{	[ XF86Stop		]	}; 
+    key <I6C>	{	[ XF86Mail		]	}; 
+};
+
+// Apple keyboards (macbooks, powerbooks, powermac G5, etc)
+partial xkb_symbols "apple" {
+// Really brightness up/down
+    key <II65>  {       [ XF86BrightnessAdjust  ]       };
+    key <I54>   {       [ XF86BrightnessAdjust  ]       };
+    key <I20>	{	[ XF86AudioMute		]	};
+    key <I2E>	{	[ XF86AudioLowerVolume	]	};
+    key <I30>	{	[ XF86AudioRaiseVolume	]	};
+    key <I56>   {       [ XF86RotateWindows	]	};
+// Really keyboard backlight off/up/down
+    key <I57>   {       [ XF86Launch0		]	};
+    key <I58>	{	[ XF86Launch1    	]	};
+    key <I59>	{	[ XF86Launch2   	]	};
+    key <K5D>	{	[ F13 ]    };
+    key <K5E>	{	[ F14 ]    };
+    key <K5F>	{	[ F15 ]    };
+    key <K6C>	{	[ XF86Eject ]    };
+    key <MDSW>	{	[ F16 ]    };
+    key <KPEQ>  {       [ KP_Equal ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "cymotionlinux" {
+    include "inet(media_nav_common)"
+    key <FK17>	{	[	XF86Search		]	};
+    key <I02>	{	[	XF86WWW			]	};
+    key <I05>	{	[	Redo			]	};
+    key <I07>	{	[	Undo			]	};
+    key <I0F>	{	[	XF86ScrollDown		]	};
+    key <I17>	{	[	XF86Launch2		]	};
+    key <I1F>	{	[	XF86Launch1		]	};
+    key <I21>	{	[	XF86Calculator		]	};
+    key <I28>	{	[	XF86MenuKB		]	};
+    key <I2B>	{	[	XF86Launch3		]	};
+    key <I3C>	{	[	XF86Cut			]	};
+    key <I47>	{	[	XF86PowerOff		]	};
+    key <I63>   {	[	XF86Standby		]	};
+    key <I67>	{	[	XF86Reload		]	};
+    key	<I68>	{	[	XF86Stop		]	};
+    key <I6C>	{	[	XF86Mail		]	};
+    key <I78>	{	[	XF86Copy		]	};
+    key <K65>	{	[	XF86Paste		]	};
+    key <K68>	{	[	XF86Standby		]	};
+    key <K6C>	{	[	XF86Eject		]	};
+    key <K75>	{	[	XF86ScrollUp		]	};
+    key	<RWIN>	{	[	at		]	};
+    key <XFER>	{	[	XF86AudioMedia		]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "silvercrest" {
+    include "inet(media_nav_common)"
+    key <I02>	{	[ XF86HomePage		]	};    
+    key <I21>	{	[ XF86Launch2		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I66>	{	[ XF86Favorites		]	};    
+    key <I6C>	{	[ XF86Mail		]	};    
+    key <I6D>	{	[ XF86AudioMedia	]	};
+    key <K67>	{	[ XF86Launch1		]	};
+};
+
+// eMachines
+
+partial alphanumeric_keys
+xkb_symbols "emachines" {
+    include "inet(media_common)"
+    key <I32>  {  [ XF86iTouch                    ]  };
+    key <I5F>  {  [ XF86Sleep                     ]  };
+    key <I65>  {  [ XF86Search                    ]  };
+    key <I6C>  {  [ XF86Mail                      ]  };
+    key <I6D>  {  [ XF86AudioMedia                ]  };
+    key <KP0>  {  [ KP_0                          ]  };
+    key <KP1>  {  [ KP_1                          ]  };
+    key <KP2>  {  [ KP_2                          ]  };
+    key <KP3>  {  [ KP_3                          ]  };
+    key <KP4>  {  [ KP_4                          ]  };
+    key <KP5>  {  [ KP_5                          ]  };
+    key <KP6>  {  [ KP_6                          ]  };
+    key <KP7>  {  [ KP_7                          ]  };
+    key <KP8>  {  [ KP_8                          ]  };
+    key <KP9>  {  [ KP_9                          ]  };
+    key <KPAD> {  [ KP_Add                        ]  };
+    key <KPDL> {  [ KP_Decimal                    ]  };
+    key <KPDV> {  [ KP_Divide                     ]  };
+    key <KPMU> {  [ KP_Multiply                   ]  };
+    key <KPSU> {  [ KP_Subtract                   ]  };
+};
+
+// BenQ
+
+//
+// BenQ X*
+// (X730, X500, X800)
+//
+// to make the FN_LOCK and CONFIG key work on the BenQ X500 , use ...
+// setkeycodes e074 130 # KEY_PROPS  from /usr/include/linux/input.h
+// setkeycodes e075 171 # KEY_CONFIG from /usr/include/linux/input.h
+partial alphanumeric_keys
+xkb_symbols "benqx" {
+    include "inet(media_nav_common)"
+    key <I02> { [ XF86ModeLock ] };
+    key <I21> { [ XF86WWW      ]  };
+    key <I2B> { [ XF86Go ] };
+    key <I31> { [ XF86Calendar ] };
+    key <I32> { [ XF86WWW ] };
+    key <I5E> { [ XF86PowerOff ]  };
+    key <I5F> { [ XF86ScreenSaver ] };
+    key <I63> { [ XF86WakeUp   ]  };
+    key <I65> { [ XF86Search ] };
+    key <I66> { [ XF86Favorites ] };
+    key <I6C> { [ XF86Mail ] };
+    key <I6D> { [ XF86AudioMedia ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "logitech_g15" {
+
+    include "inet(media_common)"
+    key <AE13> {         [   XF86Messenger ] };
+
+    key <HKTG> {         [     XF86Launch7 ] };
+
+    key  <I02> {         [     XF86Launch9 ] };
+    key  <I04> {         [       XF86Phone ] };
+    key  <I08> {         [     XF86LaunchD ] };
+    key  <I09> {         [     XF86Support ] };
+    key  <I0F> {         [     XF86LaunchF ] };
+    key  <I16> {         [      XF86LogOff ] };
+    key  <I18> {         [     XF86Launch5 ] };
+    key  <I21> {         [      XF86Travel ] };
+    key  <I23> {         [       XF86Spell ] };
+    key  <I31> {         [     XF86Launch4 ] };
+    key  <I32> {         [    XF86HomePage ] };
+    key  <I3C> {         [       XF86Music ] };
+    key  <I42> {         [     XF86Forward ] };
+    key  <I43> {         [        XF86Send ] };
+    key  <I57> {         [        XF86Save ] };
+    key  <I5F> {         [       XF86Sleep ] };
+    key  <I64> {         [    XF86Pictures ] };
+    key  <I67> {         [     XF86LaunchA ] };
+    key  <I6C> {         [        XF86Mail ] };
+    key  <I6D> {         [  XF86AudioMedia ] };
+    key  <I76> {         [      XF86iTouch ] };
+    key  <I77> {         [     XF86Launch3 ] };
+    key  <I79> {         [    XF86ToDoList ] };
+    key  <I7B> {         [  XF86Calculator ] };
+ 
+    key  <K5A> {         [  XF86VendorHome ] };
+    key  <K5D> {         [        XF86Away ] };
+    key  <K5E> {         [      XF86WebCam ] };
+    key  <K5F> {         [     XF86Launch0 ] };
+    key  <K63> {         [     XF86Launch6 ] };
+    key  <K6D> {         [    XF86Calendar ] };
+    key  <K71> {         [     XF86LaunchB ] };
+    key  <K72> {         [     XF86LaunchC ] };
+    key  <K74> {         [         XF86WWW ] };
+    key  <K75> {         [     XF86LaunchE ] };
+
+    key <MDSW> {         [     XF86Launch1 ] };
+    key <NFER> {         [     XF86Launch2 ] };
+
+    key <XFER> {         [     XF86Launch8 ] };
+
+};
+
+// Intel
+
+// Intel Classmate
+partial alphanumeric_keys
+xkb_symbols "classmate" {
+    key <I2E>   {       [ XF86AudioLowerVolume  ] };	
+    key <I30>   {       [ XF86AudioRaiseVolume  ] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/iq b/xorg-server/xkbdata.src/symbols/iq
new file mode 100644
index 000000000..b2b742b95
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/iq
@@ -0,0 +1,34 @@
+// $XKeyboardConfig$
+// Iraque keyboard layout,
+
+// 3-Level layout
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    include "ara(basic)"
+    name[Group1]= "Iraq";
+};
+
+partial alphanumeric_keys
+xkb_symbols "ku" {
+    include "tr(ku)"
+    name[Group1]= "Iraq - Kurdish, Latin Q";
+};
+
+partial alphanumeric_keys
+xkb_symbols "ku_f" {
+    include "tr(ku_f)"
+    name[Group1]= "Iraq - Kurdish, (F)";
+};
+
+partial alphanumeric_keys
+xkb_symbols "ku_alt" {
+    include "tr(ku_alt)"
+    name[Group1]= "Iraq - Kurdish, Latin Alt-Q";
+};
+
+partial alphanumeric_keys
+xkb_symbols "ku_ara" {
+    include "ir(ku_ara)"
+    name[Group1]= "Iraq - Kurdish, Arabic-Latin";
+};
diff --git a/xorg-server/xkbdata.src/symbols/ir b/xorg-server/xkbdata.src/symbols/ir
new file mode 100644
index 000000000..af662cf3a
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/ir
@@ -0,0 +1,246 @@
+// $XKeyboardConfig$
+// Iranian keyboard layout,
+// based on National Iranian Keyboard Standard (ISIRI 2901:1994),
+// with additions.
+//
+// Author: Behnam Esfahbod <behnam@esfahbod.info>
+//
+
+
+// 3-Level layout
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    name[Group1]= "Iran";
+
+    // Persian digits
+    key <AE01> { [ 0x10006f1,	exclam,		quoteleft		] };
+    key <AE02> { [ 0x10006f2,	0x100066c,	at			] };
+    key <AE03> { [ 0x10006f3,	0x100066b,	numbersign		] };
+    key <AE04> { [ 0x10006f4,	0x100fdfc,	dollar			] };
+    key <AE05> { [ 0x10006f5,	0x100066a,	percent			] };
+    key <AE06> { [ 0x10006f6,	multiply,	asciicircum		] };
+    key <AE07> { [ 0x10006f7,	Arabic_comma,	ampersand		] };
+    key <AE08> { [ 0x10006f8,	asterisk,	enfilledcircbullet	] };
+    key <AE09> { [ 0x10006f9,	parenright,	0x100200e		] };
+    key <AE10> { [ 0x10006f0,	parenleft,	0x100200f		] };
+
+    // Other 3-Level symbols
+    key <TLDE> { [ 0x100200d,		division,		asciitilde	] };
+    key <AE11> { [ minus,		Arabic_tatweel,		underscore	] };
+    key <AE12> { [ equal,		plus,			0x1002212	] };
+    key <BKSL> { [ backslash,		bar,			0x1002010	] };
+    key <SPCE> { [ space,		0x100200c,		nobreakspace	] };
+
+    key <AD01> { [ Arabic_dad,		Arabic_sukun,		degree		] };
+    key <AD02> { [ Arabic_sad,		Arabic_dammatan,	VoidSymbol	] };
+    key <AD03> { [ Arabic_theh,		Arabic_kasratan,	0x13a4		] };
+    key <AD04> { [ Arabic_qaf,		Arabic_fathatan,	VoidSymbol	] };
+    key <AD05> { [ Arabic_feh,		Arabic_damma,		VoidSymbol	] };
+    key <AD06> { [ Arabic_ghain,	Arabic_kasra,		VoidSymbol	] };
+    key <AD07> { [ Arabic_ain,		Arabic_fatha,		VoidSymbol	] };
+    key <AD08> { [ Arabic_heh,		Arabic_shadda,		0x100202d	] };
+    key <AD09> { [ Arabic_khah,		bracketright,		0x100202e	] };
+    key <AD10> { [ Arabic_hah,		bracketleft,		0x100202c	] };
+    key <AD11> { [ Arabic_jeem,		braceright,		0x100202a	] };
+    key <AD12> { [ 0x1000686,		braceleft,		0x100202b	] };
+
+    key <AC01> { [ Arabic_sheen,	Arabic_hamzaonwaw,	VoidSymbol	] };
+    key <AC02> { [ Arabic_seen,		Arabic_hamzaonyeh,	VoidSymbol	] };
+    key <AC03> { [ 0x10006cc,		Arabic_yeh,		Arabic_alefmaksura ] };
+    key <AC04> { [ Arabic_beh,		Arabic_hamzaunderalef,	VoidSymbol	] };
+    key <AC05> { [ Arabic_lam,		Arabic_hamzaonalef,	VoidSymbol	] };
+    key <AC06> { [ Arabic_alef,		Arabic_maddaonalef,	0x1000671	] };
+    key <AC07> { [ Arabic_teh,		Arabic_tehmarbuta,	VoidSymbol	] };
+    key <AC08> { [ Arabic_noon,		guillemotright,		0x100fd3e	] };
+    key <AC09> { [ Arabic_meem,		guillemotleft,		0x100fd3f	] };
+    key <AC10> { [ 0x10006a9,		colon,			semicolon	] };
+    key <AC11> { [ 0x10006af,		Arabic_semicolon,	quotedbl	] };
+
+    key <AB01> { [ Arabic_zah,		Arabic_kaf,		VoidSymbol	] };
+    key <AB02> { [ Arabic_tah,		0x1000653,		VoidSymbol	] };
+    key <AB03> { [ Arabic_zain,		0x1000698,		VoidSymbol	] };
+    key <AB04> { [ Arabic_ra,		0x1000670,		0x1000656	] };
+    key <AB05> { [ Arabic_thal,		0x100200c,		0x100200d	] };
+    key <AB06> { [ Arabic_dal,		0x1000654,		0x1000655	] };
+    key <AB07> { [ 0x100067e,		Arabic_hamza,		ellipsis	] };
+    key <AB08> { [ Arabic_waw,		greater,		comma		] };
+    key <AB09> { [ period,		less,			apostrophe	] };
+    key <AB10> { [ slash,		Arabic_question_mark,	question	] };
+
+    include "level3(ralt_switch)"
+};
+
+
+partial hidden alphanumeric_keys
+xkb_symbols "part_pro" {
+
+    // Persian and English (ASCII) digits
+    key <AE01> { [ 0x10006f1,	exclam,		quoteleft,		1	] };
+    key <AE02> { [ 0x10006f2,	0x100066c,	at,			2	] };
+    key <AE03> { [ 0x10006f3,	0x100066b,	numbersign,		3	] };
+    key <AE04> { [ 0x10006f4,	0x100fdfc,	dollar,			4	] };
+    key <AE05> { [ 0x10006f5,	0x100066a,	percent,		5	] };
+    key <AE06> { [ 0x10006f6,	multiply,	asciicircum,		6	] };
+    key <AE07> { [ 0x10006f7,	Arabic_comma,	ampersand,		7	] };
+    key <AE08> { [ 0x10006f8,	asterisk,	enfilledcircbullet,	8	] };
+    key <AE09> { [ 0x10006f9,	parenright,	0x100200e,		9	] };
+    key <AE10> { [ 0x10006f0,	parenleft,	0x100200f,		0	] };
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "part_keypad" {
+
+    // Persian digits and Mathematical operators
+    key <KPDV> { [ division,	XF86_Ungrab	] };
+    key <KPMU> { [ multiply,	XF86_ClearGrab	] };
+    key <KPSU> { [ 0x1002212,	XF86_Prev_VMode	] };
+    key <KPAD> { [ plus,	XF86_Next_VMode	] };
+
+    key <KPEN> { [ KP_Enter	] };
+    key <KPEQ> { [ equal	] };
+
+    key <KP7>  { [ KP_Home,	0x10006f7	] };
+    key <KP8>  { [ KP_Up,	0x10006f8	] };
+    key <KP9>  { [ KP_Prior,	0x10006f9	] };
+
+    key <KP4>  { [ KP_Left,	0x10006f4	] };
+    key <KP5>  { [ KP_Begin,	0x10006f5	] };
+    key <KP6>  { [ KP_Right,	0x10006f6	] };
+
+    key <KP1>  { [ KP_End,	0x10006f1	] };
+    key <KP2>  { [ KP_Down,	0x10006f2	] };
+    key <KP3>  { [ KP_Next,	0x10006f3	] };
+
+    key <KP0>  { [ KP_Insert,	0x10006f0	] };
+    key <KPDL> { [ KP_Delete,	0x100066b	] };
+};
+
+// 4-Level leyout
+
+partial alphanumeric_keys
+xkb_symbols "pro" {
+    include "ir(basic)"
+    include "ir(part_pro)"
+
+    name[Group1]= "Iran - Pro";
+};
+
+
+// Persian Keypad leyout
+
+partial alphanumeric_keys
+xkb_symbols "keypad" {
+    include "ir(basic)"
+    include "ir(part_keypad)"
+
+    name[Group1]= "Iran - Keypad";
+};
+
+
+// 4-Level leyout with Persian Keypad leyout
+
+partial alphanumeric_keys
+xkb_symbols "pro_keypad" {
+    include "ir(basic)"
+    include "ir(part_keypad)"
+    include "ir(part_pro)"
+
+    name[Group1]= "Iran - Pro Keypad";
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "ku" {
+    include "tr(ku)"
+    name[Group1]= "Iran - Kurdish, Latin Q";
+};
+
+partial alphanumeric_keys
+xkb_symbols "ku_f" {
+    include "tr(ku_f)"
+    name[Group1]= "Iran - Kurdish, (F)";
+};
+
+partial alphanumeric_keys
+xkb_symbols "ku_alt" {
+    include "tr(ku_alt)"
+    name[Group1]= "Iran - Kurdish, Latin Alt-Q";
+};
+
+// Kurdish Soranî Bahdînî (Arabic) keyboard layout,
+// based on the Kurdî Soranî Bahdînî keyboard from KurdITGroup
+// which is based on National Iranian Keyboard Standard (ISIRI 2901:1994),
+// with additions.
+//
+// Copyright (C) 2006 Erdal Ronahî, published under the GPL v2
+//
+// Special copyright note: author explicitly permitted to license this 
+// layout under MIT/X11 license, for details see
+// https://bugs.freedesktop.org/show_bug.cgi?id=9541
+//
+// Author: Erdal Ronahî  <erdal.ronahi@gmail.com>
+//
+// Kurdish Arabic-Latin Layout for Soranî
+partial alphanumeric_keys
+xkb_symbols "ku_ara" {
+    name[Group1]= "Iran - Kurdish, Arabic-Latin";
+
+    // Other 3-Level symbols
+    key <TLDE> { [ 0x100200d,		division,		asciitilde	] };
+    key <BKSL> { [ backslash,		bar,			ccedilla, Ccedilla	] };
+    key <SPCE> { [ space,		0x100200c,		nobreakspace	] };
+
+    // Digits
+    key <AE01> { [ 1,	exclam,		0x10006f1,	quoteleft	] };
+    key <AE02> { [ 2,	at, 		0x10006f2,	at		] };
+    key <AE03> { [ 3,	numbersign,	0x10006f3,	0x100066b	] };
+    key <AE04> { [ 4,	dollar,		0x10006f4, 	0x100fdfc	] };
+    key <AE05> { [ 5,	percent,	0x10006f5,	0x100066a	] };
+    key <AE06> { [ 6,	asciicircum,	0x10006f6,	multiply	] };
+    key <AE07> { [ 7,	ampersand,	0x10006f7, 	Arabic_comma	] };
+    key <AE08> { [ 8,	asterisk,	0x10006f8,	enfilledcircbullet	] };
+    key <AE09> { [ 9,	parenright,	0x10006f9,	0x100200e	] };
+    key <AE10> { [ 0,	parenleft,	0x10006f0,	0x100200f	] };
+    key <AE11> { [ minus,		Arabic_tatweel,		underscore	] };
+    key <AE12> { [ equal,		plus,			0x1002212	] };
+
+    key <AD01> { [         Arabic_qaf,            X,  q,  Q ] };
+    key <AD02> { [         Arabic_waw,            X,  w,  W ] };
+    key <AD03> { [          0x10006d5,   Arabic_heh,  e,  E ] };
+    key <AD04> { [         Arabic_ra ,    0x1000695,  r,  R ] };
+    key <AD05> { [         Arabic_teh,   Arabic_tah,  t,  T ] };
+    key <AD06> { [          0x10006cc,    0x10006ce,  y,  Y ] };
+    key <AD07> { [  Arabic_hamzaonyeh, Arabic_hamza,  u,  U ] };
+    key <AD08> { [         Arabic_hah,   Arabic_ain,  i,  I ] };
+    key <AD09> { [          0x10006c6, Arabic_hamzaonwaw,  o,  O ] };
+    key <AD10> { [          0x100067e,  Arabic_theh,  p,  P ] };
+    key <AD11> { [ bracketright,	braceright,	ucircumflex, Ucircumflex	] };
+    key <AD12> { [ bracketleft,		braceleft,	scedilla, Scedilla	] };
+
+    key <AC01> { [ Arabic_alef,	Arabic_maddaonalef,	a, A	] };
+    key <AC02> { [ Arabic_seen,		Arabic_sheen,	s, S	] };
+    key <AC03> { [  Arabic_dal,		Arabic_thal,	d, D	] };
+    key <AC04> { [  Arabic_feh,	Arabic_hamzaunderalef,	f, F	] };
+    key <AC05> { [   0x10006af,		Arabic_ghain,	g, G	] };
+    key <AC06> { [  Arabic_heh,		0x100200c,	h, H	] };
+    key <AC07> { [   0x1000698,	Arabic_hamzaonalef,	j, J	] };
+    key <AC08> { [   0x10006a9,		Arabic_kaf,	k, K	] };
+    key <AC09> { [  Arabic_lam,		0x10006b5,	l, L	] };
+    key <AC10> { [  Arabic_semicolon, 	colon,		ecircumflex, Ecircumflex	] };
+    key <AC11> { [  apostrophe, 	quotedbl,	icircumflex, Icircumflex	] };
+
+    key <AB01> { [ Arabic_zain,		Arabic_dad,	z, Z	] };
+    key <AB02> { [ Arabic_khah,		Arabic_sad,	x, X	] };
+    key <AB03> { [ Arabic_jeem,		0x1000686,	c, C	] };
+    key <AB04> { [   0x10006a4,		Arabic_zah,	v, V	] };
+    key <AB05> { [ Arabic_beh,		0x1000649,	b, B	] };
+    key <AB06> { [ Arabic_noon,	Arabic_tehmarbuta,	n, N	] };
+    key <AB07> { [ Arabic_meem,	Arabic_tatweel,		m, M	] };
+    key <AB08> { [ Arabic_comma,	greater,	comma		] };
+    key <AB09> { [ period,		less,		apostrophe	] };
+    key <AB10> { [ slash,		Arabic_question_mark, 	question	] };
+
+    include "level3(ralt_switch)"
+
+};
diff --git a/xorg-server/xkbdata.src/symbols/is b/xorg-server/xkbdata.src/symbols/is
new file mode 100644
index 000000000..fcf199bb4
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/is
@@ -0,0 +1,199 @@
+// $XKeyboardConfig$
+
+// based on
+// XKB keyboard by Hrafnkell Eiriksson - hkelle@rhi.hi.is
+//     fixes by Olafur Osvaldsson - oli@isnic.is
+//
+// $XFree86: xc/programs/xkbcomp/symbols/is,v 1.3 2002/11/26 01:57:25 dawes Exp $
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin(type4)"
+
+    name[Group1]="Iceland";
+
+    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, dead_circumflex, dead_circumflex ] };
+    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)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    // modify the basic Icelandic layout to use Sun dead keys
+
+    include "is(basic)"
+
+    name[Group1]="Iceland - Sun dead keys";
+
+    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 basic Icelandic layout to not have any dead keys
+
+    include "is(basic)"
+
+    name[Group1]="Iceland - Eliminate dead keys";
+
+    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 ]	};
+};
+
+// Copyright (C) 2004, 2006 Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+//
+// = HISTORY
+// * 2004-09-28:
+//   Initial cleanroom writing of the keymap, I just booted Mac OS X, opened
+//   TextEdit.app and wrote down what the value produced by each key was when I
+//   pressed it, a for a, A for shift + a, å for lalt + a etc and made the
+//   keymap from that information
+//
+// * 2006-01-14:
+//   Revised the comments in the file
+//
+// = NOTES
+// * 20 characters in this keymap have no named character defined in
+//   include/keysymdef.h and as a result their Unicode code points in
+//   hexadecimal are listed here, these can be generated with the following
+//   perl command:
+//     $ perl -CA -e 'printf "U%x\n", ord shift' Æ
+//   and converted back like:
+//     $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6
+// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X
+//   keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it
+//   has no assigned code point in Unicode, the code point Apple uses for it is
+//   U+F8FF (63743) which is in the BMP's Private Use Area (U+E000–U+F8FF)
+// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it
+//   should work on other Apple laptop models which use the same keyboard
+//   layout. It will probably work on standard sized keyboards with little or
+//   no modification but it might not support them fully, please report if
+//   you're able to get it running with such a keyboard
+
+// Copied from macintosh_vndr/is
+partial alphanumeric_keys
+xkb_symbols "mac" {
+    name[Group1]= "Iceland - Macintosh";
+
+	//-- Row 5 (E) --//
+	key <TLDE> {	[	sterling,	section, 	UF8FF,		apostrophe	]	};
+	key <AE01> {	[	1,		exclam, 	exclamdown,	VoidSymbol	]	};
+	key <AE02> {	[	2,		quotedbl, 	at,		VoidSymbol	]	};
+	key <AE03> {	[	3,		numbersign, 	U2122,		sterling	]	};
+	key <AE04> {	[	4,		dollar, 	U00A2,		EuroSign	]	};
+	key <AE05> {	[	5,		percent, 	U2030,		infinity	]	};
+	key <AE06> {	[	6,		ampersand, 	asciicircum,	U2044		]	};
+	key <AE07> {	[	7,		slash, 	backslash,	U00F7		]	};
+	key <AE08> {	[	8,		parenleft, 	bracketleft,	braceleft	]	};
+	key <AE09> {	[	9,		parenright, 	bracketright,	braceright	]	};
+	key <AE10> {	[	0,		equal, 	U2260,		U2248		]	};
+	key <AE11> {	[	odiaeresis,	Odiaeresis, 	oslash,		Ooblique	]	};
+	key <AE12> {	[	minus,		underscore, 	endash,		emdash		]	};
+
+	
+	//-- Row 4 (D) --//
+	key <AD01> {	[	q,		Q, 	paragraph,	VoidSymbol	]	};
+	key <AD02> {	[	w,		W, 	U2211,		VoidSymbol	]	};
+	key <AD03> {	[	e,		E, 	dead_grave,	VoidSymbol	]	};
+	key <AD04> {	[	r,		R, 	registered,	VoidSymbol	]	};
+	key <AD05> {	[	t,		T, 	degree,		VoidSymbol	]	};
+	key <AD06> {	[	y,		Y, 	yen,		VoidSymbol	]	};
+	key <AD07> {	[	u,		U, 	dead_diaeresis,	VoidSymbol	]	};
+	key <AD08> {	[	i,		I, 	U0131,		U00AA		]	};
+	key <AD09> {	[	o,		O, 	dead_circumflex,U00BA		]	};
+	key <AD10> {	[	p,		P, 	Greek_pi,	Greek_PI	]	};
+	key <AD11> {	[	eth,		Eth, 	U201e,		U201c		]	};
+	key <AD12> {	[	apostrophe,	question, 	questiondown,	U00B7		]	};
+	
+	
+	//-- Row 3 (C) --//
+	key <AC01> {	[	a,		A, 	aring,		Aring		]	};
+	key <AC02> {	[	s,		S, 	ssharp,		abovedot	]	};
+	key <AC03> {	[	d,		D, 	U2202,		U2DA		]	};
+	key <AC04> {	[	f,		F, 	U192,		macron		]	};
+	key <AC05> {	[	g,		G, 	copyright,	breve		]	};
+	key <AC06> {	[	h,		H, 	bar,		VoidSymbol	]	};
+	key <AC07> {	[	j,		J, 	U2206,		U2dd		]	};
+	key <AC08> {	[	k,		K, 	U00AC,		VoidSymbol	]	};
+	key <AC09> {	[	l,		L, 	U2026,		caron		]	};
+	key <AC10> {	[	ae,		AE, 	oe,		OE		]	};
+	key <AC11> {	[	dead_acute,	dead_diaeresis, 	U201A,		U2018		]	};
+	key <BKSL> {	[	plus,		asterisk, 	U2022,		plusminus	]	};
+	
+	
+	//-- Row 2  (B) --//
+	key <LSGT> {	[	less,		greater, 	section,	UF8FF		]	};
+	key <AB01> {	[	z,		Z, 	U3A9,		VoidSymbol	]	};
+	key <AB02> {	[	x,		X, 	asciitilde,	VoidSymbol	]	};
+	key <AB03> {	[	c,		C, 	ccedilla,	Ccedilla	]	};
+	key <AB04> {	[	v,		V, 	U221A,		U25CA		]	};
+	key <AB05> {	[	b,		B, 	U222B,		VoidSymbol	]	};
+	key <AB06> {	[	n,		N, 	dead_tilde,	VoidSymbol	]	};
+	key <AB07> {	[	m,		M, 	U00B5,		VoidSymbol	]	};
+	key <AB08> {	[	comma,		semicolon, 	lessthanequal,	guillemotleft	]	};
+	key <AB09> {	[	period,		colon, 	greaterthanequal,guillemotright	]	};
+	key <AB10> {	[	thorn,		Thorn, 	U2019,		U201d		]	};
+
+    include "level3(ralt_switch)"
+};
+
+// This is a modified version of the English Dvorak layout that allows
+// you to type all Icelandic letters under X. It's not a full attempt at
+// nationalizing the layout as e.g. the Norwegian, Swedish and French
+// layouts which modify the primary keys of the basic Dvorak layout
+// extensively.
+
+// Rather it's a simple modification of 5 keys of the US Dvorak layout,
+// it adds Germanic/Icelandic style quotation marks („“), eth (ð�), ae
+// (æÆ), endash and emdash (–—) and thorn (þÞ). These keys aren't used in
+// the US version making this IS version a superset of it.
+
+// Maybe someone else will make a "full" attempt at an Icelandic layout
+// but I was mostly interested in continuing to type English comfortably
+// as a primary function while being able to type the full Icelandic
+// alphabet as a secondary function.
+//     -- Ævar Arnfjörð Bjarmason <avar@cpan.org>
+
+// Icelandic Dvorak
+partial alphanumeric_keys 
+xkb_symbols "dvorak" {
+    name[Group1]= "Iceland - Dvorak";
+
+    include "us(dvorak)"
+
+    key <AD11> { [      slash,  question,    U201e,   U201c   ] };
+    key <AC06> { [       d,     D,           eth,     ETH     ] };
+    key <AC10> { [       s,     S,           ae,      AE      ] };
+    key <AC11> { [   minus,     underscore,  endash,  emdash  ] };
+    key <AB10> { [       z,     Z,           thorn,   Thorn   ] };
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/it b/xorg-server/xkbdata.src/symbols/it
new file mode 100644
index 000000000..92fa50a87
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/it
@@ -0,0 +1,178 @@
+// $XKeyboardConfig$
+
+// 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/it,v 1.4 2003/04/19 12:22:12 pascal Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin(type4)"
+
+    name[Group1]="Italy";
+
+    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)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic italian layout to eliminate all dead keys
+
+    include "it(basic)"
+
+    name[Group1]="Italy - Eliminate dead keys";
+
+    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 ]	};
+};
+
+// Copied from macintosh_vndr/it
+partial alphanumeric_keys
+xkb_symbols "mac" {
+
+    name[Group1]= "Italy - Macintosh";
+
+    // 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,	EuroSign	]	};
+    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
+
+    include "kpdl(dot)"
+    include "level3(ralt_switch)"
+};
+
+// Used by Georgian people in Italy, 
+// contributed by Vladimer Sichinava
+partial alphanumeric_keys
+xkb_symbols "geo" {
+    include "it"
+    include "ge(basic)"
+
+    name[Group1]= "Italy - Georgian";
+    key <TLDE> { [ backslash, bar, notsign, brokenbar ] };
+    key <AE01> { [ 1, exclam, onesuperior ] };
+    key <AE02> { [ 2, quotedbl, twosuperior, dead_doubleacute ] };
+    key <AE03> { [ 3, sterling, threesuperior, dead_tilde ] };
+    key <AE04> { [ 4, dollar, onequarter, oneeighth ] };
+    key <AE05> { [ 5, percent, onehalf ] };
+    key <AE06> { [ 6, ampersand ] };
+    key <AE07> { [ 7, slash, braceleft ] };
+    key <AE08> { [ 8, parenleft, bracketleft ] };
+    key <AE09> { [ 9, parenright ] };
+    key <AE10> { [ 0, equal, braceright, dead_ogonek ] };
+    key <AE11> { [apostrophe, question, grave, questiondown ] };
+    key <AE12> { [ igrave, asciicircum, asciitilde, dead_circumflex ] };
+
+    key <AD03> { [0x010010d4, E, EuroSign ] };
+    key <AD11> { [ egrave, eacute, bracketleft, braceleft ] };
+    key <AD12> { [ plus, asterisk, bracketright, braceright ] };
+
+    key <AC10> { [ ograve, ccedilla, at, dead_cedilla ] };
+    key <AC11> { [ agrave, degree, numbersign, degree ] };
+    key <BKSL> { [ ugrave, section, dead_grave, dead_breve ] };
+    key <LSGT> { [ less, greater ] };
+
+    key <AB08> { [ comma, semicolon ] };
+    key <AB09> { [ period, colon ] };
+    key <AB10> { [ minus, underscore ] };
+};
+
+// OLPC Section
+xkb_symbols "olpc" {
+
+    include "basic"
+
+    key <AE12> { [ igrave,  asciicircum,    asciitilde,     dead_tilde ] };
+    key <BKSL> { [ ugrave,      section,        Egrave,     dead_breve ] };
+    key <I219> { [ less,        greater, guillemotleft, guillemotright ] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/jp b/xorg-server/xkbdata.src/symbols/jp
new file mode 100644
index 000000000..694090cb5
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/jp
@@ -0,0 +1,213 @@
+// $XKeyboardConfig$
+
+// based on:
+// symbols for a Japanese 106 keyboard(by tsuka@kawalab.dnj.ynu.ac.jp)
+
+// jp106 keyboard map
+partial default alphanumeric_keys
+xkb_symbols "106" {
+    include "jp(common)"
+    name[Group1]= "Japan";
+
+    key <AE10> { [ 0, asciitilde	] };
+    key <AE13> { [ backslash, bar 	] };
+};
+
+// common latin part of jp keyboard map
+partial hidden alphanumeric_keys
+xkb_symbols "common" {
+    // "Common" keys for jp 106/109A layout
+
+    // Alphanumeric section
+    key <HZTG> {
+	type[Group1]="PC_ALT_LEVEL2",
+	symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
+    };
+
+    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 <AE11> { [ minus, equal		] };
+    key <AE12> { [ asciicircum,	asciitilde] };
+
+    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> { [ at, grave		] };
+    key <AD12> { [ bracketleft,	braceleft ] };
+
+    key <CAPS> { [ Eisu_toggle, 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, plus	] };
+    key <AC11> { [ colon, asterisk	] };
+    key <AC12> { [ bracketright, braceright ] };
+
+    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 <AB11> { [ backslash, underscore] };
+    key <LCTL> { [ Control_L		] };
+
+    key <NFER> { [ Muhenkan		] };
+
+    key <XFER> {
+	type[Group1]="PC_ALT_LEVEL2",
+	symbols[Group1]= [ Henkan, Mode_switch ]
+    };
+    key <HKTG> {
+	type[Group1]="PC_ALT_LEVEL2",
+	symbols[Group1]= [ Hiragana_Katakana, Romaji ]
+    };
+
+    key <EISU> {
+       type[Group1]="PC_ALT_LEVEL2",
+       symbols[Group1]= [ Eisu_toggle ]
+    };
+
+    key <KANA> {
+       type[Group1]="PC_ALT_LEVEL2",
+       symbols[Group1]= [ Hiragana_Katakana ]
+    };
+
+
+    key <PRSC> {
+        type[Group1]= "PC_ALT_LEVEL2",
+        symbols[Group1]= [ Print, Execute ]
+    };
+};
+
+// OADG109A map
+partial alphanumeric_keys
+xkb_symbols "OADG109A" {
+
+    include "jp(common)"
+    name[Group1]= "Japan - OADG 109A";
+
+    key <AE10> { [ 0		] };
+    key <AE13> { [ yen, bar 	] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "kana" {
+
+    name[Group1]= "Japan - Kana";
+
+    // Alphanumeric section
+    key <HZTG> {
+	type[Group1]="PC_ALT_LEVEL2",
+	symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
+    };
+    key <AE01> { [ kana_NU		]	};
+    key <AE02> { [ kana_FU		]	};
+    key <AE03> { [ kana_A, kana_a	]	};
+    key <AE04> { [ kana_U, kana_u	]	};
+    key <AE05> { [ kana_E, kana_e	]	};
+    key <AE06> { [ kana_O, kana_o	]	};
+    key <AE07> { [ kana_YA, kana_ya	]	};
+    key <AE08> { [ kana_YU, kana_yu	]	};
+    key <AE09> { [ kana_YO, kana_yo	]	};
+    key <AE10> { [ kana_WA, kana_WO	]	};
+    key <AE11> { [ kana_HO		]	};
+    key <AE12> { [ kana_HE		]	};
+    key <AE13> { [ prolongedsound	]	};
+
+    key <AD01> { [ kana_TA		]	};
+    key <AD02> { [ kana_TE		]	};
+    key <AD03> { [ kana_I, kana_i	]	};
+    key <AD04> { [ kana_SU		]	};
+    key <AD05> { [ kana_KA		]	};
+    key <AD06> { [ kana_N		]	};
+    key <AD07> { [ kana_NA		]	};
+    key <AD08> { [ kana_NI		]	};
+    key <AD09> { [ kana_RA		]	};
+    key <AD10> { [ kana_SE		]	};
+    key <AD11> { [ voicedsound	]	};
+    key <AD12> { [ semivoicedsound, kana_openingbracket ] };
+
+    key <CAPS> { [ Eisu_toggle, Caps_Lock ]	};
+    key <AC01> { [ kana_CHI		]	};
+    key <AC02> { [ kana_TO		]	};
+    key <AC03> { [ kana_SHI		]	};
+    key <AC04> { [ kana_HA		]	};
+    key <AC05> { [ kana_KI		]	};
+    key <AC06> { [ kana_KU		]	};
+    key <AC07> { [ kana_MA		]	};
+    key <AC08> { [ kana_NO		]	};
+    key <AC09> { [ kana_RI		]	};
+    key <AC10> { [ kana_RE		]	};
+    key <AC11> { [ kana_KE		]	};
+    key <AC12> { [ kana_MU, kana_closingbracket ] };
+
+    key <AB01> { [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ kana_SA		]	};
+    key <AB03> { [ kana_SO		]	};
+    key <AB04> { [ kana_HI		]	};
+    key <AB05> { [ kana_KO		]	};
+    key <AB06> { [ kana_MI		]	};
+    key <AB07> { [ kana_MO		]	};
+    key <AB08> { [ kana_NE, kana_comma ]	};
+    key <AB09> { [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ kana_ME, kana_middledot ]	};
+    key <AB11> { [ kana_RO		]	};
+    key <LCTL> { [ Control_L		]	};
+
+    key <NFER> { [ Muhenkan		]	};
+
+    key <XFER> {
+	type[Group1]="PC_ALT_LEVEL2",
+	symbols[Group1]= [ Henkan, Mode_switch ]
+    };
+    key <HKTG> {
+	type[Group1]="PC_ALT_LEVEL2",
+	symbols[Group1]= [ Hiragana_Katakana, Romaji ]
+    };
+
+    // End alphanumeric section
+
+    key <PRSC> {
+        type[Group1]= "PC_ALT_LEVEL2",
+        symbols[Group1]= [ Print, Execute ]
+    };
+};
+
+partial alphanumeric_keys
+xkb_symbols "nicola_f_bs" {
+    key <BKSP> {
+       type="",
+       symbols[Group1]= [ bracketright, braceright ]
+    };
+    key <AE10> { [ 0,underscore         ] };
+    key <AD11> { [ colon, asterisk      ] };
+    key <AC11> { [ BackSpace, BackSpace ] };
+    key <AC12> { [ Escape               ] };
+    key <AB11> { [ at, grave            ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/keypad b/xorg-server/xkbdata.src/symbols/keypad
new file mode 100644
index 000000000..9c56d0a82
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/keypad
@@ -0,0 +1,540 @@
+// $XKeyboardConfig$
+// $Xorg: keypad,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
+
+partial hidden keypad_keys
+xkb_symbols "overlay" {
+    include "keypad(overlay1)"
+};
+
+partial hidden keypad_keys
+xkb_symbols "overlay1" {
+
+    // Begin "Keypad" section
+
+    key  <KP7> {	[  KP_Home	],	overlay1=<KO7>	};
+    key  <KP8> {	[  KP_Up	],	overlay1=<KO8>	};
+    key  <KP9> {	[  KP_Prior	],	overlay1=<KO9>	};
+
+    key  <KP4> {	[  KP_Left	],	overlay1=<KO4>	};
+    key  <KP5> {	[  KP_Begin	],	overlay1=<KO5>	};
+    key  <KP6> {	[  KP_Right	],	overlay1=<KO6>	};
+
+    key  <KP1> {	[  KP_End	],	overlay1=<KO1>	};
+    key  <KP2> {	[  KP_Down	],	overlay1=<KO2>	};
+    key  <KP3> {	[  KP_Next	],	overlay1=<KO3>	};
+
+    key  <KP0> {	[  KP_Insert	],	overlay1=<KO0>	};
+    key <KPDL> {  	[  KP_Delete	],	overlay1=<KODL>	};
+
+    key  <KO7> {	[  KP_7	]	};
+    key  <KO8> {	[  KP_8	]	};
+    key  <KO9> {	[  KP_9	]	};
+
+    key  <KO4> {	[  KP_4	]	};
+    key  <KO5> {	[  KP_5	]	};
+    key  <KO6> {	[  KP_6	]	};
+
+    key  <KO1> {	[  KP_1	]	};
+    key  <KO2> {	[  KP_2	]	};
+    key  <KO3> {	[  KP_3	]	};
+
+    key  <KO0> {	[  KP_0	]	};
+    key <KODL> {  	[  KP_Decimal ]	};
+
+    // End "Keypad" section
+};
+
+partial hidden keypad_keys
+xkb_symbols "overlay2" {
+
+    // Begin "Keypad" section
+
+    key  <KP7> {	[  KP_Home	],	overlay2=<KO7>	};
+    key  <KP8> {	[  KP_Up	],	overlay2=<KO8>	};
+    key  <KP9> {	[  KP_Prior	],	overlay2=<KO9>	};
+
+    key  <KP4> {	[  KP_Left	],	overlay2=<KO4>	};
+    key  <KP5> {	[  KP_Begin	],	overlay2=<KO5>	};
+    key  <KP6> {	[  KP_Right	],	overlay2=<KO6>	};
+
+    key  <KP1> {	[  KP_End	],	overlay2=<KO1>	};
+    key  <KP2> {	[  KP_Down	],	overlay2=<KO2>	};
+    key  <KP3> {	[  KP_Next	],	overlay2=<KO3>	};
+
+    key  <KP0> {	[  KP_Insert	],	overlay2=<KO0>	};
+    key <KPDL> {  	[  KP_Delete	],	overlay2=<KODL>	};
+
+    key  <KO7> {	[  KP_7	]	};
+    key  <KO8> {	[  KP_8	]	};
+    key  <KO9> {	[  KP_9	]	};
+
+    key  <KO4> {	[  KP_4	]	};
+    key  <KO5> {	[  KP_5	]	};
+    key  <KO6> {	[  KP_6	]	};
+
+    key  <KO1> {	[  KP_1	]	};
+    key  <KO2> {	[  KP_2	]	};
+    key  <KO3> {	[  KP_3	]	};
+
+    key  <KO0> {	[  KP_0	]	};
+    key <KODL> {  	[  KP_Decimal ]	};
+
+    // End "Keypad" section
+};
+
+partial hidden default keypad_keys
+xkb_symbols "x11" {
+// 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 ]	};
+};
+
+
+// Legacy PC keypad definition
+// Copyright © 2006-2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+keypad_keys
+xkb_symbols "legacy" {
+
+    include "keypad(core)"
+    include "keypad(legacymath)"
+    include "keypad(legacynumber)"
+    include "kpdl(dot)"
+};
+
+
+// Legacy Wang 725-3771-ae and 725-3771-uk keypad definition
+// Copyright © 2006-2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+keypad_keys
+xkb_symbols "legacy_wang" {
+
+    include "keypad(core)"
+    include "keypad(legacymath)"
+    include "keypad(legacynumber_wang)"
+    include "kpdl(dot)"
+};
+
+
+// Complete new keypad definition
+// Copyright © 2006-2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+keypad_keys
+xkb_symbols "oss" {
+
+    include "keypad(core)"
+    include "keypad(ossmath)"
+    include "keypad(ossnumber)"
+    include "kpdl(dotoss)"
+};
+
+
+// Latin9 restriction of new keypad definition
+// Copyright © 2006-2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+keypad_keys
+xkb_symbols "oss_latin9" {
+
+    include "keypad(core)"
+    include "keypad(ossmath_latin9)"
+    include "keypad(legacynumber)"
+    include "kpdl(dotoss_latin9)"
+};
+
+
+// Wang 725-3771-ae and 725-3771-uk keypad variant of oss keypad
+// Copyright © 2006-2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+keypad_keys
+xkb_symbols "oss_wang" {
+
+    include "keypad(core)"
+    include "keypad(ossmath)"
+    include "keypad(ossnumber_wang)"
+    include "kpdl(dotoss)"
+};
+
+
+// Forward-looking keypad definition
+// Won't work with applications that make ASCII assumptions
+// Copyright © 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+keypad_keys
+xkb_symbols "future" {
+
+    include "keypad(core)"
+    include "keypad(futuremath)"
+    include "keypad(ossnumber)"
+    include "kpdl(commaoss)"
+};
+
+
+// Forward-looking keypad definition
+// Won't work with applications that make ASCII assumptions
+// Copyright © 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+keypad_keys
+xkb_symbols "future_wang" {
+
+    include "keypad(core)"
+    include "keypad(futuremath)"
+    include "keypad(ossnumber_wang)"
+    include "kpdl(commaoss)"
+};
+
+
+// Keypad keys nobody changes
+// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+partial keypad_keys
+xkb_symbols "core" {
+
+    modifier_map Mod2 { Num_Lock };
+
+    key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
+    key <KPEN> { [ KP_Enter                     ] };
+    key <KPEQ> { [ KP_Equal                     ] };
+};
+
+
+// Legacy keypad math area
+// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+//
+// ������┱─────┬─────┬─────�
+// ┃Num  ┃ �   │ ₂   │ ₃   │ � <XF86_Ungrab>
+// ┃Lock⇭┃ /   │ *   │ -   │ ₂ <XF86_ClearGrab>
+// ┡�����╃─────┼─────┼─────┤ ₃ <XF86_Prev_VMode>
+//                   │ ₄   │ ₄ <XF86_Next_VMode>
+//                   │     │
+//                   ┤     │ 1 None
+//                   │     │ 2 Ctrl+Alt
+//                   │ +   │
+//                   ╆�����┪
+partial keypad_keys
+xkb_symbols "legacymath" {
+
+    key.type[Group1]="CTRL+ALT" ;
+
+    key <KPDV> { [   KP_Divide,     XF86_Ungrab ] }; // / <XF86_Ungrab>
+    key <KPMU> { [ KP_Multiply,  XF86_ClearGrab ] }; // * <XF86_ClearGrab>
+    key <KPSU> { [ KP_Subtract, XF86_Prev_VMode ] }; // - <XF86_Prev_VMode>
+
+    key <KPAD> { [      KP_Add, XF86_Next_VMode ] }; // + <XF86_Next_VMode>
+
+};
+
+
+// Keypad math area with non-CS operators
+// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+//
+// ������┱─────┬─────┬─────�
+// ┃Num  ┃ ∕ � │ . ₂ │ − ₃ │ � <XF86_Ungrab>
+// ┃Lock⇭┃ / ÷ │ * × │ - − │ ₂ <XF86_ClearGrab>
+// ┡�����╃─────┼─────┼─────┤ ₃ <XF86_Prev_VMode>
+//                   │ + ₄ │ ₄ <XF86_Next_VMode>
+//                   │     │
+//                   ┤     │ 1 None
+//                   │     │ 2 Level3 ⇮
+//                   │ + + │ 3 Shift+Level3 ⇧⇮
+//                   ╆�����┪ 4 Ctrl+Alt
+partial keypad_keys
+xkb_symbols "ossmath" {
+
+    key.type[Group1]="FOUR_LEVEL_X" ;
+
+    key <KPDV> { [   KP_Divide, 0x1002215, 0x10000F7,     XF86_Ungrab ] }; // / ∕ ÷     <XF86_Ungrab>
+    key <KPMU> { [ KP_Multiply, 0x10022C5, 0x10000D7,  XF86_ClearGrab ] }; // * ⋅ ×  <XF86_ClearGrab>
+    key <KPSU> { [ KP_Subtract, 0x1002212, 0x1002212, XF86_Prev_VMode ] }; // - − − <XF86_Prev_VMode>
+
+    key <KPAD> { [      KP_Add, 0x100002B, 0x100002B, XF86_Next_VMode ] }; // + + + <XF86_Next_VMode>
+
+};
+
+
+// Keypad math area with non-CS operators in first levels
+// As demanded by users not interested in legacy pre-unicode junk
+// Copyright © 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+//
+// ������┱─────┬─────┬─────�
+// ┃Num  ┃ / � │ * ₂ │ - ₃ │ � <XF86_Ungrab>
+// ┃Lock⇭┃ ∕ ÷ │ . × │ − − │ ₂ <XF86_ClearGrab>
+// ┡�����╃─────┼─────┼─────┤ ₃ <XF86_Prev_VMode>
+//                   │ + ₄ │ ₄ <XF86_Next_VMode>
+//                   │     │
+//                   ┤     │ 1 None
+//                   │     │ 2 Level3 ⇮
+//                   │ + + │ 3 Shift+Level3 ⇧⇮
+//                   ╆�����┪ 4 Ctrl+Alt
+partial keypad_keys
+xkb_symbols "futuremath" {
+
+    key.type[Group1]="FOUR_LEVEL_X" ;
+
+    key <KPDV> { [ 0x1002215,   KP_Divide, 0x10000F7,     XF86_Ungrab ] }; // ∕ / ÷     <XF86_Ungrab>
+    key <KPMU> { [ 0x10022C5, KP_Multiply, 0x10000D7,  XF86_ClearGrab ] }; // ⋅ * ×  <XF86_ClearGrab>
+    key <KPSU> { [ 0x1002212, KP_Subtract, 0x1002212, XF86_Prev_VMode ] }; // − - − <XF86_Prev_VMode>
+
+    key <KPAD> { [ 0x100002B,      KP_Add, 0x100002B, XF86_Next_VMode ] }; // + + + <XF86_Next_VMode>
+};
+
+
+// Keypad math area with non-CS operators, restricted to latin9
+// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+//
+// ������┱─────┬─────┬─────�
+// ┃Num  ┃ / � │ · ₂ │ - ₃ │ � <XF86_Ungrab>
+// ┃Lock⇭┃ / ÷ │ * × │ - - │ ₂ <XF86_ClearGrab>
+// ┡�����╃─────┼─────┼─────┤ ₃ <XF86_Prev_VMode>
+//                   │ + ₄ │ ₄ <XF86_Next_VMode>
+//                   │     │
+//                   ┤     │ 1 None
+//                   │     │ 2 Level3 ⇮
+//                   │ + + │ 3 Shift+Level3 ⇧⇮
+//                   ╆�����┪ 4 Ctrl+Alt
+partial keypad_keys
+xkb_symbols "ossmath_latin9" {
+
+    key.type[Group1]="FOUR_LEVEL_X";
+
+    key <KPDV> { [   KP_Divide,          slash, division,     XF86_Ungrab ] }; // / / ÷     <XF86_Ungrab>
+    key <KPMU> { [ KP_Multiply, periodcentered, multiply,  XF86_ClearGrab ] }; // * · ×  <XF86_ClearGrab>
+    key <KPSU> { [ KP_Subtract,          minus,    minus, XF86_Prev_VMode ] }; // - - - <XF86_Prev_VMode>
+
+    key <KPAD> { [      KP_Add,           plus,     plus, XF86_Next_VMode ] }; // + + + <XF86_Next_VMode>
+};
+
+
+// Legacy keypad number area
+// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+//
+// ������┱                   ⇱ Home
+// ┃Num  ┃                   ⇲ End
+// ┃Lock⇭┃                   ⇞ Page up
+// ┡�����╃─────┼─────┼       ⇟ Page down
+// │ 7   │ 8   │ 9   │       ⇞ Page up
+// │ ⇱   │ ⇧   │ ⇞   │       ⎀ Insert
+// ├─────┼─────┼─────┤       � Delete
+// │ 4   │ 5   │ 6   │       ⇦⇧⇨⇩ Directions
+// │ ⇦   │     │ ⇨   │
+// ├─────┼─────┼─────╆
+// │ 1   │ 2   │ 3   ┃
+// │ ⇲   │ ⇩   │ ⇟   ┃        1 None
+// ├─────┴─────┼─────┨        2 Num Lock ⇭
+// │ 0         │
+// │ ⎀         │
+// └───────────┴
+partial keypad_keys
+xkb_symbols "legacynumber" {
+
+    key.type[Group1]="KEYPAD" ;
+
+    key <KP7>  { [   KP_Home,       KP_7 ] }; //   <home> 7
+    key <KP8>  { [     KP_Up,       KP_8 ] }; //     <up> 8
+    key <KP9>  { [  KP_Prior,       KP_9 ] }; //  <prior> 9
+ 
+    key <KP4>  { [   KP_Left,       KP_4 ] }; //   <left> 4
+    key <KP5>  { [  KP_Begin,       KP_5 ] }; //  <begin> 5
+    key <KP6>  { [  KP_Right,       KP_6 ] }; //  <right> 6
+
+    key <KP1>  { [    KP_End,       KP_1 ] }; //    <end> 1
+    key <KP2>  { [   KP_Down,       KP_2 ] }; //   <down> 2
+    key <KP3>  { [   KP_Next,       KP_3 ] }; //   <next> 3
+
+    key <KP0>  { [ KP_Insert,       KP_0 ] }; // <insert> 0
+};
+
+
+// Legacy Wang 725-3771-ae and 725-3771-uk keypad number area
+// Copyright © 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+// This is actually a three-level keypad, declared as four-level
+// to avoid defining a new type
+//
+// ������┱                   ⇱ Home
+// ┃Num  ┃                   ⇲ End
+// ┃Lock⇭┃                   ⇞ Page up
+// ┡�����╃─────┼─────┼       ⇟ Page down
+// │ 7   │ 8   │ 9   │       ⇞ Page up
+// │ ⇱ < │ ⇧ > │ ⇞ ^ │       ⎀ Insert
+// ├─────┼─────┼─────┤       � Delete
+// │ 4   │ 5   │ 6   │       ⇦⇧⇨⇩ Directions
+// │ ⇦ [ │   ] │ ⇨ $ │
+// ├─────┼─────┼─────╆
+// │ 1   │ 2   │ 3   ┃
+// │ ⇲ & │ ⇩ @ │ ⇟ # ┃       1 None
+// ├─────┴─────┼─────┨       2 Num Lock ⇭
+// │ 0         │             3 Level3 ⇮
+// │ ⎀         │
+// └───────────┴
+partial keypad_keys
+xkb_symbols "legacynumber_wang" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KP7>  { [   KP_Home,   KP_7,         less ] }; //   <home> 7 <
+    key <KP8>  { [     KP_Up,   KP_8,      greater ] }; //     <up> 8 >
+    key <KP9>  { [  KP_Prior,   KP_9,  asciicircum ] }; //  <prior> 9 ^
+ 
+    key <KP4>  { [   KP_Left,   KP_4,  bracketleft ] }; //   <left> 4 [
+    key <KP5>  { [  KP_Begin,   KP_5, bracketright ] }; //  <begin> 5 ]
+    key <KP6>  { [  KP_Right,   KP_6,       dollar ] }; //  <right> 6 $
+
+    key <KP1>  { [    KP_End,   KP_1,    ampersand ] }; //    <end> 1 &
+    key <KP2>  { [   KP_Down,   KP_2,           at ] }; //   <down> 2 @
+    key <KP3>  { [   KP_Next,   KP_3,   numbersign ] }; //   <next> 3 #
+
+    key <KP0>  { [ KP_Insert,   KP_0,   apostrophe ] }; // <insert> 0 '
+};
+
+
+// Keypad number area with arrow symbols
+// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+//
+// ������┱                   ⇱ Home
+// ┃Num  ┃                   ⇲ End
+// ┃Lock⇭┃                   ⇞ Page up
+// ┡�����╃─────┼─────┼       ⇟ Page down
+// │ 7 ⇖ │ 8 ⇑ │ 9 ⇗ │       ⇞ Page up
+// │ ⇱ ↖ │ ⇧ ↑ │ ⇞ ↗ │       ⎀ Insert
+// ├─────┼─────┼─────┤       � Delete
+// │ 4 � │ 5 ⇔ │ 6 ⇗ │       ⇦⇧⇨⇩ Directions
+// │ ⇦ � │   ↔ │ ⇨ ↗ │       � narrow no-break space
+// ├─────┼─────┼─────╆
+// │ 1 ⇙ │ 2 ⇓ │ 3 ⇘ ┃
+// │ ⇲ ↙ │ ⇩ ↓ │ ⇟ ↘ ┃       1 None
+// ├─────┴─────┼─────┨       2 Num Lock ⇭
+// │ 0       ⇕ │             3 Level3 ⇮
+// │ ⎀       ↕ │             4 Shift+Level3 ⇧⇮
+// └───────────┴
+partial keypad_keys
+xkb_symbols "ossnumber" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KP7>  { [   KP_Home,   KP_7, 0x1002196, 0x10021D6 ] }; //   <home> 7 ↖ ⇖
+    key <KP8>  { [     KP_Up,   KP_8, 0x1002191, 0x10021D1 ] }; //     <up> 8 ↑ ⇑
+    key <KP9>  { [  KP_Prior,   KP_9, 0x1002197, 0x10021D7 ] }; //  <prior> 9 ↗ ⇗
+ 
+    key <KP4>  { [   KP_Left,   KP_4, 0x1002190, 0x10021D0 ] }; //   <left> 4 � �
+    key <KP5>  { [  KP_Begin,   KP_5, 0x1002194, 0x10021D4 ] }; //  <begin> 5 ↔ ⇔
+    key <KP6>  { [  KP_Right,   KP_6, 0x1002192, 0x10021D2 ] }; //  <right> 6 → ⇒
+
+    key <KP1>  { [    KP_End,   KP_1, 0x1002199, 0x10021D9 ] }; //    <end> 1 ↙ ⇙
+    key <KP2>  { [   KP_Down,   KP_2, 0x1002193, 0x10021D3 ] }; //   <down> 2 ↓ ⇓
+    key <KP3>  { [   KP_Next,   KP_3, 0x1002198, 0x10021D8 ] }; //   <next> 3 ↘ ⇘
+
+    key <KP0>  { [ KP_Insert,   KP_0, 0x1002195, 0x10021D5 ] }; // <insert> 0 ↕ ⇕
+};
+
+
+// Wang 725-3771-ae and 725-3771-uk keypad number area with additional arrow symbols
+// Copyright © 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+//
+// ������┱                   ⇱ Home
+// ┃Num  ┃                   ⇲ End
+// ┃Lock⇭┃                   ⇞ Page up
+// ┡�����╃─────┼─────┼       ⇟ Page down
+// │ 7 ↖ │ 8 ↑ │ 9 ↗ │       ⇞ Page up
+// │ ⇱ < │ ⇧ > │ ⇞ ^ │       ⎀ Insert
+// ├─────┼─────┼─────┤       � Delete
+// │ 4 � │ 5 ↔ │ 6 → │       ⇦⇧⇨⇩ Directions
+// │ ⇦ [ │   ] │ ⇨ $ │       � narrow no-break space
+// ├─────┼─────┼─────╆
+// │ 1 ↙ │ 2 ↓ │ 3 ↘ ┃
+// │ ⇲ & │ ⇩ @ │ ⇟ # ┃       1 None
+// ├─────┴─────┼─────┨       2 Num Lock ⇭
+// │ 0       ↕ │             3 Level3 ⇮
+// │ ⎀       ' │             4 Shift+Level3 ⇧⇮
+// └───────────┴
+partial keypad_keys
+xkb_symbols "ossnumber_wang" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KP7>  { [   KP_Home,   KP_7,         less, 0x1002196 ] }; //   <home> 7 < ↖
+    key <KP8>  { [     KP_Up,   KP_8,      greater, 0x1002191 ] }; //     <up> 8 > ↑
+    key <KP9>  { [  KP_Prior,   KP_9,  asciicircum, 0x1002197 ] }; //  <prior> 9 ^ ↗
+ 
+    key <KP4>  { [   KP_Left,   KP_4,  bracketleft, 0x1002190 ] }; //   <left> 4 [ �
+    key <KP5>  { [  KP_Begin,   KP_5, bracketright, 0x1002194 ] }; //  <begin> 5 ] ↔
+    key <KP6>  { [  KP_Right,   KP_6,       dollar, 0x1002192 ] }; //  <right> 6 $ →
+
+    key <KP1>  { [    KP_End,   KP_1,    ampersand, 0x1002199 ] }; //    <end> 1 & ↙
+    key <KP2>  { [   KP_Down,   KP_2,           at, 0x1002193 ] }; //   <down> 2 @ ↓
+    key <KP3>  { [   KP_Next,   KP_3,   numbersign, 0x1002198 ] }; //   <next> 3 # ↘
+
+    key <KP0>  { [ KP_Insert,   KP_0,   apostrophe, 0x1002195 ] }; // <insert> 0 ' ↕
+};
+
+// ATM/phone-style hexadecimal numpad
+// by Roland Kaufmann <rlndkfmn at gmail dot com>
+// License: BSD
+// Main numbers follows the traditions from ATMs and phones with
+// numbers increasing downwards to the right. (It is easier to
+// change the keyboard layout than to reprogram your local ATM;
+// also cell-phones are becoming more common while calculators are
+// becoming more rare).
+// Third-level gives the letters used in hexadecimal numbers, or
+// columns in small spreadsheets. Equal is added to start formulas
+// (most numpads don't have their own equal key), comma as a list
+// separator and colon to enter times and ranges.
+partial keypad_keys
+xkb_symbols "phone_hex" {
+    // NumLock, Enter
+    include "keypad(core)"
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    //             None          NumLock      AltGr
+    // symbol row
+    key <KPDV> { [ KP_Divide,    slash,       parenleft  ] };
+    key <KPMU> { [ KP_Multiply,  asterisk,    parenright ] };
+    key <KPSU> { [ KP_Subtract,  minus,       dollar     ] };
+
+    // upper row
+    key <KP7>  { [ KP_Home,      KP_1,        A          ] };
+    key <KP8>  { [ KP_Up,        KP_2,        B          ] };
+    key <KP9>  { [ KP_Prior,     KP_3,        C          ] };
+ 
+    // home row
+    key <KP4>  { [ KP_Left,      KP_4,        D          ] };
+    key <KP5>  { [ KP_Begin,     KP_5,        E          ] };
+    key <KP6>  { [ KP_Right,     KP_6,        F          ] };
+    key <KPAD> { [ KP_Add,       plus,        comma      ] };
+
+    // lower row
+    key <KP1>  { [ KP_End,       KP_7,        equal      ] };
+    key <KP2>  { [ KP_Down,      KP_8,        x          ] };
+    key <KP3>  { [ KP_Next,      KP_9,        colon      ] };
+
+    // decimal row
+    key <KP0>  { [ KP_Insert,    KP_0,        backslash  ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/kg b/xorg-server/xkbdata.src/symbols/kg
new file mode 100644
index 000000000..24f5a1516
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/kg
@@ -0,0 +1,28 @@
+// $XKeyboardConfig$
+
+// based on
+// russian standard keyboard
+// Yury Fedorov <yury-fedorov@prime-task.com>
+// Last Changes 2004/10/25 by Yury Fedorov <yury-fedorov@prime-task.com>
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/kg,v 0.0 Exp $
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    include "ru(winkeys)"
+
+    name[Group1]= "Kyrgyzstan";
+
+    key.type[group1]="FOUR_LEVEL_ALPHABETIC";
+
+    key	<AC07> { [ 	Cyrillic_o,		Cyrillic_O,		
+			Cyrillic_o_bar,  	Cyrillic_O_bar	] };
+    key	<AD03> { [ 	Cyrillic_u,		Cyrillic_U,
+			Cyrillic_u_straight,	Cyrillic_U_straight	] };
+    key	<AD06> { [ 	Cyrillic_en, 		Cyrillic_EN,	
+			Cyrillic_en_descender,	Cyrillic_EN_descender	] };		
+
+    include "level3(ralt_switch)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/kh b/xorg-server/xkbdata.src/symbols/kh
new file mode 100644
index 000000000..a97eb4420
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/kh
@@ -0,0 +1,114 @@
+// $XKeyboardConfig$
+//
+//   khmer unicode keyboard for XFree86 4.3 or XOrg 
+//   (might work with older versions, not tested)
+//
+//   layout defined by National Information Communications Technology Development Authority (NiDA)
+//   http://www.nida.gov.kh
+//
+//   version:  1.0.1
+//
+//   date: 14.09.2005
+//
+//   author:  Jens Herden   (jens at khmeros.info)
+//
+//
+//   understanding the symbols:
+//
+//         0x100yyyy  = unicode, yyyy is hexcode
+//                      codes that are not assigned in unicode (0x10017fb-0x10017ff),
+//                      are used to make compositions for special vowels
+//
+//         voidsymbol = no symbol for this combination
+//
+//         all other symbol are defined in: /usr/X11/include/X11/keysymdef.h
+//         but with a leading 'XK_'
+//
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    name[Group1]= "Cambodia";
+    
+// there are four levels defined:
+//
+//                 normal           shift			right-alt	right-alt + shift
+//
+
+//  keys: `1234567890-=\
+    key <TLDE> { [ guillemotleft,	guillemotright,	0x100200d,	voidsymbol	] };
+    key <AE01> { [ 0x10017e1,		exclam,			0x100200c, 	0x10017f1	] };
+    key <AE02> { [ 0x10017e2,		0x10017d7,		at, 		0x10017f2	] };
+    key <AE03> { [ 0x10017e3,		quotedbl,		0x10017d1, 	0x10017f3	] };
+    key <AE04> { [ 0x10017e4,		0x10017db,		dollar, 	0x10017f4	] };
+    key <AE05> { [ 0x10017e5,		percent,		EuroSign, 	0x10017f5	] };
+    key <AE06> { [ 0x10017e6,		0x10017cd,		0x10017d9, 	0x10017f6	] };
+    key <AE07> { [ 0x10017e7,		0x10017d0,		0x10017da, 	0x10017f7	] };
+    key <AE08> { [ 0x10017e8,		0x10017cf,		asterisk, 	0x10017f8	] };
+    key <AE09> { [ 0x10017e9,		parenleft,		braceleft, 	0x10017f9	] };
+    key <AE10> { [ 0x10017e0,		parenright,		braceright, 0x10017f0	] };
+    key <AE11> { [ 0x10017a5,		0x10017cc,		x, 		    voidsymbol	] };
+    key <AE12> { [ 0x10017b2,		equal,			0x10017ce, 	voidsymbol	] };
+    key <BKSL> { [ 0x10017ae,		0x10017ad,		backslash, 	voidsymbol	] };
+
+//  keys: qwertyuiop[]
+    key <AD01> { [ 0x1001786,		0x1001788,		0x10017dc, 	0x10019e0	] };
+    key <AD02> { [ 0x10017b9,		0x10017ba,		0x10017dd, 	0x10019e1	] };
+    key <AD03> { [ 0x10017c1,		0x10017c2,		0x10017af, 	0x10019e2	] };
+    key <AD04> { [ 0x100179a,		0x10017ac,		0x10017ab, 	0x10019e3	] };
+    key <AD05> { [ 0x100178f,		0x1001791,		0x10017a8, 	0x10019e4	] };
+    key <AD06> { [ 0x1001799,		0x10017bd,		voidsymbol, 0x10019e5	] };
+    key <AD07> { [ 0x10017bb,		0x10017bc,		voidsymbol, 0x10019e6	] };
+    key <AD08> { [ 0x10017b7,		0x10017b8,		0x10017a6, 	0x10019e7	] };
+    key <AD09> { [ 0x10017c4,		0x10017c5,		0x10017b1, 	0x10019e8	] };
+    key <AD10> { [ 0x1001795,		0x1001797,		0x10017b0, 	0x10019e9	] };
+    key <AD11> { [ 0x10017c0,		0x10017bf,		0x10017a9, 	0x10019ea	] };
+    key <AD12> { [ 0x10017aa,		0x10017a7,		0x10017b3, 	0x10019eb	] };
+
+//  keys: asdfghjkl;'
+    key <AC01> { [ 0x10017b6,		0x10017ff,		voidsymbol, 0x10019ec	] };
+    key <AC02> { [ 0x100179f,		0x10017c3,		voidsymbol, 0x10019ed	] };
+    key <AC03> { [ 0x100178a,		0x100178c,		voidsymbol, 0x10019ee	] };
+    key <AC04> { [ 0x1001790,		0x1001792,		voidsymbol, 0x10019ef	] };
+    key <AC05> { [ 0x1001784,		0x10017a2,		voidsymbol, 0x10019f0	] };
+    key <AC06> { [ 0x10017a0,		0x10017c7,		voidsymbol, 0x10019f1	] };
+    key <AC07> { [ 0x10017d2,		0x1001789,		voidsymbol, 0x10019f2	] };
+    key <AC08> { [ 0x1001780,		0x1001782,		0x100179d, 	0x10019f3	] };
+    key <AC09> { [ 0x100179b,		0x10017a1,		voidsymbol, 0x10019f4	] };
+    key <AC10> { [ 0x10017be,		0x10017fe,		0x10017d6, 	0x10019f5	] };
+    key <AC11> { [ 0x10017cb,		0x10017c9,		0x10017c8, 	0x10019f6	] };
+
+//  keys: zxcvbnm,./
+    key <AB01> { [ 0x100178b,		0x100178d,		voidsymbol, 0x10019f7	] };
+    key <AB02> { [ 0x1001781,		0x1001783,		voidsymbol, 0x10019f8	] };
+    key <AB03> { [ 0x1001785,		0x1001787,		voidsymbol, 0x10019f9	] };
+    key <AB04> { [ 0x100179c,		0x10017fd,		voidsymbol, 0x10019fa	] };
+    key <AB05> { [ 0x1001794,		0x1001796,		0x100179e, 	0x10019fb	] };
+    key <AB06> { [ 0x1001793,		0x100178e,		voidsymbol, 0x10019fc	] };
+    key <AB07> { [ 0x1001798,		0x10017c6,		voidsymbol, 0x10019fd	] };
+    key <AB08> { [ 0x10017fc,		0x10017fb,		comma, 		0x10019fe	] };
+    key <AB09> { [ 0x10017d4,		0x10017d5,		period, 	0x10019ff	] };
+    key <AB10> { [ 0x10017ca,		question,		slash,		voidsymbol	] };
+
+    key <SPCE> { [ 0x100200b,		space,			0x10000a0,	voidsymbol	] };
+    key <RALT> { [ Alt_R	] };
+
+// third level with right-Alt
+    include "level3(ralt_switch)"
+    
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+    include "kh(basic)"
+    
+// Contact Walter@laptop.org
+
+    key <AC10> { [ 0x10017be,		0x10017c8,		0x10017d6, 	0x10019f5	] };
+    key <AE01> { [ 0x10017e1,		0x100200c,		exclam, 	0x10017f1	] };
+    key <AE03> { [ 0x10017e3,		0x10017d1,		quotedbl, 	0x10017f3	] };
+    key <AE05> { [ 0x10017e5,		EuroSign,		percent, 	0x10017f5	] };
+    key <AE12> { [ 0x10017b2,		0x10017ce,		equal, 	 	voidsymbol	] };
+
+   //language key
+   include "group(olpc)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/kpdl b/xorg-server/xkbdata.src/symbols/kpdl
new file mode 100644
index 000000000..ffcfcd9f0
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/kpdl
@@ -0,0 +1,88 @@
+// $XKeyboardConfig$
+// $Xorg: keypad,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
+
+// The <KPDL> key is a mess.
+// It was probably originally meant to be a decimal separator.
+// Except since it was declared by USA people it didn't use the original
+// SI separator "," but a "." (since then the USA managed to f-up the SI
+// by making "." an accepted alternative, but standards still use "," as
+// default)
+// As a result users of SI-abiding countries expect either a "." or a ","
+// or a "decimal_separator" which may or may not be translated in one of the
+// above depending on applications.
+// It's not possible to define a default per-country since user expectations
+// depend on the conflicting choices of their most-used applications,
+// operating system, etc. Therefore it needs to be a configuration setting
+// Copyright © 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+
+
+// Legacy <KPDL> #1
+// This assumes KP_Decimal will be translated in a dot
+partial keypad_keys
+xkb_symbols "dot" {
+
+    key.type[Group1]="KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, KP_Decimal ] }; // <delete> <separator>
+};
+
+
+// Legacy <KPDL> #2
+// This assumes KP_Separator will be translated in a comma
+partial keypad_keys
+xkb_symbols "comma" {
+
+    key.type[Group1]="KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, KP_Separator ] }; // <delete> <separator>
+};
+
+
+// Period <KPDL>, usual keyboard serigraphy in most countries
+partial keypad_keys
+xkb_symbols "dotoss" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, period, comma, 0x100202F ] }; // <delete> . , � (narrow no-break space)
+};
+
+
+// Period <KPDL>, usual keyboard serigraphy in most countries, latin-9 restriction
+partial keypad_keys
+xkb_symbols "dotoss_latin9" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, period, comma, nobreakspace ] }; // <delete> . , � (no-break space)
+};
+
+
+// Comma <KPDL>, what most non anglo-saxon people consider the real separator
+partial keypad_keys
+xkb_symbols "commaoss" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, comma, period, 0x100202F ] }; // <delete> , . � (narrow no-break space)
+};
+
+
+// Momayyez <KPDL>: Bahrain, Iran, Iraq, Kuwait, Oman, Qatar, Saudi Arabia, Syria, UAE
+partial keypad_keys
+xkb_symbols "momayyezoss" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, 0x100066B, comma, 0x100202F ] }; // <delete> ? , � (narrow no-break space)
+};
+
+
+// Abstracted <KPDL>, pray everything will work out (it usually does not)
+partial keypad_keys
+xkb_symbols "kposs" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, KP_Decimal, KP_Separator, 0x100202F ] }; // <delete> ? ? � (narrow no-break space)
+};
diff --git a/xorg-server/xkbdata.src/symbols/kr b/xorg-server/xkbdata.src/symbols/kr
new file mode 100644
index 000000000..10de5fef5
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/kr
@@ -0,0 +1,30 @@
+// $XKeyboardConfig$
+//
+
+default  alphanumeric_keys
+xkb_symbols "kr106" {
+    name[Group1]= "Korea, Republic of";
+    include "us"
+    include "kr(koreankeys)"
+};
+
+alphanumeric_keys
+xkb_symbols "kr104" {
+    name[Group1]= "Korea, Republic of - 101/104 key Compatible";
+    include "us"
+    include "kr(koreankeys)"
+    include "kr(koreankeys_raltctl)"
+};
+
+partial hidden function_keys
+xkb_symbols "koreankeys" {
+    key <K72> { [ Hangul ] };
+    key <K71> { [ Hangul_Hanja ] };    
+};
+
+partial hidden function_keys
+xkb_symbols "koreankeys_raltctl" {
+    key <RALT> { [ Hangul ] };
+    key <RCTL> { [ Hangul_Hanja ] };    
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/kz b/xorg-server/xkbdata.src/symbols/kz
new file mode 100644
index 000000000..55bbb1f66
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/kz
@@ -0,0 +1,218 @@
+// $XKeyboardConfig$
+
+// Based on http://www.sci.kz/~sairan/keyboard/kzkbd.html
+// Baurzhan Ismagulov <ibr@radix50.net>
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/ru,v 1.4 2003/05/05 12:11:10 pascal Exp $
+
+// TODO:
+// 1. AltGr with TLDE and LSGT.
+// 2. Dead key for ruskaz and kazrus.
+// 3. Ctrl + <key>.
+// 4. Alt-Tab.
+
+// RST KazSSR 903-90
+// levels 3 and 4 are non-standard extensions
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    name[Group1] = "Kazakhstan";
+
+key.type[group1] = "FOUR_LEVEL";
+
+    key <TLDE> { [ parenleft,               parenright,              Cyrillic_io, Cyrillic_IO ] };
+    key <AE01> { [ doublelowquotemark,      exclam ] };
+    key <AE06> { [ comma,                   semicolon ] };
+    key <AE07> { [ period,                  colon ] };
+    key <BKSL> { [ backslash,               slash ] };
+    key <AB10> { [ numerosign,              question ] };
+    key <LSGT> { [ less,                    greater,                 bar,         brokenbar ] };
+
+key.type[group1] = "ALPHABETIC";
+
+    key <AE02> { [ Cyrillic_schwa,          Cyrillic_SCHWA ] };
+    key <AE03> { [ Ukrainian_i,             Ukrainian_I ] };
+    key <AE04> { [ Cyrillic_en_descender,   Cyrillic_EN_descender ] };
+    key <AE05> { [ Cyrillic_ghe_bar,        Cyrillic_GHE_bar ] };
+    key <AE08> { [ Cyrillic_u_straight,     Cyrillic_U_straight ] };
+    key <AE09> { [ Cyrillic_u_straight_bar, Cyrillic_U_straight_bar ] };
+    key <AE10> { [ Cyrillic_ka_descender,   Cyrillic_KA_descender ] };
+    key <AE11> { [ Cyrillic_o_bar,          Cyrillic_O_bar ] };
+    key <AE12> { [ Cyrillic_shha,           Cyrillic_SHHA ] };
+
+    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";
+};
+
+// Kikkarin KZ1
+partial alphanumeric_keys
+xkb_symbols "ruskaz" {
+
+    name[Group1] = "Kazakhstan - Russian with Kazakh";
+
+key.type[group1] = "FOUR_LEVEL";
+
+    key	<AE01> { [ 1,                       exclam ] };
+    key	<AE02> { [ 2,                       quotedbl,                at ] };
+    key	<AE03> { [ 3,                       numerosign,              numbersign ] };
+    key	<AE04> { [ 4,                       semicolon,               dollar ] };
+    key	<AE05> { [ 5,                       percent ] };
+    key	<AE06> { [ 6,                       colon,                   asciicircum ] };
+    key	<AE07> { [ 7,                       question,                ampersand ] };
+    key	<AE08> { [ 8,                       asterisk ] };
+    key	<AE09> { [ 9,                       parenleft ] };
+    key	<AE10> { [ 0,                       parenright ] };
+    key	<AE11> { [ minus,                   underscore ] };
+    key	<AE12> { [ equal,                   plus ] };
+    key	<BKSL> { [ backslash,               slash,                   bar ] };
+    key	<AB10> { [ period,                  comma,                   slash,                   question ] };
+    key <LSGT> { [ less,                    greater,                 bar,                     brokenbar ] };
+
+key.type[group1] = "FOUR_LEVEL_ALPHABETIC";
+
+    key	<TLDE> { [ Cyrillic_io,             Cyrillic_IO ] };
+    key	<AD01> { [ Cyrillic_shorti,         Cyrillic_SHORTI,         Cyrillic_u_straight_bar, Cyrillic_U_straight_bar ] };
+    key	<AD02> { [ Cyrillic_tse,            Cyrillic_TSE ] };
+    key	<AD03> { [ Cyrillic_u,              Cyrillic_U,              Cyrillic_u_straight,     Cyrillic_U_straight ] };
+    key	<AD04> { [ Cyrillic_ka,             Cyrillic_KA,             Cyrillic_ka_descender,   Cyrillic_KA_descender ] };
+    key	<AD05> { [ Cyrillic_ie,             Cyrillic_IE,             Cyrillic_io,             Cyrillic_IO ] };
+    key	<AD06> { [ Cyrillic_en,             Cyrillic_EN,             Cyrillic_en_descender,   Cyrillic_EN_descender ] };
+    key	<AD07> { [ Cyrillic_ghe,            Cyrillic_GHE,            Cyrillic_ghe_bar,        Cyrillic_GHE_bar ] };
+    key	<AD08> { [ Cyrillic_sha,            Cyrillic_SHA ] };
+    key	<AD09> { [ Cyrillic_shcha,          Cyrillic_SHCHA ] };
+    key	<AD10> { [ Cyrillic_ze,             Cyrillic_ZE ] };
+    key	<AD11> { [ Cyrillic_ha,             Cyrillic_HA,             Cyrillic_shha,           Cyrillic_SHHA ] };
+    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,              Cyrillic_schwa,          Cyrillic_SCHWA ] };
+    key	<AC05> { [ Cyrillic_pe,             Cyrillic_PE ] };
+    key	<AC06> { [ Cyrillic_er,             Cyrillic_ER ] };
+    key	<AC07> { [ Cyrillic_o,              Cyrillic_O,              Cyrillic_o_bar,          Cyrillic_O_bar ] };
+    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,              Ukrainian_i,             Ukrainian_I ] };
+    key	<AB07> { [ Cyrillic_softsign,       Cyrillic_SOFTSIGN ] };
+    key	<AB08> { [ Cyrillic_be,             Cyrillic_BE ] };
+    key	<AB09> { [ Cyrillic_yu,             Cyrillic_YU ] };
+};
+
+// Kikkarin KZ2
+partial alphanumeric_keys
+xkb_symbols "kazrus" {
+
+    name[Group1] = "Kazakhstan - Kazakh with Russian";
+
+key.type[group1] = "FOUR_LEVEL";
+
+    key	<AE01> { [ 1,                       exclam ] };
+    key	<AE02> { [ 2,                       quotedbl,                at ] };
+    key	<AE03> { [ 3,                       numerosign,              numbersign ] };
+    key	<AE04> { [ 4,                       semicolon,               dollar ] };
+    key	<AE05> { [ 5,                       percent ] };
+    key	<AE06> { [ 6,                       colon,                   asciicircum ] };
+    key	<AE07> { [ 7,                       question,                ampersand ] };
+    key	<AE08> { [ 8,                       asterisk ] };
+    key	<AE09> { [ 9,                       parenleft ] };
+    key	<AE10> { [ 0,                       parenright ] };
+    key	<AE11> { [ minus,                   underscore ] };
+    key	<AE12> { [ equal,                   plus ] };
+    key	<BKSL> { [ backslash,               slash,                   bar ] };
+    key	<AB10> { [ period,                  comma,                   slash,                   question ] };
+    key <LSGT> { [ less,                    greater,                 bar,                     brokenbar ] };
+
+key.type[group1] = "FOUR_LEVEL_ALPHABETIC";
+
+    key	<TLDE> { [ Cyrillic_io,             Cyrillic_IO ] };
+    key	<AD01> { [ Cyrillic_shorti,         Cyrillic_SHORTI ] };
+    key	<AD02> { [ Cyrillic_en_descender,   Cyrillic_EN_descender,   Cyrillic_tse,            Cyrillic_TSE ] };
+    key	<AD03> { [ Cyrillic_u,              Cyrillic_U ] };
+    key	<AD04> { [ Cyrillic_ka,             Cyrillic_KA,             Cyrillic_ka_descender,    Cyrillic_KA_descender ] };
+    key	<AD05> { [ Cyrillic_ie,             Cyrillic_IE,             Cyrillic_io,             Cyrillic_IO ] };
+    key	<AD06> { [ Cyrillic_en,             Cyrillic_EN ] };
+    key	<AD07> { [ Cyrillic_ghe,            Cyrillic_GHE ] };
+    key	<AD08> { [ Cyrillic_sha,            Cyrillic_SHA ] };
+    key	<AD09> { [ Cyrillic_ghe_bar,        Cyrillic_GHE_bar,        Cyrillic_shcha,          Cyrillic_SHCHA ] };
+    key	<AD10> { [ Cyrillic_ze,             Cyrillic_ZE ] };
+    key	<AD11> { [ Cyrillic_ha,             Cyrillic_HA,             Cyrillic_shha,           Cyrillic_SHHA ] };
+    key	<AD12> { [ Cyrillic_u_straight_bar, Cyrillic_U_straight_bar, Cyrillic_hardsign,       Cyrillic_HARDSIGN ] };
+    key	<AC01> { [ Cyrillic_o_bar,          Cyrillic_O_bar,          Cyrillic_ef,             Cyrillic_EF ] };
+    key	<AC02> { [ Cyrillic_yeru,           Cyrillic_YERU ] };
+    key	<AC03> { [ Cyrillic_ka_descender,   Cyrillic_KA_descender,   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_schwa,          Cyrillic_SCHWA,          Cyrillic_e,              Cyrillic_E ] };
+    key	<AB01> { [ Cyrillic_ya,             Cyrillic_YA ] };
+    key	<AB02> { [ Ukrainian_i,             Ukrainian_I,             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_u_straight,     Cyrillic_U_straight,     Cyrillic_softsign,       Cyrillic_SOFTSIGN ] };
+    key	<AB08> { [ Cyrillic_be,             Cyrillic_BE ] };
+    key	<AB09> { [ Cyrillic_yu,             Cyrillic_YU ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+// Contact: Walter Bender <walter@laptop.org>
+
+// We moved the Cyrillic IO off of the Tilde Key as an Alt-GR character
+// and moved it onto the Backslash key, making Backslash and Bar available
+// through the Latin side of the keyboard.
+
+   include "kz(basic)"
+
+   name[Group1] = "Kazakhstan";
+
+   key <TLDE> { [ parenleft,               parenright ] };
+   key <BKSL> { [ Cyrillic_io,             Cyrillic_IO ] };
+
+   include "group(olpc)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/la b/xorg-server/xkbdata.src/symbols/la
new file mode 100644
index 000000000..b050cc477
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/la
@@ -0,0 +1,77 @@
+// $XKeyboardConfig$
+
+// $XConsortium: lo 2002/11/28 $
+//
+// 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]= "Laos";
+
+    // 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[Group1]="PC_ALT_LEVEL2",
+	[ 	 Shift_L,		ISO_First_Group		]
+    };
+override key <RTSH> {
+	type[Group1]="PC_ALT_LEVEL2",
+	[ 	Shift_R,		ISO_Last_Group 		]
+    };
+};
diff --git a/xorg-server/xkbdata.src/symbols/latam b/xorg-server/xkbdata.src/symbols/latam
new file mode 100644
index 000000000..02372d8b9
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/latam
@@ -0,0 +1,63 @@
+// $XKeyboardConfig$
+
+// based on a keyboard
+// Modified for a real Latin American Keyboard by Fabian Mandelbaum
+//
+// $XFree86: xc/programs/xkbcomp/symbols/la,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "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)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+    include "latam(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 "latam(Sundeadkeys)"
+    name[Group1]="Latin American - Sun dead keys";
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    include "latam(basic)"
+
+    name[Group1]="Latin American - Eliminate dead keys";
+
+    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/xorg-server/xkbdata.src/symbols/latin b/xorg-server/xkbdata.src/symbols/latin
new file mode 100644
index 000000000..f630fd98a
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/latin
@@ -0,0 +1,180 @@
+// $XKeyboardConfig$
+
+// Common Latin alphabet layout
+//
+// $XFree86: xc/programs/xkbcomp/symbols/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, leftsinglequotemark ]	};
+    key <AB05>	{ [         b,          B, rightdoublequotemark, rightsinglequotemark ] };
+    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 "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 "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 "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 "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 "latin(nodeadkeys)"
+};
+
+partial
+xkb_symbols "type4_nodeadkeys" {
+ 
+    include "latin(nodeadkeys)"
+
+    key <AB10>	{ [   minus, underscore, dead_belowdot,      abovedot ]	};
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/level3 b/xorg-server/xkbdata.src/symbols/level3
new file mode 100644
index 000000000..d4e112913
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/level3
@@ -0,0 +1,146 @@
+// $XKeyboardConfig$
+
+// these variants assign various XKB keycodes to ISO_Level3_Shift so that
+// the third shift level can be reached
+//
+// $XFree86: xc/programs/xkbcomp/symbols/level3,v 1.7 2003/09/08 14:25:32 eich Exp $
+//
+
+// the default behavior is for the right Alt key (AltGr) to generate the
+// third engraved symbol
+default partial modifier_keys
+xkb_symbols "ralt_switch" {
+  key <RALT> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// Right Alt key never chooses 3rd level.
+// This option attempts to undo the effect of a layout's
+// including ralt_switch.  You may also want to select another
+// level3 option that maps the level3 shift to some other key.
+partial modifier_keys
+xkb_symbols "ralt_alt" {
+  key <RALT> { 
+    type[Group1]="TWO_LEVEL",
+    type[Group2]="TWO_LEVEL",
+    type[Group3]="TWO_LEVEL",
+    type[Group4]="TWO_LEVEL",
+    symbols[Group1] = [ Alt_R, Meta_R ], 
+    symbols[Group2] = [ Alt_R, Meta_R ], 
+    symbols[Group3] = [ Alt_R, Meta_R ], 
+    symbols[Group4] = [ Alt_R, Meta_R ]
+    };
+  modifier_map Mod1    { <RALT> };
+};
+
+partial modifier_keys
+xkb_symbols "ralt_switch_multikey" {
+  key <RALT> {
+    type[Group1]="TWO_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift, Multi_key ]
+    };
+};
+
+// special case or right Alt switch - for use with grp:alts_toggle
+//
+partial hidden modifier_keys
+xkb_symbols "ralt_switch_for_alts_toggle" {
+ virtual_modifiers LAlt, AlGr;
+  key <LALT> {
+    type[Group1]="PC_RALT_LEVEL2",
+    symbols[Group1] = [ Alt_L,  ISO_Prev_Group,  ISO_Prev_Group ],
+    virtualMods= LAlt
+  };
+  key <RALT> {
+    type[Group1]="PC_ALT_LEVEL2",
+    symbols[Group1] = [ ISO_Level3_Shift, ISO_Next_Group ],
+    virtualMods= AltGr
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// using the level(alt_switch) map, either Alt key temporarily chooses
+// the third shift level.  (Mostly be used to imitate Mac OS functionality.)
+partial modifier_keys
+xkb_symbols "alt_switch" {
+  include "level3(lalt_switch)"
+  include "level3(ralt_switch)"
+};
+
+partial modifier_keys
+xkb_symbols "lalt_switch" {
+  key <LALT> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { <LALT> };
+};
+
+// using the level(switch) map, the right Control key temporarily
+// chooses the third shift level (until it is released).
+partial modifier_keys
+xkb_symbols "switch" {
+  key <RCTL> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// using the level(menu_switch) map, the Menu key temporarily
+// chooses the third shift level (until it is released).
+partial modifier_keys
+xkb_symbols "menu_switch" {
+  key <MENU> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// using the level3(win_switch) map, the either Windows' logo key
+// temporarily chooses the third shift level.
+partial modifier_keys
+xkb_symbols "win_switch" {
+  include "level3(lwin_switch)"
+  include "level3(rwin_switch)"
+};
+
+// using the level3(lwin_switch) map, the left Windows' logo key
+// temporarily chooses the third shift level.
+partial modifier_keys
+xkb_symbols "lwin_switch" {
+  key <LWIN> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// using the level(rwin_switch) map, the right Windows' logo key
+// temporarily chooses the third shift level.  If you use this map,
+// you should define your keyboard as pc101 or pc102 instead of pc104
+// or pc105.
+partial modifier_keys
+xkb_symbols "rwin_switch" {
+  key <RWIN> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// using the level3(enter_switch) map, the Enter key on the keypad
+// temporarily chooses the third shift level.  This is especially
+// useful for Mac laptops which miss the right Alt key.
+partial hidden modifier_keys
+xkb_symbols "enter_switch" {
+  key <KPEN> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
diff --git a/xorg-server/xkbdata.src/symbols/level5 b/xorg-server/xkbdata.src/symbols/level5
new file mode 100644
index 000000000..87ecfaa55
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/level5
@@ -0,0 +1,18 @@
+// $XKeyboardConfig$
+
+// these variants assign various XKB keycodes to ISO_Level5_Shift so that
+// the third shift level can be reached
+//
+// $XFree86: xc/programs/xkbcomp/symbols/level3,v 1.7 2003/09/08 14:25:32 eich Exp $
+//
+
+// using the level(switch) map, the right Control key temporarily
+// chooses the fifth shift level (until it is released).
+partial modifier_keys
+xkb_symbols "rctrl_switch" {
+  key <RCTL> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift ]
+    };
+  modifier_map Mod3   { ISO_Level5_Shift };
+};
diff --git a/xorg-server/xkbdata.src/symbols/lk b/xorg-server/xkbdata.src/symbols/lk
new file mode 100644
index 000000000..161518673
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/lk
@@ -0,0 +1,93 @@
+// $XKeyboardConfig$
+
+// X Keyboard Extension file for Sinhala (Sri Lanka) (2004-04-22)
+// Maintainer  : Harshula Jayasuriya <harshula@gmail.com>
+// Last Updated: 2007-06-29
+// This is a static phonetic mapping for a standard US-English keyboard
+// (qwerty)
+// http://www.nongnu.org/sinhala/doc/keymaps/sinhala-keyboard_3.html
+
+// Repaya, Rakaransaya and Yansaya aren't inserted with A-r, R and Y,
+// respectively. The problem lies with the XKB infrastructure which
+// only allows a one-to-one mapping of keycodes to Unicode codepoints.
+// Unfortunately, the 3 mentioned glyphs actually consists of 3
+// Unicode codepoints each. The result is that the user must
+// manually construct the glyph by typing each of the 3 codepoints.
+// ALT-, represents the 'JOIN' key, it requires
+// two codepoints, hence it also has to be manually constructed.
+// Similarly, ALT-/ representing the 'TOUCH' key requires
+// two codepoints.
+
+// Repaya = rayanna,AL,ZWJ
+// Rakaransaya = AL,ZWJ,rayanna
+// Yansaya = AL,ZWJ,yayanna
+// JOIN = AL,ZWJ
+// TOUCH = ZWJ,AL
+
+// Where,
+// AL = Al Lakuna = ALT-a
+// ZWJ = Zero Width Joiner = ALT-/
+// rayanna = r
+// yayanna = y
+
+partial default alphanumeric_keys
+xkb_symbols "sin_phonetic" {
+
+  include "us"
+// it is default - no details in the name
+  name[Group1] = "Sri Lanka";
+  key.type[Group1] = "FOUR_LEVEL";
+
+  // q - p
+  key <AD01> { [ 0x01000d8d, 0x01000d8e, 0x01000dd8, 0x01000df2 ] };
+  key <AD02> { [ 0x01000d87, 0x01000d88, 0x01000dd0, 0x01000dd1 ] };
+  key <AD03> { [ 0x01000d91, 0x01000d92, 0x01000dd9, 0x01000dda ] };
+  key <AD04> { [ 0x01000dbb, 0x01000dca, 0x01000dbb, NoSymbol ] };
+  key <AD05> { [ 0x01000dad, 0x01000dae, 0x01000da7, 0x01000da8 ] };
+  key <AD06> { [ 0x01000dba, 0x01000dca, NoSymbol, NoSymbol ] };
+  key <AD07> { [ 0x01000d8b, 0x01000d8c, 0x01000dd4, 0x01000dd6 ] };
+  key <AD08> { [ 0x01000d89, 0x01000d8a, 0x01000dd2, 0x01000dd3 ] };
+  key <AD09> { [ 0x01000d94, 0x01000d95, 0x01000ddc, 0x01000ddd ] };
+  key <AD10> { [ 0x01000db4, 0x01000db5, NoSymbol, NoSymbol ] };
+
+  // a - l
+  key <AC01> { [ 0x01000d85, 0x01000d86, 0x01000dca, 0x01000dcf ] };
+  key <AC02> { [ 0x01000dc3, 0x01000dc1, 0x01000dc2, NoSymbol ] };
+  key <AC03> { [ 0x01000daf, 0x01000db0, 0x01000da9, 0x01000daa ] };
+  key <AC04> { [ 0x01000dc6, NoSymbol, 0x01000ddb, 0x01000d93 ] };
+  key <AC05> { [ 0x01000d9c, 0x01000d9d, 0x01000d9f, NoSymbol ] };
+  key <AC06> { [ 0x01000dc4, 0x01000d83, 0x01000dde, 0x01000d96 ] };
+  key <AC07> { [ 0x01000da2, 0x01000da3, 0x01000da6, NoSymbol ] };
+  key <AC08> { [ 0x01000d9a, 0x01000d9b, 0x01000d8f, 0x01000d90 ] };
+  key <AC09> { [ 0x01000dbd, 0x01000dc5, 0x01000ddf, 0x01000df3 ] };
+
+  // z - ?
+  key <AB01> { [ 0x01000da4, 0x01000da5, NoSymbol, NoSymbol ] };
+  key <AB02> { [ 0x01000db3, 0x01000dac, NoSymbol, NoSymbol ] };
+  key <AB03> { [ 0x01000da0, 0x01000da1, NoSymbol, NoSymbol ] };
+  key <AB04> { [ 0x01000dc0, NoSymbol, NoSymbol, NoSymbol ] };
+  key <AB05> { [ 0x01000db6, 0x01000db7, NoSymbol, NoSymbol ] };
+  key <AB06> { [ 0x01000db1, 0x01000dab, 0x01000d82, 0x01000d9e ] };
+  key <AB07> { [ 0x01000db8, 0x01000db9, NoSymbol, NoSymbol ] };
+  key <AB08> { [ any, any, 0x01000dca, NoSymbol ] };
+  key <AB09> { [ any, any, 0x01000df4, NoSymbol ] };
+  key <AB10> { [ any, any, 0x0100200d, NoSymbol ] };
+
+  // Space
+  key <SPCE> { [ space, nobreakspace, 0x0100200c, NoSymbol ] };
+
+  include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "tam_unicode" {
+    include "in(tam_unicode)"
+    name[Group1]= "Sri Lanka - Tamil Unicode";
+};
+
+partial alphanumeric_keys
+xkb_symbols "tam_TAB" {
+    include "in(tam_TAB)"
+    name[Group1]= "Sri Lanka - Tamil TAB Typewriter";
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/lt b/xorg-server/xkbdata.src/symbols/lt
new file mode 100644
index 000000000..6e7a43c7e
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/lt
@@ -0,0 +1,313 @@
+// $XKeyboardConfig$
+
+// based on
+// Lithuanian keyboard map by Ri�ardas Čepas <rch@richard.eu.org>
+// merged into one file by Nerijus Baliūnas
+// Added number and special characters writing in basic lt layout with RAlt by
+// Mantas Kriau�iūnas <mantas@akl.lt>, 2004
+//
+// $XFree86: xc/programs/xkbcomp/symbols/lt,v 1.3 2002/12/14 22:26:11 dawes Exp $
+
+// If you want to have 2 layouts, use
+// Option "XkbLayout" "lt,lt(us)"
+
+// Lithuanian Baltic layout - Lithuanian letters on the numeric row
+partial default alphanumeric_keys modifier_keys
+xkb_symbols "basic" {
+
+    include "latin"
+
+    name[Group1]="Lithuania";
+
+    key <AE01>	{ [   aogonek,      Aogonek,        1,      exclam ]	};
+    key <AE02>	{ [    ccaron,       Ccaron,        2,          at ]	};
+    key <AE03>	{ [   eogonek,      Eogonek,        3,  numbersign ]	};
+    key <AE04>	{ [ eabovedot,    Eabovedot,        4,      dollar ]	};
+    key <AE05>	{ [   iogonek,      Iogonek,        5,     percent ]	};
+    key <AE06>	{ [    scaron,       Scaron,        6, asciicircum ]	};
+    key <AE07>	{ [   uogonek,      Uogonek,        7,   ampersand ]	};
+    key <AE08>	{ [   umacron,      Umacron,        8,    asterisk ]	};
+    key <AE09>	{ [doublelowquotemark,  parenleft,  9,   parenleft ] };
+    key <AE10>	{ [leftdoublequotemark,parenright,  0,  parenright ] };
+    key <AE12>	{ [    zcaron,       Zcaron,    equal,        plus ]	};
+
+    key <LSGT>	{ [    endash,   EuroSign   ]	};
+
+    include "level3(ralt_switch)"
+};
+
+// Similar to the above, but you should use Right Alt + numeric row
+// for Lithuanian letters
+partial alphanumeric_keys modifier_keys
+xkb_symbols "us" {
+
+    include "latin"
+
+    name[Group1]="Lithuania - US keyboard with Lithuanian letters";
+
+    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)"
+};
+
+// 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 alphanumeric_keys modifier_keys
+xkb_symbols "std" {
+
+    include "latin"
+
+    name[Group1]= "Lithuania - Standard";
+
+    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)"
+};
+
+// Lithuanian keyboard map by Piter PUNK <piterpk@terra.com.br> 
+// Describes Lithuanian keymap LST 1205-92
+//
+// This keyboard is also know as IBM layout.
+// We follow the map found at: http://www.kada.lt/litwin/Kbdlta.gif
+// and info from Edis Tamoshauskas <linas_lietus@yahoo.com>
+ 
+partial alphanumeric_keys modifier_keys
+xkb_symbols "ibm" {
+
+    include "latin"
+
+    name[Group1]= "Lithuania - IBM (LST 1205-92)";
+
+    key <TLDE> {[	grave,		asciitilde	]};
+    key <AE01> {[	exclam,		1		]};
+    key <AE02> {[	quotedbl,	2,		at		]};
+    key <AE03> {[	slash,		3,		numbersign	]};
+    key <AE04> {[	semicolon,	4,		dollar		]};
+    key <AE05> {[	colon,		5,		percent		]};
+    key <AE06> {[	comma,		6,		asciicircum	]};
+    key <AE07> {[	period,		7,		ampersand	]};
+    key <AE08> {[	question,	8,		asterisk	]};
+    key <AE09> {[	parenleft,	9		]};
+    key <AE10> {[	parenright,	0		]};
+    key <AE11> {[	underscore,	minus		]};
+    key <AE12> {[	plus,		equal		]};
+    key <AD01> {[	aogonek,	Aogonek,	q,		Q		]};
+    key <AD02> {[	zcaron,		Zcaron,		w,		W		]};
+    key <AD03> {[	e,		E,		EuroSign	]};
+    key <AD11> {[	iogonek,	Iogonek,	bracketleft,	braceleft	]};
+    key <AD12> {[ doublelowquotemark, leftdoublequotemark, bracketright, braceright	]};
+    key <AC10> {[	uogonek,	Uogonek,	semicolon,	colon		]};
+    key <AC11> {[	eabovedot,	Eabovedot,	apostrophe,	quotedbl	]};
+    key <AB02> {[	umacron,	Umacron,	x,		X		]};
+    key <AB08> {[	ccaron,		Ccaron,		comma,		less		]};
+    key <AB09> {[	scaron,		Scaron,		period,		greater		]};
+    key <AB10> {[	eogonek,	Eogonek,	slash,		question	]};
+    key <SPCE> {[	space,		space,		nobreakspace,	nobreakspace	]};
+
+    key <LSGT> {[	less,		greater,	endash		]};
+
+    include "level3(ralt_switch)"
+};
+
+
+
+// LEKP, LEKPa and Baltic+ layouts 1.0 for Linux.
+// Copyright (c) 2007 Tautrimas Pajarskas
+// For more info go to http://lekp.info
+
+partial alphanumeric_keys modifier_keys
+xkb_symbols "lekp" {
+    name[Group1]="Lithuania - LEKP";
+    key <TLDE>  { [     grave,   asciitilde, acute ] };
+    key <AE01>	{ [     slash,   numbersign,               bar ] };
+    key <AE02>	{ [ backslash,           at,           section ] };
+    key <AE03>	{ [    period,    braceleft ] };
+    key <AE04>	{ [     comma,   braceright ] };
+    key <AE05>	{ [         f, 	          F ] };
+    key <AE06>	{ [    exclam,       endash ] };
+    key <AE07>	{ [         w,            W ] };
+    key <AE08>	{ [   uogonek,      Uogonek ] };
+    key <AE09>	{ [   iogonek,      Iogonek ] };
+    key <AE10>	{ [ parenleft,  doublelowquotemark, registered ] };
+    key <AE11>	{ [ parenright, leftdoublequotemark, copyright ] };
+    key <AE12>  { [      colon,           ampersand, trademark ] };
+
+    key <BKSL>  { [ apostrophe,          underscore ] };
+
+    key <AD01>  { [          q,                  Q,   EuroSign ] };
+    key <AD02>  { [          g,                  G,          7 ] };
+    key <AD03>  { [          r,                  R,          8 ] };
+    key <AD04>  { [          l,                  L,          9 ] };
+    key <AD05>  { [          d,                  D,    percent ] };
+    key <AD06>  { [     ccaron,             Ccaron ] };
+    key <AD07>  { [          j,                  J ] };
+    key <AD08>  { [          u,                  U,     period ] };
+    key <AD09>  { [  eabovedot,          Eabovedot,      minus ] };
+    key <AD10>  { [    eogonek,            Eogonek,      slash ] };
+    key <AD11>  { [   question,        bracketleft,   division ] };
+    key <AD12>  { [      equal,       bracketright ] };
+
+    key <CAPS>  { [  BackSpace ] };
+    key <AC01>  { [          a,                  A,          0 ] };
+    key <AC02>  { [          k,                  K,          4 ] };
+    key <AC03>  { [          s,                  S,          5 ] };
+    key <AC04>  { [          t,                  T,          6 ] };
+    key <AC05>  { [          m,                  M,     dollar ] };
+    key <AC06>  { [          p,                  P ] };
+    key <AC07>  { [          n,                  N ] };
+    key <AC08>  { [          e,                  E,      comma ] };
+    key <AC09>  { [          i,                  I,       plus ] };
+    key <AC10>  { [          o,                  O,   asterisk ] };
+    key <AC11>  { [          y,                  Y,   multiply ] };
+
+    key <AB01>  { [          z,                  Z, asciicircum ] };
+    key <AB02>  { [          x,                  X,          1 ] };
+    key <AB03>  { [          c,                  C,          2 ] };
+    key <AB04>  { [          v,                  V,          3 ] };
+    key <AB05>  { [     zcaron,             Zcaron ] };
+    key <AB06>  { [     scaron,             Scaron ] };
+    key <AB07>  { [          b,                  B,     degree ] };
+    key <AB08>  { [    umacron,            Umacron,       less ] };
+    key <AB09>  { [    aogonek,            Aogonek,    greater ] };
+    key <AB10>  { [          h,                  H ] };
+
+    key <LSGT>  { [  semicolon,           quotedbl,   sterling ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys modifier_keys
+xkb_symbols "lekpa" {
+    name[Group1]="Lithuania - LEKPa";
+    key <TLDE>  { [     grave,   asciitilde,             acute ] };
+    key <AE01>	{ [     slash,     quotedbl,               bar ] };
+    key <AE02>	{ [ backslash,           at,           section ] };
+    key <AE03>	{ [    period,    braceleft,        numbersign ] };
+    key <AE04>	{ [     comma,   braceright,          sterling ] };
+    key <AE05>	{ [         f, 	          F,         ampersand ] };
+    key <AE06>	{ [    exclam,       endash ] };
+    key <AE07>	{ [         w,            W ] };
+    key <AE08>	{ [   uogonek,      Uogonek ] };
+    key <AE09>	{ [   iogonek,      Iogonek ] };
+    key <AE10>	{ [ parenleft, doublelowquotemark,  registered ] };
+    key <AE11>	{ [ parenright, leftdoublequotemark, copyright ] };
+    key <AE12>  { [      colon,   semicolon,         trademark ] };
+
+    key <BKSL>  { [ apostrophe,          underscore ] };
+
+    key <AD01>  { [          q,                  Q,   EuroSign ] };
+    key <AD02>  { [          g,                  G,          7 ] };
+    key <AD03>  { [          r,                  R,          8 ] };
+    key <AD04>  { [          l,                  L,          9 ] };
+    key <AD05>  { [          d,                  D,    percent ] };
+    key <AD06>  { [     ccaron,             Ccaron ] };
+    key <AD07>  { [          j,                  J ] };
+    key <AD08>  { [          u,                  U,     period ] };
+    key <AD09>  { [  eabovedot,          Eabovedot,      minus ] };
+    key <AD10>  { [    eogonek,            Eogonek,      slash ] };
+    key <AD11>  { [   question,        bracketleft,   division ] };
+    key <AD12>  { [      equal,       bracketright ] };
+
+    key <CAPS>  { [  BackSpace ] };
+    key <AC01>  { [          a,                  A,          0 ] };
+    key <AC02>  { [          k,                  K,          4 ] };
+    key <AC03>  { [          s,                  S,          5 ] };
+    key <AC04>  { [          t,                  T,          6 ] };
+    key <AC05>  { [          m,                  M,     dollar ] };
+    key <AC06>  { [          p,                  P ] };
+    key <AC07>  { [          n,                  N ] };
+    key <AC08>  { [          e,                  E,      comma ] };
+    key <AC09>  { [          i,                  I,       plus ] };
+    key <AC10>  { [          o,                  O,   asterisk ] };
+    key <AC11>  { [          y,                  Y,   multiply ] };
+
+    key <AB01>  { [          z,                  Z, asciicircum ] };
+    key <AB02>  { [          x,                  X,          1 ] };
+    key <AB03>  { [          c,                  C,          2 ] };
+    key <AB04>  { [          v,                  V,          3 ] };
+    key <AB05>  { [     zcaron,             Zcaron ] };
+    key <AB06>  { [     scaron,             Scaron ] };
+    key <AB07>  { [          b,                  B,     degree ] };
+    key <AB08>  { [    umacron,            Umacron,       less ] };
+    key <AB09>  { [    aogonek,            Aogonek,    greater ] };
+    key <AB10>  { [          h,                  H ] };
+
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys modifier_keys
+xkb_symbols "balticplus" {
+    include "latin"
+    name[Group1]="Lithuania - Baltic+";
+    key <AE01>  { [   aogonek,      Aogonek,        1,      exclam ]    };
+    key <AE02>  { [    ccaron,       Ccaron,        2,          at ]    };
+    key <AE03>  { [   eogonek,      Eogonek,        3,  numbersign ]    };
+    key <AE04>  { [ eabovedot,    Eabovedot,        4,      dollar ]    };
+    key <AE05>  { [   iogonek,      Iogonek,        5,     percent ]    };
+    key <AE06>  { [    scaron,       Scaron,        6, asciicircum ]    };
+    key <AE07>  { [   uogonek,      Uogonek,        7,   ampersand ]    };
+    key <AE08>  { [   umacron,      Umacron,        8,    asterisk ]    };
+    key <AE09>  { [ parenleft, doublelowquotemark,  9 ] };
+    key <AE10>  { [ parenright, leftdoublequotemark, 0 ] };
+    key <AE11>  { [     minus,   underscore,    minus,  section ] };
+    key <AE12>  { [    zcaron,       Zcaron,    equal,        plus ]    };
+    key <CAPS>  { [ BackSpace ] };
+    key <NFER>  { [ backslash,         bar,   endash ] };
+    key <AD03>  { [         e,            E, EuroSign ] };
+    key <AD04>  { [         r,            R, registered ] };
+    key <AD05>  { [         t,            T, trademark ] };
+    key <AB03>  { [         c,            C, copyright ] };
+    key <AB08>  { [     comma,         less,  degree ] };
+    include "level3(ralt_switch)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/lv b/xorg-server/xkbdata.src/symbols/lv
new file mode 100644
index 000000000..556be6c66
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/lv
@@ -0,0 +1,129 @@
+// $XKeyboardConfig$
+
+// Latvian keymap version 1.1
+// Copyright (C) Dmitry Golubev <lastguru@mail.ru>, 2003-2004
+//
+// Reworked to get rid of dead_keys (use of which in this case
+// is a dirty hack). It is now not dependent on locale settings
+// and GTK_IM_MODULES in Gnome. The map is also providing some of
+// ISO9995-3 alternate characters. Note that this version works
+// correctly under Gnome 2.6. This is to be put into symbols/
+// directory, or somewhere else.
+//
+// Permission to use, copy, modify, distribute, and sell this software and its
+// documentation for any purpose is hereby granted without fee, provided that
+// the above copyright notice appear in all copies and that both that
+// copyright notice and this permission notice appear in supporting
+// documentation, and that the name of the copyright holder(s) not be used in
+// advertising or publicity pertaining to distribution of the software without
+// specific, written prior permission.  The copyright holder(s) makes no
+// representations about the suitability of this software for any purpose.  It
+// is provided "as is" without express or implied warranty.
+//
+// THE COPYRIGHT HOLDER(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+// INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+// EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+// CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+// TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+partial default alphanumeric_keys modifier_keys
+xkb_symbols "basic" {
+
+    name[Group1]= "Latvia";
+
+        key <TLDE>      {[grave, asciitilde, acute, asciitilde]};
+        key <AE01>      {[1, exclam, onesuperior, exclamdown]};
+        key <AE02>      {[2, at, twosuperior, oneeighth]};
+        key <AE03>      {[3, numbersign, threesuperior, sterling]};
+        key <AE04>	{[4, dollar, EuroSign, cent]};
+        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, endash, emdash]};
+                                                
+        key <AD01>      {[q, Q, q, Q]};
+        key <AD02>      {[w, W, w, W]};
+	key <AD03>	{[e, E, emacron, Emacron]};
+	key <AD04>	{[r, R, rcedilla, Rcedilla]};
+        key <AD05>      {[t, T, t, T]};
+        key <AD06>      {[y, Y, y, Y]};
+	key <AD07>	{[u, U, umacron, Umacron]};
+	key <AD08>	{[i, I, imacron, Imacron]};
+	key <AD09>	{[o, O, omacron, Omacron]};
+        key <AD10>      {[p, P, p, P]};
+        key <AD11>      {[bracketleft, braceleft, guillemotleft, leftdoublequotemark]};
+        key <AD12>      {[bracketright, braceright, guillemotright, rightdoublequotemark]};
+
+	key <AC01>	{[a, A, amacron, Amacron]};
+	key <AC02>	{[s, S, scaron, Scaron]};
+        key <AC03>      {[d, D, d, D]};
+        key <AC04>      {[f, F, f, F]};
+	key <AC05>	{[g, G, gcedilla, Gcedilla]};
+        key <AC06>      {[h, H, h, H]};
+        key <AC07>      {[j, J, j, J]};
+	key <AC08>	{[k, K, kcedilla, Kcedilla]};
+	key <AC09>	{[l, L, lcedilla, Lcedilla]};
+        key <AC10>      {[semicolon, colon, semicolon, colon]};
+        key <AC11>	{[apostrophe, quotedbl, leftdoublequotemark, doublelowquotemark]};
+
+	key <AB01>	{[z, Z, zcaron, Zcaron]};
+        key <AB02>      {[x, X, x, X]};
+	key <AB03>	{[c, C, ccaron, Ccaron]};
+        key <AB04>      {[v, V, v, V]};
+        key <AB05>      {[b, B, b, B]};
+	key <AB06>	{[n, N, ncedilla, Ncedilla]};
+        key <AB07>      {[m, M, m, M]};
+        key <AB08>      {[comma, less, horizconnector, multiply]};
+        key <AB09>      {[period, greater, periodcentered, division]};
+        key <AB10>      {[slash, question, slash, abovedot]};
+        key <BKSL>      {[backslash, bar, grave, breve]};
+        
+        key <SPCE>	{[space, space, space, space]};
+
+	include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys modifier_keys
+xkb_symbols "apostrophe" {
+
+    include "lv(basic)"
+
+    name[Group1]= "Latvia - Apostrophe (') variant";
+
+	key <AC11>	{[ISO_Level3_Latch, quotedbl, apostrophe, quotedbl]};
+        key <SPCE>      {[space, space, apostrophe]};
+	modifier_map Mod5 { <AC11> };
+
+};
+
+partial alphanumeric_keys modifier_keys
+xkb_symbols "tilde" {
+
+    include "lv(basic)"
+
+    name[Group1]= "Latvia - Tilde (~) variant";
+
+	key <TLDE>	{[ISO_Level3_Latch, asciitilde, grave, acute]}; 
+        key <SPCE>      {[space, space, asciitilde]};
+	modifier_map Mod5 { <TLDE> };
+
+};
+
+partial alphanumeric_keys modifier_keys
+xkb_symbols "fkey" {
+
+    include "lv(basic)"
+
+    name[Group1]= "Latvia - F-letter (F) variant";
+
+        key <AC04>      {[ISO_Level3_Latch, ISO_Level3_Latch, f, F]};
+        key <SPCE>      {[space, space, f, F]};
+	modifier_map Mod5 { <AC04> };
+
+};
diff --git a/xorg-server/xkbdata.src/symbols/ma b/xorg-server/xkbdata.src/symbols/ma
new file mode 100644
index 000000000..16d071744
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/ma
@@ -0,0 +1,325 @@
+// Arabic AZERTY with modern Latin digits 
+partial default alphanumeric_keys
+xkb_symbols "arabic" {
+    include "ara(azerty)"
+
+    name[Group1]="Morocco";
+};
+
+// French AZERTY keyboard used when typing French
+partial alphanumeric_keys
+xkb_symbols "french" {
+    include "fr(basic)"
+
+    name[Group1]="Morocco - French";
+};
+
+// Clavier unicode tifinaghe de base réalisé par l'IRCAM (Institut Royal de la Culture Amazighe du Maroc) http://www.ircam.ma/
+// Support des lettres unicode tifinaghe-IRCAM, néotifinaghes & touarègues.
+// Les caractères tifinaghes sont accessibles en SHIFT positions pour le niveau 2, en ALTGR positions pour le niveau 3
+// Polices tifinaghes Unicode à télécharger depuis :
+// http://www.ircam.ma/documents/policesclavierunicode/hapaxber.ttf (licence non libre, libre téléchargement et distribution uniquement)
+// Minihowto ici: http://perso.menara.ma/~kebdani/tamazgha/gnu_amazigh.html
+
+partial alphanumeric_keys
+xkb_symbols "tifinagh" {
+
+    name[Group1]="Morocco - Tifinagh";
+
+    key <TLDE>	{ [ twosuperior, NoAction ]	};
+    key <AE01>	{ [ ampersand,          1 ]	};
+    key <AE02>	{ [ NoAction,          2, asciitilde	]	};
+    key <AE03>	{ [  quotedbl,          3, numbersign	]	};
+    key <AE04>	{ [apostrophe,          4, braceleft	]	};
+    key <AE05>	{ [ parenleft,          5, bracketleft	]	};
+    key <AE06>	{ [     minus,          6, bar	]	};
+    key <AE07>	{ [         NoAction ,  7 ]	};
+    key <AE08>	{ [underscore,          8, backslash	]	};
+    key <AE09>	{ [NoAction,         9, asciicircum	]	};
+    key <AE10>	{ [       NoAction ,          0, at		]	};
+    key <AE11>	{ [parenright,     degree, bracketright	]	};
+    key <AE12>	{ [     equal,       plus, braceright	]	};
+
+    key <AD01>	{ [ 0x1002d30 ]	};
+    key <AD02>	{ [ 0x1002d63, 0x1002d65 ]	};
+    key <AD03>	{ [ 0x1002d3b, NoAction,0x10020ac ]	};
+    key <AD04>	{ [ 0x1002d54, 0x1002d55 ]	};
+    key <AD05>	{ [ 0x1002d5c, 0x1002d5f ]	};
+    key <AD06>	{ [ 0x1002d62 ]	};
+    key <AD07>	{ [ 0x1002d53 ]	};
+    key <AD08>	{ [ 0x1002d49 ]	};
+    key <AD09>	{ [ 0x1002d44 ]	};
+    key <AD10>	{ [ 0x1002d43 ]	};
+    key <AD11>	{ [ 0x1002d6f ]   };
+    key <AD12>	{ [    dollar,   sterling,   0x10000a4]	};
+
+    key <AC01>	{ [ 0x1002d47 ]	};
+    key <AC02>	{ [ 0x1002d59, 0x1002d5a ]	};
+    key <AC03>	{ [ 0x1002d37, 0x1002d39 ]	};
+    key <AC04>	{ [ 0x1002d3c ]	};
+    key <AC05>	{ [ 0x1002d33, 0x1002d33]	};
+    key <AC06>	{ [ 0x1002d40 ]	};
+    key <AC07>	{ [ 0x1002d4a ]	};
+    key <AC08>	{ [ 0x1002d3d,  0x1002d3d  ]	};
+    key <AC09>	{ [ 0x1002d4d ]	};
+    key <AC10>	{ [ 0x1002d4e ]	};
+    key <AC11>	{ [    NoAction ,   percent ]	};
+    key <BKSL>	{ [  asterisk,         mu ]	};
+
+    key <AB01>	{ [ 0x1002d61 ]	};
+    key <AB02>	{ [ 0x1002d45 ]	};
+    key <AB03>	{ [ 0x1002d5b ]	};
+    key <AB04>	{ [ 0x1002d56 ]	};
+    key <AB05>	{ [ 0x1002d31 ]	};
+    key <AB06>	{ [ 0x1002d4f ]	};
+    key <AB07>	{ [     comma,   question ] };
+    key <AB08>	{ [ semicolon,     period ] };
+    key <AB09>	{ [     colon,      slash ] };
+    key <AB10>	{ [    exclam,    section ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "tifinagh-phonetic" {
+
+    name[Group1]="Morocco - Tifinagh Phonetic";
+    include "ma(tifinagh)"
+
+    key <LatA>	{ [ 0x1002d30 ]	};
+    key <LatZ>	{ [ 0x1002d63, 0x1002d65 ]	};
+    key <LatE>	{ [ 0x1002d3b, NoAction,0x10020ac ]	};
+    key <LatR>	{ [ 0x1002d54, 0x1002d55 ]	};
+    key <LatT>	{ [ 0x1002d5c, 0x1002d5f ]	};
+    key <LatY>	{ [ 0x1002d62 ]	};
+    key <LatU>	{ [ 0x1002d53 ]	};
+    key <LatI>	{ [ 0x1002d49 ]	};
+    key <LatO>	{ [ 0x1002d44 ]	};
+    key <LatP>	{ [ 0x1002d43 ]	};
+
+    key <LatQ>	{ [ 0x1002d47 ]	};
+    key <LatS>	{ [ 0x1002d59, 0x1002d5a ]	};
+    key <LatD>	{ [ 0x1002d37, 0x1002d39 ]	};
+    key <LatF>	{ [ 0x1002d3c ]	};
+    key <LatG>	{ [ 0x1002d33 ]	};
+    key <LatH>	{ [ 0x1002d40 ]	};
+    key <LatJ>	{ [ 0x1002d4a ]	};
+    key <LatK>	{ [ 0x1002d3d ]	};
+    key <LatL>	{ [ 0x1002d4d ]	};
+    key <LatM>	{ [ 0x1002d4e ]	};
+
+    key <LatW>	{ [ 0x1002d61,0x1002d6f ]	};
+    key <LatX>	{ [ 0x1002d45 ]	};
+    key <LatC>	{ [ 0x1002d5b ]	};
+    key <LatV>	{ [ 0x1002d56 ]	};
+    key <LatB>	{ [ 0x1002d31 ]	};
+    key <LatN>	{ [ 0x1002d4f ]	};
+
+    include "level3(ralt_switch)"
+};
+
+// Clavier unicode tifinaghe étendu réalisé par l'IRCAM (Institut Royal de la Culture Amazighe du Maroc) http://www.ircam.ma/
+// Support des lettres unicode tifinaghe-IRCAM, néotifinaghes & touarègues.
+// Les caractères tifinaghes sont accessibles en SHIFT positions pour le niveau 2, en ALTGR positions pour le niveau 3
+// Polices tifinaghes Unicode à télécharger depuis :
+// http://www.ircam.ma/documents/policesclavierunicode/hapaxber.ttf (licence non libre, libre téléchargement et distribution uniquement)
+// Minihowto ici: http://perso.menara.ma/~kebdani/tamazgha/gnu_amazigh.html
+
+partial alphanumeric_keys
+xkb_symbols "tifinagh-extended" {
+
+    name[Group1]="Morocco - Tifinagh Extended";
+
+    key <TLDE>	{ [ twosuperior,0x100200C ]	};
+    key <AE01>	{ [ ampersand,          1 ]	};
+    key <AE02>	{ [0x1002d52,          2, asciitilde	]	};
+    key <AE03>	{ [  quotedbl,          3, numbersign	]	};
+    key <AE04>	{ [apostrophe,          4, braceleft	]	};
+    key <AE05>	{ [ parenleft,          5, bracketleft	]	};
+    key <AE06>	{ [ minus,          6, bar		]	};
+    key <AE07>	{ [ 0x1002d64 ,  7 ]	};
+    key <AE08>	{ [underscore,          8, backslash	]	};
+    key <AE09>	{ [ 0x1002014,         9, asciicircum	]	};
+    key <AE10>	{ [ 0x100200d,          0, at	]	};
+    key <AE11>	{ [parenright,   degree, bracketright	]	};
+    key <AE12>	{ [     equal,       plus, braceright	]	};
+
+    key <AD01>	{ [ 0x1002d30, 0x1002d36 ]	};
+    key <AD02>	{ [ 0x1002d63, 0x1002d65 ]	};
+    key <AD03>	{ [ 0x1002d3b, 0x1002d57, 0x10020ac ]	};
+    key <AD04>	{ [ 0x1002d54, 0x1002d55 ]	};
+    key <AD05>	{ [ 0x1002d5c, 0x1002d5f ]	};
+    key <AD06>	{ [ 0x1002d62, 0x1002d42 ]	};
+    key <AD07>	{ [ 0x1002d53, 0x1002d4c ]	};
+    key <AD08>	{ [ 0x1002d49, 0x1002d58 ]	};
+    key <AD09>	{ [ 0x1002d44, 0x1002d5d ]	};
+    key <AD10>	{ [ 0x1002d43, 0x1002d5e ]	};
+    key <AD11>	{ [ 0x1002d6f, 0x1002d60 ]   };
+    key <AD12>	{ [    dollar,   sterling,   0x10000a4]	};
+
+    key <AC01>	{ [ 0x1002d47, 0x1002d48 ]	};
+    key <AC02>	{ [ 0x1002d59, 0x1002d5a ]	};
+    key <AC03>	{ [ 0x1002d37, 0x1002d39 ]	};
+    key <AC04>	{ [ 0x1002d3c, 0x1002d35 ]	};
+    key <AC05>	{ [ 0x1002d33, 0x1002d33 ]	};
+    key <AC06>	{ [ 0x1002d40, 0x1002d41 ]	};
+    key <AC07>	{ [ 0x1002d4a, 0x1002d4b ]	};
+    key <AC08>	{ [ 0x1002d3d, 0x1002d3d ]	};
+    key <AC09>	{ [ 0x1002d4d, 0x1002d38 ]	};
+    key <AC10>	{ [ 0x1002d4e, 0x1002d3a ]	};
+    key <AC11>	{ [ 0x1002d51,  percent  ]	};
+    key <BKSL>	{ [ asterisk,   mu       ]	};
+
+    key <AB01>	{ [ 0x1002d61, 0x1002d3e ]	};
+    key <AB02>	{ [ 0x1002d45, 0x1002d46 ]	};
+    key <AB03>	{ [ 0x1002d5b, 0x1002d3f ]	};
+    key <AB04>	{ [ 0x1002d56, 0x1002d34 ]	};
+    key <AB05>	{ [ 0x1002d31, 0x1002d32 ]	};
+    key <AB06>	{ [ 0x1002d4f, 0x1002d50 ]	};
+    key <AB07>	{ [     comma,  question ]    };
+    key <AB08>	{ [ semicolon,    period ]    };
+    key <AB09>	{ [     colon,     slash ]    };
+    key <AB10>	{ [    exclam,   section ]    };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "tifinagh-extended-phonetic" {
+    include "ma(tifinagh-extended)"
+
+    name[Group1]="Morocco - Tifinagh Extended Phonetic";
+
+    key <LatA>	{ [ 0x1002d30 ]	};
+    key <LatZ>	{ [ 0x1002d63, 0x1002d65 ]	};
+    key <LatE>	{ [ 0x1002d3b, NoAction,0x10020ac ]	};
+    key <LatR>	{ [ 0x1002d54, 0x1002d55 ]	};
+    key <LatT>	{ [ 0x1002d5c, 0x1002d5f ]	};
+    key <LatY>	{ [ 0x1002d62 ]	};
+    key <LatU>	{ [ 0x1002d53 ]	};
+    key <LatI>	{ [ 0x1002d49 ]	};
+    key <LatO>	{ [ 0x1002d44 ]	};
+    key <LatP>	{ [ 0x1002d43 ]	};
+
+    key <LatQ>	{ [ 0x1002d47 ]	};
+    key <LatS>	{ [ 0x1002d59, 0x1002d5a ]	};
+    key <LatD>	{ [ 0x1002d37, 0x1002d39 ]	};
+    key <LatF>	{ [ 0x1002d3c ]	};
+    key <LatG>	{ [ 0x1002d33 ]	};
+    key <LatH>	{ [ 0x1002d40 ]	};
+    key <LatJ>	{ [ 0x1002d4a ]	};
+    key <LatK>	{ [ 0x1002d3d ]	};
+    key <LatL>	{ [ 0x1002d4d ]	};
+    key <LatM>	{ [ 0x1002d4e ]	};
+
+    key <LatW>	{ [ 0x1002d61 ]	};
+    key <LatX>	{ [ 0x1002d45 ]	};
+    key <LatC>	{ [ 0x1002d5b ]	};
+    key <LatV>	{ [ 0x1002d56 ]	};
+    key <LatB>	{ [ 0x1002d31 ]	};
+    key <LatN>	{ [ 0x1002d4f ]	};
+
+    include "level3(ralt_switch)"
+};
+
+// Tifinagh keyboard; improved from the IRCAM layout to make all
+// tifinagh chars in unicode accessible (in shift positions for most
+// touareg letters; in altgr position for spirants.
+
+partial alphanumeric_keys
+xkb_symbols "tifinagh-alt" {
+
+    name[Group1]="Morocco - Tifinagh Alternative";
+
+    key <TLDE>	{ [ twosuperior, asciitilde ]	};
+    key <AE01>	{ [ ampersand,          1 ]	};
+    key <AE02>	{ [asciitilde,          2, asciitilde	]	};
+    key <AE03>	{ [  quotedbl,          3, numbersign	]	};
+    key <AE04>	{ [apostrophe,          4, braceleft	]	};
+    key <AE05>	{ [ parenleft,          5, bracketleft	]	};
+    key <AE06>	{ [     minus,          6, bar		]	};
+    key <AE07>	{ [     grave,          7, grave	]	};
+    key <AE08>	{ [underscore,          8, backslash	]	};
+    key <AE09>	{ [asciicircum,         9, asciicircum	]	};
+    key <AE10>	{ [        at,          0, at		]	};
+    key <AE11>	{ [parenright,     degree, bracketright	]	};
+    key <AE12>	{ [     equal,       plus, braceright	]	};
+
+    key <AD01>	{ [ 0x1002d30 ]	};
+    key <AD02>	{ [ 0x1002d63, 0x1002d65, 0x1002d64 ]	};
+    key <AD03>	{ [ 0x1002d3b ]	};
+    key <AD04>	{ [ 0x1002d54, 0x1002d55 ]	};
+    key <AD05>	{ [ 0x1002d5c, 0x1002d5f, 0x1002d5d ]	};
+    key <AD06>	{ [ 0x1002d62 ]	};
+    key <AD07>	{ [ 0x1002d53 ]	};
+    key <AD08>	{ [ 0x1002d49 ]	};
+    key <AD09>	{ [ 0x1002d44 ]	};
+    key <AD10>	{ [ 0x1002d43, 0x1002d52 ]	};
+    key <AD11>	{ [ dead_circumflex ] };
+    key <AD12>	{ [    dollar,   sterling ]	};
+
+    key <AC01>	{ [ 0x1002d47, 0x1002d48 ]	};
+    key <AC02>	{ [ 0x1002d59, 0x1002d5a ]	};
+    key <AC03>	{ [ 0x1002d37, 0x1002d39, 0x1002d38, 0x1002d3a ]	};
+    key <AC04>	{ [ 0x1002d3c ]	};
+    key <AC05>	{ [ 0x1002d33, 0x1002d36, 0x1002d34, 0x1002d35 ]	};
+    key <AC06>	{ [ 0x1002d40, 0x1002d42, 0x1002d41 ]	};
+    key <AC07>	{ [ 0x1002d4a, 0x1002d4c, 0x1002d4b ]	};
+    key <AC08>	{ [ 0x1002d3d, 0x1002d3e, 0x1002d3f ]	};
+    key <AC09>	{ [ 0x1002d4d ]	};
+    key <AC10>	{ [ 0x1002d4e ]	};
+    key <AC11>	{ [ percent ]	};
+    key <BKSL>	{ [  asterisk,         mu ]	};
+
+    key <AB01>	{ [ 0x1002d61, 0x1002d6f, 0x1002d60 ]	};
+    key <AB02>	{ [ 0x1002d45, 0x1002d46 ]	};
+    key <AB03>	{ [ 0x1002d5b, 0x1002d5e ]	};
+    key <AB04>	{ [ 0x1002d56, 0x1002d57, 0x1002d58 ]	};
+    key <AB05>	{ [ 0x1002d31, 0x1002d31, 0x1002d32 ]	};
+    key <AB06>	{ [ 0x1002d4f, 0x1002d50, 0x1002d51 ]	};
+    key <AB07>	{ [     comma,   question ] };
+    key <AB08>	{ [ semicolon,     period ] };
+    key <AB09>	{ [     colon,      slash ] };
+    key <AB10>	{ [    exclam,    section ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "tifinagh-alt-phonetic" {
+    include "ma(tifinagh-alt)"
+
+    name[Group1]="Morocco - Tifinagh Alternative Phonetic";
+
+    key <LatA>	{ [ 0x1002d30 ]	};
+    key <LatZ>	{ [ 0x1002d63, 0x1002d65, 0x1002d64 ]	};
+    key <LatE>	{ [ 0x1002d3b ]	};
+    key <LatR>	{ [ 0x1002d54, 0x1002d55 ]	};
+    key <LatT>	{ [ 0x1002d5c, 0x1002d5f, 0x1002d5d ]	};
+    key <LatY>	{ [ 0x1002d62 ]	};
+    key <LatU>	{ [ 0x1002d53 ]	};
+    key <LatI>	{ [ 0x1002d49 ]	};
+    key <LatO>	{ [ 0x1002d44 ]	};
+    key <LatP>	{ [ 0x1002d43, 0x1002d52 ]	};
+
+    key <LatQ>	{ [ 0x1002d47, 0x1002d48 ]	};
+    key <LatS>	{ [ 0x1002d59, 0x1002d5a ]	};
+    key <LatD>	{ [ 0x1002d37, 0x1002d39, 0x1002d38, 0x1002d3a ]	};
+    key <LatF>	{ [ 0x1002d3c ]	};
+    key <LatG>	{ [ 0x1002d33, 0x1002d36, 0x1002d34, 0x1002d35 ]	};
+    key <LatH>	{ [ 0x1002d40, 0x1002d42, 0x1002d41 ]	};
+    key <LatJ>	{ [ 0x1002d4a, 0x1002d4c, 0x1002d4b ]	};
+    key <LatK>	{ [ 0x1002d3d, 0x1002d3e, 0x1002d3f ]	};
+    key <LatL>	{ [ 0x1002d4d ]	};
+    key <LatM>	{ [ 0x1002d4e ]	};
+
+    key <LatW>	{ [ 0x1002d61, 0x1002d6f, 0x1002d60 ]	};
+    key <LatX>	{ [ 0x1002d45, 0x1002d46 ]	};
+    key <LatC>	{ [ 0x1002d5b, 0x1002d5e ]	};
+    key <LatV>	{ [ 0x1002d56, 0x1002d57, 0x1002d58 ]	};
+    key <LatB>	{ [ 0x1002d31, 0x1002d31, 0x1002d32 ]	};
+    key <LatN>	{ [ 0x1002d4f, 0x1002d50, 0x1002d51 ]	};
+
+    include "level3(ralt_switch)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am
new file mode 100644
index 000000000..d409eff93
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am
@@ -0,0 +1,8 @@
+symbolsdir = $(xkb_base)/symbols/macintosh_vndr
+
+dist_symbols_DATA = \
+apple ch de dk \
+es fi fr \
+gb is it \
+latam nl no pt \
+se us
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in
new file mode 100644
index 000000000..90b2eb576
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in
@@ -0,0 +1,371 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = symbols/macintosh_vndr
+DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(symbolsdir)"
+dist_symbolsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_symbols_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+symbolsdir = $(xkb_base)/symbols/macintosh_vndr
+dist_symbols_DATA = \
+apple ch de dk \
+es fi fr \
+gb is it \
+latam nl no pt \
+se us
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/macintosh_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  symbols/macintosh_vndr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_symbolsDATA: $(dist_symbols_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_symbolsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  $(dist_symbolsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+
+uninstall-dist_symbolsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(symbolsdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_symbolsDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_symbolsDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_symbolsDATA uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/apple b/xorg-server/xkbdata.src/symbols/macintosh_vndr/apple
new file mode 100644
index 000000000..3887caf78
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/apple
@@ -0,0 +1,54 @@
+//
+// Keyboard modification for Apple keyboards
+//
+// $XFree86: xc/programs/xkbcomp/symbols/apple,v 1.2 2003/10/24 20:38:20 tsi Exp $
+
+partial default modifier_keys
+xkb_symbols "extended" {
+
+    key <KPEQ> { [ KP_Equal ] }; 
+
+// The key in the PC's Insert position is sometimes engraved Help (at least
+// in Switzerland and Great Britain), with Insert sometimes above. But in the
+// US and Canada, it remains Insert. So this should probably be an XkbOption,
+// but I have to do more research.
+// Perhaps Help should be the primary symbol with Insert in the 1st shift-level
+//    key  <INS> { [ Help, Insert ] };
+// The keys next to F12, labeled F13, F14, & F15 generate codes that XFree86
+// claims not to generate. I think they should be equivalent to the PC keys
+// Print Screen / SysRq, Scroll Lock, and Pause. Linux kernel bug?
+//    key <PRSC> { [ F13 ] }; // should be keycode 93 or
+//    key <FK13> { [ F13 ] }; // should be keycode 118
+//    key <SCLK> { [ F14 ] }; // should be keycode 123 or
+//    key <FK14> { [ F14 ] }; // should be keycode 119
+//    key <PAUS> { [ F15 ] }; // should be keycode 127 or
+//    key <FK15> { [ F15 ] }; // should be keycode 120
+};
+
+partial modifier_keys
+xkb_symbols "laptop" {
+
+    include "macintosh_vndr/apple(extended)"
+
+    // The real numlock key on the iBook (shared with F5) works internally to
+    // the keyboard. It illuminates the Num_Lock led and locks the fn-key to
+    // type only the keypad keys on the letter keys (U=4, I=5, O=6, P=*, etc.).
+    // The key in the Num_lock position is engraved with Clear.
+    override key <NMLK> { [ Clear ] };
+    // The key engraved Delete sends BKSP. To get Delete, use Shift-Delete
+    override key <BKSP> { [ BackSpace, Delete ] };
+    // These keyboards only generate a <RALT> when pressing fn+Alt. This makes
+    // it impossible to get to the third shift level on keys that are on
+    // the fn-keypad, so use the Enter key (right of <SPC>) for Mode_switch,
+    // and use fn+Enter (Apple's code for Menu) for KP_Enter.
+    replace key <KPEN> { [ ISO_Level3_Shift ] };
+    modifier_map Mod5  { ISO_Level3_Shift };	
+    // Linux kernel bug with Menu on macs means this doesn't work yet
+//    replace key <MENU> { [ KP_Enter ] }; // should be keycode 117
+};
+
+partial modifier_keys
+xkb_symbols "laptop_bad_switch" {
+    // Kept for backward compatibility
+    include "macintosh_vndr/apple(laptop)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/ch b/xorg-server/xkbdata.src/symbols/macintosh_vndr/ch
new file mode 100644
index 000000000..4932eb89a
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/ch
@@ -0,0 +1,102 @@
+// $XKeyboardConfig$
+//
+// 03.01.2003
+// Andreas Tobler <a.tobler@schweiz.ch>
+// modified for Swiss German Apple Extended Keyboard II
+
+partial alphanumeric_keys
+xkb_symbols "extended" {
+    
+    name[Group1]= "Switzerland - German, Mac";
+
+    // Alphanumeric section
+
+    key <AE01> { [	1,	plus, 	plusminus,	infinity		]	};
+    key <AE02> { [	2,	quotedbl, leftdoublequotemark, rightdoublequotemark 	]	};
+    key <AE03> { [	3,	asterisk, 	numbersign,	leftcaret	]	};
+					// not displayed here
+    key <AE04> { [	4,	ccedilla, 	Ccedilla,	slash		]	};
+    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, 	NoSymbol		]	};
+    key <AE12> { [	dead_circumflex,dead_grave, 	dead_acute,	asciicircum		]	};
+    key <AD01> { [	q,	Q, 	oe,		OE			]	};
+    key <AD02> { [	w,	W, 	Greek_SIGMA,	Aacute			]	};
+    key <AD03> { [ 	e,	E, 	EuroSign,	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,	idotless		]	};
+    key <AD09> { [ 	o,	O, 	oslash,		Ooblique		]	};
+    key <AD10> { [ 	p,	P, 	Greek_pi,	Greek_PI		]	};
+    key <AD11> { [	udiaeresis,	egrave, 	section,	ydiaeresis		]	};
+    key <AD12> { [	dead_diaeresis,	exclam, 	grave,		apostrophe		]	};
+    key <AC01> { [ 	a,	A, 	aring,		Aring			]	};
+    key <AC02> { [ 	s,	S, 	ssharp, 	NoSymbol		]	}; 
+					// ligature fl
+    key <AC03> { [ 	d,	D, 	Greek_sigma,	NoSymbol		]	};
+			// partialderivative is not available here att
+    key <AC04> { [ 	f,	F, 	function,	doubledagger		]	};
+    key <AC05> { [ 	g,	G, 	at,		comma			]	};
+    key <AC06> { [ 	h,	H, 	ordfeminine,	periodcentered		]	};
+    key <AC07> { [ 	j,	J,  	masculine,	eth	 		]	};
+    key <AC08> { [ 	k,	K, 	Greek_DELTA,	macron			]	};
+    key <AC09> { [ 	l,	L, 	notsign,	caret			]	};
+    key <AC10> { [	odiaeresis,	eacute, 	cent,		breve	]	};
+    key <AC11> { [	adiaeresis,	agrave, 	ae,		AE	]	};
+    key <AB01> { [	y,	Y, 	yen,		Ydiaeresis		]	};
+    key <AB02> { [ 	x,	X, 	similarequal,	trademark		]	};
+    key <AB03> { [ 	c,	C, 	copyright,	NoSymbol		]	};
+    key <AB04> { [ 	v,	V, 	radical,	diamond			]	};
+    key <AB05> { [ 	b,	B, 	integral,	NoSymbol		]	};  
+    key <AB06> { [ 	n,	N, 	dead_tilde, 	enopencircbullet	]       };
+					// to be fixed att
+    key <AB07> { [ 	m,	M, 	mu,		dead_abovering		]       };
+					// not sure att
+    key <AB08> { [	comma,	semicolon, 	guillemotleft,	guillemotright	]	};
+    key <AB09> { [	period,	colon, 	ellipsis,	division		]	};
+    key <AB10> { [	minus,	underscore, 	hyphen,		emdash		]	};
+    key <TLDE> { [	section,	degree,   	NoSymbol, 	NoSymbol		]	};
+			// ligature fi	// per mille
+    key <SPCE> { [	space, 	nobreakspace,	nobreakspace		]	};
+    key <LSGT> { [	less,	greater, 	lessthanequal,	greaterthanequal	]  	};
+    key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet	]	};
+
+    include "kpdl(comma)"
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "de" {
+    include "macintosh_vndr/ch(extended)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "fr" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Swiss/French keybaord
+
+    include "macintosh_vndr/ch(extended)"
+    name[Group1]= "Switzerland - French, Mac";
+
+    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_vndr/ch(fr)" // for consistent naming
+};
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/de b/xorg-server/xkbdata.src/symbols/macintosh_vndr/de
new file mode 100644
index 000000000..92c54916c
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/de
@@ -0,0 +1,97 @@
+// $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
+
+    include "latin"
+    name[Group1]= "Germany - Mac";
+
+    // Alphanumeric section
+    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			]	};
+
+    include "kpdl(comma)"
+    include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys 
+xkb_symbols "Sundeadkeys" {
+    // modify the default German layout to use Sun dead keys
+    include "macintosh_vndr/de(basic)"
+    name[Group1]= "Germany - Mac, Sun dead keys";
+
+    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_vndr/de(Sundeadkeys)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    // modify the default German layout to not have any dead keys
+    include "macintosh_vndr/de(basic)"
+    name[Group1]= "Germany - Mac, eliminate dead keys";
+
+    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/xorg-server/xkbdata.src/symbols/macintosh_vndr/dk b/xorg-server/xkbdata.src/symbols/macintosh_vndr/dk
new file mode 100644
index 000000000..56ef85bf6
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/dk
@@ -0,0 +1,79 @@
+// $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.
+
+    include "latin"
+    name[Group1]= "Denmark - Mac";
+
+    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,        EuroSign,           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,         EuroSign,            cent      ]};
+    key <AD04> {        [        r,               R,       registered,        NoSymbol      ]};
+    key <AD05> {        [        t,               T,            thorn,           THORN      ]};
+    key <AD08> {        [        i,               I,         NoSymbol,        NoSymbol      ]};
+    key <AD09> {        [        o,               O,               oe,              OE      ]};
+    key	<AC10> {	[	ae,               AE	]};
+    key <AE11> {	[     plus,        question,        plusminus,    questiondown	]};
+    key <AC11> {	[   oslash,        Ooblique 	]};
+    key <BKSL> {	[ apostrophe,        asterisk, dead_doubleacute,        multiply	]};
+    key <AD11> {	[    aring,           Aring 	]};
+    key <AE12> {   	[ dead_acute,      dead_grave,              bar,       brokenbar	]};
+    key <AD12> {   	[ dead_diaeresis, dead_circumflex,       dead_tilde,      dead_caron      ]};
+
+    // End alphanumeric section
+
+    include "eurosign(e)"
+    include "level3(ralt_switch)"
+};
+
+
+partial default alphanumeric_keys 
+xkb_symbols "full" {
+    include "iso9995-3(full)"
+    include "dk(basic)"
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    include "macintosh_vndr/dk(basic)"
+    name[Group1]= "Denmark - Mac, eliminate dead keys";
+
+    key <AE12> {	[           acute,           grave,              bar,          ogonek	]	};
+    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "macbookpro" {
+
+    include "level3(win_switch)"
+    include "macintosh_vndr/dk(basic)"
+
+    name[Group1]= "Denmark - Mac, MacBook Pro";
+
+    key <BKSL>  { [apostrophe, asterisk,        at,        at ] };
+    key <TLDE>  { [    dollar,  section,    dollar,    dollar ] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/es b/xorg-server/xkbdata.src/symbols/macintosh_vndr/es
new file mode 100644
index 000000000..61f12498f
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/es
@@ -0,0 +1,6 @@
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+    include "es"
+    name[Group1]= "Spain - Mac";
+};
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/fi b/xorg-server/xkbdata.src/symbols/macintosh_vndr/fi
new file mode 100644
index 000000000..6cb5fa314
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/fi
@@ -0,0 +1,18 @@
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple Swedish(Finland) keybaord
+
+    include "macintosh_vndr/se(basic)" // for consistent naming
+    name[Group1]= "Finland - Mac";
+
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    include "macintosh_vndr/se(basic)"	// for consistent naming
+    name[Group1]= "Finland - Mac, eliminate dead keys";
+};
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/fr b/xorg-server/xkbdata.src/symbols/macintosh_vndr/fr
new file mode 100644
index 000000000..9a8f8de23
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/fr
@@ -0,0 +1,110 @@
+// Marc.Shapiro@inria.fr 19-sep-1998
+// modifications : Etienne Herlent <eherlent@linux-france.org> june 2000
+// adapted to the new input layer :
+//        Martin Costabel <costabel@wanadoo.fr> 3-jan-2001
+//////////////////////////////////////////////////////////////////
+// Petites Modification le juillet 2005 par Bin Zhang <bb.zhang@free.fr> : 
+// 1) La ligne 83 : remplacer les deux "VoidSymbol" par oe et OE 
+// 2) La ligne 89 : remplacer "VoidSymbol" par "EuroSign"
+// ( 1) et 2) fonctionnent sous UTF-8, mais pas sous iso-8859-1. )
+// 3) Remplacer la ligne 148 par la ligne 149 pour que la touche Alt_L
+// (la touche Apple-Pomme) fonctionne correctement sous Xorg, une idée
+// motivée par http://www.linux-france.org/macintosh/clavier_gentoo.html
+//////////////////////////////////////////////////////////////////
+// This map is an almost-complete mapping of the standard French
+// MacIntosh keyboard under Xwindows.  I tried to remain as faithful
+// as possible to the Mac meaning of each key.	I did this entirely by
+// hand and by intuition, relying on the Clavier (Keyboard?) Desktop
+// Accessory for the Mac meaning of keys, and on reading keysymdef.h
+// to intuit the corresponding X names.	 Lacking proper documentation,
+// I may have made some mistakes.
+
+// Entries marked CHECK are particularly uncertain
+
+// Entries marked MISSING mark Mac characters for which I was unable
+// to find a corresponding keysym.  (Some for sure don't: e.g. the
+// Apple mark and the oe/OE character; others I may have simply not
+// found.)
+
+default
+xkb_symbols "extended" {
+
+    name[Group1]= "France - Mac";
+
+    key <ESC>  {	[ Escape			]	};
+
+    // Alphanumeric section
+    key <TLDE> {	[	   at,	  numbersign,	periodcentered,  	Ydiaeresis	]	};
+    key <ENTR> {        [    KP_Enter                   ]       };
+    key <AE01> {	[   ampersand,	  1,	  	VoidSymbol,	  	dead_acute	]	}; // MISSING: Apple
+    key <AE02> {	[      eacute,	  2,		ediaeresis,	  	Eacute	]	};
+    key <AE03> {	[    quotedbl,	  3,		leftdoublequotemark, 	rightdoublequotemark	] 	};
+    key <AE04> {	[  apostrophe,	  4,		leftsinglequotemark, 	rightsinglequotemark	] 	};
+    key <AE05> {	[   parenleft,	  5,		braceleft,	  	bracketleft	]	};
+    key <AE06> {	[     section,	  6,		paragraph,	  	aring		]	};
+    key <AE07> {	[      egrave,	  7,		guillemotleft,	  	guillemotright]	};
+    key <AE08> {	[      exclam,	  8,		exclamdown,	  	Ucircumflex	]	};
+    key <AE09> {	[    ccedilla,	  9,		Ccedilla,	  	Aacute	]	};
+    key <AE10> {	[      agrave,	  0,		oslash,	  		Oslash	]	};
+    key <AE11> {	[  parenright,	  degree,	braceright,	  	bracketright	]	};
+    key <AE12> {	[	minus,	  underscore,	emdash,	  		endash	]	};
+    key <BKSP> {	[   BackSpace,    VoidSymbol,	Delete,	  		VoidSymbol	]	};
+
+    key	 <TAB> {	[	  Tab,	ISO_Left_Tab	]	};
+    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,		dagger,			trademark	]	};
+    key <AD06> {	[	    y,	Y,		Uacute,  		Ydiaeresis	]	};
+    key <AD07> {	[	    u,	U,		masculine,		ordfeminine	]	};
+    key <AD08> {	[	    i,	I,		icircumflex,		idiaeresis	]	};
+    key <AD09> {	[	    o,	O,		oe,			OE		]	};
+    key <AD10> {	[	    p,	P,		Greek_pi,  		Greek_PI	]	};
+    key <AD11> {	[dead_circumflex,dead_diaeresis,ocircumflex, 		Ocircumflex	]	};
+    key <AD12> {	[      dollar,	asterisk,	EuroSign,  		yen   	        ]	};
+    key <CAPS> {	[	Caps_Lock		]	};
+    key <AC01> {	[	  q,	Q,		doubledagger,		Greek_OMEGA	]	};
+    key <AC02> {	[	  s,	S,		Ograve,			Greek_SIGMA	]	};
+    key <AC03> {	[         d,	D,		Greek_delta,		Greek_DELTA	]	};
+    key <AC04> {	[	  f,	F,		VoidSymbol,		periodcentered	]	};
+    key <AC05> {	[	  g,	G,		VoidSymbol,		VoidSymbol	]	}; // MISSING: ligature fi,fl
+    key <AC06> {	[	  h,	H,		Igrave,			Icircumflex	]	};
+    key <AC07> {	[	  j,	J,		Idiaeresis,		Iacute		]	};
+    key <AC08> {	[	  k,	K,		Egrave,			Ediaeresis	]	};
+    key <AC09> {	[	  l,	L,		notsign,		bar		]	};
+    key <AC10> {	[	  m,	M,		mu,			Oacute		]	};
+    key <AC11> {	[    ugrave,	percent,	Ugrave,			0x1002030	]	};
+    key <BKSL> {	[ dead_grave,	sterling,	at,			numbersign	]	};
+    key <RTRN> {	[    Return			]	};
+
+    key <LSGT> {	[	 less,	  greater,	lessthanequal,		greaterthanequal	]	};
+    key <AB01> {	[	  w,	W,		guilsinglleft,		guilsinglright	]	}; // MISSING: half-guillemot (single angle bracket)
+    key <AB02> {	[	  x,	X,		VoidSymbol,		VoidSymbol	]	}; // CHECK: similarequal; MISSING: extra-slanted slash
+    key <AB03> {	[	  c,	C,		copyright,		cent		]	};
+    key <AB04> {	[	  v,	V,		diamond,		radical		]	}; // CHECK diamond
+    key <AB05> {	[	  b,	B,		ssharp,    		integral	]	};
+    key <AB06> {	[	  n,	N,		dead_tilde,		asciitilde	]	};
+    key <AB07> {	[     comma,	question,	infinity,		questiondown	]	};
+    key <AB08> {	[ semicolon,	period,		ellipsis,		periodcentered	]	};
+    key <AB09> {	[     colon,	slash,		division,		backslash	]	};
+    key <AB10> {	[     equal,	plus,		notequal,		plusminus	]	};
+
+    key <SPCE> {	[     space,	space,		nobreakspace,		nobreakspace	]	};
+    // End alphanumeric section
+
+    include "level3(ralt_switch)"
+};
+
+
+
+xkb_symbols "nodeadkeys" {
+include "macintosh_vndr/fr(extended)"
+    name[Group1]= "France - Mac, eliminate dead keys";
+    
+    key <AE01> {	[   ampersand,	  1,	  	VoidSymbol,	  	acute	]	}; // MISSING: Apple
+    key <AD11> {	[asciicircum,diaeresis,ocircumflex, 		Ocircumflex	]	};
+    key <BKSL> {	[ grave,	sterling,	at,			numbersign	]	};
+
+    key <AB06> {	[	  n,	N,		asciitilde,		dead_tilde	]	};
+};
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/gb b/xorg-server/xkbdata.src/symbols/macintosh_vndr/gb
new file mode 100644
index 000000000..8eb82eb70
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/gb
@@ -0,0 +1,21 @@
+// $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
+
+    include "latin"
+
+    name[Group1]= "United Kingdom - Mac";
+
+    key <AE02> {	[               2,              at,         EuroSign	]	};
+    key <AE03> {	[               3,        sterling,       numbersign	]	};
+
+    // End alphanumeric section
+    
+    include "level3(ralt_switch)"
+};
+
+
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/is b/xorg-server/xkbdata.src/symbols/macintosh_vndr/is
new file mode 100644
index 000000000..000bcdb0b
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/is
@@ -0,0 +1,128 @@
+// $XKeyboardConfig$
+//
+// This file describes the differences between a Macintosh US Extended
+// keymap and an Icelandic keyboard layout in the style of Mac OS and Mac OS X
+//
+// Copyright (C) 2004, 2006 Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+//
+// 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 a copyright holder shall
+// not be used in advertising or otherwise to promote the sale, use or
+// other dealings in this Software without prior written authorization of
+// the copyright holder.
+//
+// = HISTORY
+// * 2004-09-28:
+//   Initial cleanroom writing of the keymap, I just booted Mac OS X, opened
+//   TextEdit.app and wrote down what the value produced by each key was when I
+//   pressed it, a for a, A for shift + a, å for lalt + a etc and made the
+//   keymap from that information
+//
+// * 2006-01-14:
+//   Revised the comments in the file
+//
+// = NOTES
+// * 20 characters in this keymap have no named character defined in
+//   include/keysymdef.h and as a result their Unicode code points in
+//   hexadecimal are listed here, these can be generated with the following
+//   perl command:
+//     $ perl -CA -e 'printf "U%x\n", ord shift' Æ
+//   and converted back like:
+//     $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6
+// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X
+//   keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it
+//   has no assigned code point in Unicode, the code point Apple uses for it is
+//   U+F8FF (63743) which is in the BMP's Private Use Area (U+E000–U+F8FF)
+// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it
+//   should work on other Apple laptop models which use the same keyboard
+//   layout. It will probably work on standard sized keyboards with little or
+//   no modification but it might not support them fully, please report if
+//   you're able to get it running with such a keyboard
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    name[Group1]= "Iceland - Mac";
+
+	//-- Row 5 (E) --//
+	key <TLDE> {	[	sterling,	section, 	UF8FF,		apostrophe	]	};
+	key <AE01> {	[	1,		exclam, 	exclamdown,	VoidSymbol	]	};
+	key <AE02> {	[	2,		quotedbl, 	at,		VoidSymbol	]	};
+	key <AE03> {	[	3,		numbersign, 	U2122,		sterling	]	};
+	key <AE04> {	[	4,		dollar, 	U00A2,		EuroSign	]	};
+	key <AE05> {	[	5,		percent, 	U2030,		infinity	]	};
+	key <AE06> {	[	6,		ampersand, 	asciicircum,	U2044		]	};
+	key <AE07> {	[	7,		slash, 	backslash,	U00F7		]	};
+	key <AE08> {	[	8,		parenleft, 	bracketleft,	braceleft	]	};
+	key <AE09> {	[	9,		parenright, 	bracketright,	braceright	]	};
+	key <AE10> {	[	0,		equal, 	U2260,		U2248		]	};
+	key <AE11> {	[	odiaeresis,	Odiaeresis, 	oslash,		Ooblique	]	};
+	key <AE12> {	[	minus,		underscore, 	endash,		emdash		]	};
+
+	
+	//-- Row 4 (D) --//
+	key <AD01> {	[	q,		Q, 	paragraph,	VoidSymbol	]	};
+	key <AD02> {	[	w,		W, 	U2211,		VoidSymbol	]	};
+	key <AD03> {	[	e,		E, 	dead_grave,	VoidSymbol	]	};
+	key <AD04> {	[	r,		R, 	registered,	VoidSymbol	]	};
+	key <AD05> {	[	t,		T, 	degree,		VoidSymbol	]	};
+	key <AD06> {	[	y,		Y, 	yen,		VoidSymbol	]	};
+	key <AD07> {	[	u,		U, 	dead_diaeresis,	VoidSymbol	]	};
+	key <AD08> {	[	i,		I, 	U0131,		U00AA		]	};
+	key <AD09> {	[	o,		O, 	dead_circumflex,U00BA		]	};
+	key <AD10> {	[	p,		P, 	Greek_pi,	Greek_PI	]	};
+	key <AD11> {	[	eth,		Eth, 	U201e,		U201c		]	};
+	key <AD12> {	[	apostrophe,	question, 	questiondown,	U00B7		]	};
+	
+	
+	//-- Row 3 (C) --//
+	key <AC01> {	[	a,		A, 	aring,		Aring		]	};
+	key <AC02> {	[	s,		S, 	ssharp,		abovedot	]	};
+	key <AC03> {	[	d,		D, 	U2202,		U2DA		]	};
+	key <AC04> {	[	f,		F, 	U192,		macron		]	};
+	key <AC05> {	[	g,		G, 	copyright,	breve		]	};
+	key <AC06> {	[	h,		H, 	bar,		VoidSymbol	]	};
+	key <AC07> {	[	j,		J, 	U2206,		U2dd		]	};
+	key <AC08> {	[	k,		K, 	U00AC,		VoidSymbol	]	};
+	key <AC09> {	[	l,		L, 	U2026,		caron		]	};
+	key <AC10> {	[	ae,		AE, 	oe,		OE		]	};
+	key <AC11> {	[	dead_acute,	dead_diaeresis, 	U201A,		U2018		]	};
+	key <BKSL> {	[	plus,		asterisk, 	U2022,		plusminus	]	};
+	
+	
+	//-- Row 2  (B) --//
+	key <LSGT> {	[	less,		greater, 	section,	UF8FF		]	};
+	key <AB01> {	[	z,		Z, 	U3A9,		VoidSymbol	]	};
+	key <AB02> {	[	x,		X, 	asciitilde,	VoidSymbol	]	};
+	key <AB03> {	[	c,		C, 	ccedilla,	Ccedilla	]	};
+	key <AB04> {	[	v,		V, 	U221A,		U25CA		]	};
+	key <AB05> {	[	b,		B, 	U222B,		VoidSymbol	]	};
+	key <AB06> {	[	n,		N, 	dead_tilde,	VoidSymbol	]	};
+	key <AB07> {	[	m,		M, 	U00B5,		VoidSymbol	]	};
+	key <AB08> {	[	comma,		semicolon, 	lessthanequal,	guillemotleft	]	};
+	key <AB09> {	[	period,		colon, 	greaterthanequal,guillemotright	]	};
+	key <AB10> {	[	thorn,		Thorn, 	U2019,		U201d		]	};
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+    include	"macintosh_vndr/is(basic)" // for consistent naming
+    name[Group1]= "Iceland - Mac, eliminate dead keys";
+};
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/it b/xorg-server/xkbdata.src/symbols/macintosh_vndr/it
new file mode 100644
index 000000000..44435201b
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/it
@@ -0,0 +1,64 @@
+
+xkb_symbols "extended" {
+
+    name[Group1]= "Italy - Mac";
+
+    // 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,     EuroSign		]	};
+    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
+
+    include "kpdl(dot)"
+    include "level3(ralt_switch)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/latam b/xorg-server/xkbdata.src/symbols/macintosh_vndr/latam
new file mode 100644
index 000000000..085de0e4b
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/latam
@@ -0,0 +1,38 @@
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple Spanish keybaord
+
+    include "latin"
+    name[Group1]= "Latin American - Mac";
+
+    key <TLDE> {	[     bracketleft,    bracketright,        braceleft,      braceright	]	};
+    key <LSGT> {	[            less,         greater,      bracketleft,       braceleft	]	};
+    key <AE01> {	[               1,      exclamdown 	]	};
+    key <AE02> {	[               2,          exclam,               at,       oneeighth	]	};
+    key <AE03> {	[               3,      numbersign,    guillemotleft,  guillemotright	]	};
+    key <AE04> {	[               4,          dollar,              yen,     Icircumflex	]	};
+    key <AE05> {	[               5,         percent	]	};
+    key <AE06> {	[               6,           slash,        backslash,      Idiaeresis	]	};
+    key <AE07> {	[               7,       ampersand,              bar,          Iacute	]	};
+    key <AE08> {	[               8,        asterisk,           degree	]	};
+    key <AE09> {	[               9,       parenleft,         sterling,     Ocircumflex	]	};
+    key <AE10> {	[               0,      parenright     	]	};
+    key <AE11> {	[           minus,      underscore	]	};
+    key <AE12> {	[           equal,            plus,        plusminus	]	};
+    key <AD11> {	[      dead_grave,          degree 	]	};
+    key <AD12> {	[      dead_acute,  dead_diaeresis,              bar	]	};
+
+    key <AB08> {	[           comma,    questiondown   	]	};
+    key <AB09> {	[          period,        question     	]	};
+    key <AB10> {	[        ccedilla,        Ccedilla     	]	};
+    key	<AC10> {	[	   ntilde,          Ntilde,       asciitilde, dead_doubleacute	]	};
+    key <AC11> {	[       semicolon,    	     colon 	]	};
+    key <BKSL> {	[      apostrophe,        quotedbl	]	};
+
+    // End alphanumeric section
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/nl b/xorg-server/xkbdata.src/symbols/macintosh_vndr/nl
new file mode 100644
index 000000000..b60690e4d
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/nl
@@ -0,0 +1,17 @@
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple netherland keybaord
+
+    include "latin"
+
+    name[Group1]= "Netherlands - Mac";
+
+    include "level3(ralt_switch)"
+
+// do just nothing
+
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/no b/xorg-server/xkbdata.src/symbols/macintosh_vndr/no
new file mode 100644
index 000000000..d8bf0d650
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/no
@@ -0,0 +1,52 @@
+// $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
+
+    include "latin"
+
+    name[Group1]= "Norway - Mac";
+
+    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
+
+    include "eurosign(e)"
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic Norwegian layout to eliminate dead keys
+    include "macintosh_vndr/no(basic)"
+    name[Group1]= "Norway - Mac, eliminate dead keys";
+
+    key <AE12> {	[           grave,           acute, 	    acute,          ogonek 	]	};
+    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,          macron     	]      	};
+
+};
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/pt b/xorg-server/xkbdata.src/symbols/macintosh_vndr/pt
new file mode 100644
index 000000000..8f1785742
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/pt
@@ -0,0 +1,63 @@
+// $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
+
+    include "latin"
+
+    name[Group1]= "Portugal - Mac";
+
+    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
+
+    include "eurosign(e)"
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "Sundeadkeys" {
+    include "macintosh_vndr/pt(basic)" // for consistent naming
+    name[Group1]= "Portugal - Mac, Sun dead keys";
+    
+    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_vndr/pt(Sundeadkeys)" // for consistent naming
+};
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    include "macintosh_vndr/pt(basic)" // for consistent naming
+    name[Group1]= "Portugal - Mac, eliminate dead keys";
+
+    key <AE12> {	[	     plus,        asterisk, 	 quotedbl,        quotedbl      ]	};
+    key <AC11> {	[      asciitilde,     asciicircum	]	};
+    key <AD12> {	[	    acute,           grave 	]	};
+};
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/se b/xorg-server/xkbdata.src/symbols/macintosh_vndr/se
new file mode 100644
index 000000000..d5d8c1c4c
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/se
@@ -0,0 +1,46 @@
+// $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
+
+    include "latin"
+
+    name[Group1]= "Sweden - Mac";
+
+    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      ]       };
+
+    include "kpdl(comma)"
+    include "eurosign(e)"
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    include "macintosh_vndr/se(basic)" // for consistent naming
+    name[Group1]= "Sweden - Mac, eliminate dead keys";
+};
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/us b/xorg-server/xkbdata.src/symbols/macintosh_vndr/us
new file mode 100644
index 000000000..fed3253cf
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/us
@@ -0,0 +1,151 @@
+// $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]= "USA";
+    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 <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 <AC01> {	[	  a,	A 		]	};
+    key <AC02> {	[	  s,	S		]	};
+    key <AC03> {	[	  d,	D		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G		]	};
+    key <AC06> {	[	  h,	H		]	};
+    key <AC07> {	[	  j,	J		]	};
+    key <AC08> {	[	  k,	K		]	};
+    key <AC09> {	[	  l,	L		]	};
+    key <AC10> {	[ semicolon,	colon		]	};
+    key <AC11> {	[ quoteright,	quotedbl	]	};
+
+    key <AB01> {	[	  z,	Z 		]	};
+    key <AB02> {	[	  x,	X		]	};
+    key <AB03> {	[	  c,	C		]	};
+    key <AB04> {	[	  v,	V		]	};
+    key <AB05> {	[	  b,	B		]	};
+    key <AB06> {	[	  n,	N		]	};
+    key <AB07> {	[	  m,	M		]	};
+    key <AB08> {	[     comma,	less		]	};
+    key <AB09> {	[    period,	greater		]	};
+    key <AB10> {	[     slash,	question	]	};
+
+    key <SPCE> {	[  space			]	};
+    // End alphanumeric section
+
+
+    include "eurosign(e)"
+    include "keypad"
+
+    key <KPEQ> {	[  equal				]	};
+};
+
+hidden
+xkb_symbols "oldmac" {
+
+    include "macintosh_vndr/us(extended)"
+
+    // 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
+
+    key <BKSP> {	[ BackSpace			]	};
+    key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
+    key <RTRN> {	[ Return	]	};
+    key <CAPS> {	[ Caps_Lock	]	};
+    key <NMLK> {	[ Num_Lock, Pointer_EnableKeys		]	};
+
+    // Begin "Modifier" section
+    key <LFSH> {	[  Shift_L	]	};
+    key <RTSH> {	[  Shift_R	]	};
+    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, 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> };
+    // end modifier mappings
+
+};
diff --git a/xorg-server/xkbdata.src/symbols/mao b/xorg-server/xkbdata.src/symbols/mao
new file mode 100644
index 000000000..30c039a0c
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/mao
@@ -0,0 +1,23 @@
+// $XKeyboardConfig$
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    // Adds the macrons needed for the Maori language to
+    // a simple us keyboard layout.
+
+    include "latin"
+
+    name[Group1]="Maori";
+
+    key <AC01>  { [ a,   A,  amacron, Amacron ] };
+    key <AD03>  { [ e,   E,  emacron, Emacron ] };
+    key <AD08>  { [ i,   I,  imacron, Imacron ] };
+
+    key <AD09>  { [ o,   O,  omacron, Omacron ] };
+    key <AD07>  { [ u,   U,  umacron, Umacron ] };
+
+    key <RALT>  { type[Group1]="TWO_LEVEL",
+                  [ ISO_Level3_Shift, Multi_key ]   };
+    modifier_map Mod5   { <RALT> };
+};
diff --git a/xorg-server/xkbdata.src/symbols/me b/xorg-server/xkbdata.src/symbols/me
new file mode 100644
index 000000000..a4b407376
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/me
@@ -0,0 +1,53 @@
+// Montenegro keyboard mapping
+//
+// Initially, a copy of Serbian variants
+//
+// $XKeyboardConfig$
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+  include "rs(latin)"
+  name[Group1]= "Montenegro";
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "cyrillic" {
+  include "rs(basic)"
+  name[Group1]= "Montenegro - Cyrillic";
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "cyrillicyz" {
+  include "rs(yz)"
+  name[Group1]= "Montenegro - Cyrillic, Z and ZHE swapped";
+};
+
+partial alphanumeric_keys
+xkb_symbols "latinunicode" {
+  include "rs(latinunicode)"
+  name[Group1]= "Montenegro - Latin unicode";
+};
+
+partial alphanumeric_keys
+xkb_symbols "latinyz" {
+  include "rs(latinyz)"
+  name[Group1]= "Montenegro - Latin qwerty";
+};
+
+partial alphanumeric_keys
+xkb_symbols "latinunicodeyz" {
+  include "rs(latinunicodeyz)"
+  name[Group1]= "Montenegro - Latin unicode qwerty";
+};
+
+xkb_symbols "cyrillicalternatequotes" {
+  include "rs(alternatequotes)"
+  name[Group1]= "Montenegro - Cyrillic with guillemets";
+};
+
+xkb_symbols "latinalternatequotes" {
+  include "rs(latinalternatequotes)"
+  name[Group1]= "Montenegro - Latin with guillemets";
+};
diff --git a/xorg-server/xkbdata.src/symbols/mk b/xorg-server/xkbdata.src/symbols/mk
new file mode 100644
index 000000000..c69439c5d
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/mk
@@ -0,0 +1,67 @@
+
+// based on keyboard map:
+// Author: Damjan Georgievski <penguinista AT mail.net.mk>
+// Revision: 1.5
+// $XKeyboardConfig$
+
+partial default alphanumeric_keys
+xkb_symbols "basic" { 
+    name[Group1]= "Macedonia";
+
+    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> { [      dead_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	]	};
+ 
+    include "kpdl(comma)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+    include "mk(basic)"
+    name[Group1]= "Macedonia - Eliminate dead keys";
+    key <TLDE> { [           grave,      asciitilde ]   };
+};
diff --git a/xorg-server/xkbdata.src/symbols/mm b/xorg-server/xkbdata.src/symbols/mm
new file mode 100644
index 000000000..2f5319c42
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/mm
@@ -0,0 +1,65 @@
+// $XKeyboardConfig$
+
+// based on a keyboard map from an 'xkb/symbols/mm' file
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+      name[Group1]= "Myanmar";
+
+// 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/xorg-server/xkbdata.src/symbols/mn b/xorg-server/xkbdata.src/symbols/mn
new file mode 100644
index 000000000..08109b781
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/mn
@@ -0,0 +1,83 @@
+// $XKeyboardConfig$
+
+// based on:
+// Mongolian standard keyboard
+// Author Sanlig Badral <badral@chinggis.com>
+// 2002/12/7 Version 1.0
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+  name[Group1]= "Mongolia";
+
+  key <TLDE> { [ equal,       	   plus,  		degree          ] };
+  key <AE01> { [ 1,                numerosign,        	multiply        ] };
+  key <AE02> { [ 2,                minus,              	division        ] };
+  key <AE03> { [ 3,                quotedbl,        	plusminus       ] };
+  key <AE04> { [ 4,                U20ae,  		notsign         ] }; // Tugrik sign
+  key <AE05> { [ 5,                colon,		NoSymbol       	] };
+  key <AE06> { [ 6,                period,              notequal        ] };
+  key <AE07> { [ 7,                underscore,          ampersand    	] };
+  key <AE08> { [ 8,                comma,            	asterisk        ] };
+  key <AE09> { [ 9,                percent,          	bracketleft     ] };
+  key <AE10> { [ 0,                question,       	bracketright   	] };
+  key <AE11> { [ Cyrillic_ie,      Cyrillic_IE,        	X               ] };
+  key <AE12> { [ Cyrillic_shcha,   Cyrillic_SHCHA,   	L       	] };
+
+  key <AD01> { [ Cyrillic_ef,       Cyrillic_EF,       	apostrophe      ] };
+  key <AD02> { [ Cyrillic_tse,      Cyrillic_TSE,       grave           ] };
+  key <AD03> { [ Cyrillic_u,        Cyrillic_U,        	EuroSign        ] };
+  key <AD04> { [ Cyrillic_zhe,      Cyrillic_ZHE,      	registered      ] };
+  key <AD05> { [ Cyrillic_e,        Cyrillic_E,        	trademark       ] };
+  key <AD06> { [ Cyrillic_en,       Cyrillic_EN,       	yen             ] };
+  key <AD07> { [ Cyrillic_ghe,      Cyrillic_GHE,      	doublelowquotemark   ] };
+  key <AD08> { [ Cyrillic_sha,      Cyrillic_SHA,      	leftdoublequotemark  ] };
+  key <AD09> { [ Cyrillic_u_straight,Cyrillic_U_straight,rightdoublequotemark] };
+  key <AD10> { [ Cyrillic_ze,       Cyrillic_ZE,       	NoSymbol        ] };
+  key <AD11> { [ Cyrillic_ka,       Cyrillic_KA,      	braceleft       ] };
+  key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, 	braceright      ] };
+
+  key <AC01> { [ Cyrillic_shorti,   Cyrillic_SHORTI,   	mu              ] };
+  key <AC02> { [ Cyrillic_yeru,     Cyrillic_YERU,     	sterling        ] };
+  key <AC03> { [ Cyrillic_be,       Cyrillic_BE,       	dollar          ] };
+  key <AC04> { [ Cyrillic_o_bar,    Cyrillic_O_bar,     rightdoublequotemark ] };
+  key <AC05> { [ Cyrillic_a,        Cyrillic_A,        	Cyrillic_yeru   ] };
+  key <AC06> { [ Cyrillic_ha,       Cyrillic_HA,       	Cyrillic_YERU   ] };
+  key <AC07> { [ Cyrillic_er,       Cyrillic_ER,       	Cyrillic_e      ] };
+  key <AC08> { [ Cyrillic_o,        Cyrillic_O,       	Cyrillic_E      ] };
+  key <AC09> { [ Cyrillic_el,       Cyrillic_EL,       	numerosign      ] };
+  key <AC10> { [ Cyrillic_de,       Cyrillic_DE,       	section         ] };
+  key <AC11> { [ Cyrillic_pe,       Cyrillic_PE,       	ellipsis        ] };
+  key <BKSL> { [ exclam,            bar,     		bar             ] };
+
+  key <LSGT> { [ parenleft,         parenright,         NoSymbol        ] };
+  key <AB01> { [ Cyrillic_ya,       Cyrillic_YA,       	emdash          ] };
+  key <AB02> { [ Cyrillic_che,      Cyrillic_CHE,      	endash          ] };
+  key <AB03> { [ Cyrillic_io,       Cyrillic_IO,       	copyright       ] };
+  key <AB04> { [ Cyrillic_es,       Cyrillic_ES,       	NoSymbol        ] };
+  key <AB05> { [ Cyrillic_em,       Cyrillic_EM,       	NoSymbol        ] };
+  key <AB06> { [ Cyrillic_i,        Cyrillic_I,        	less            ] };
+  key <AB07> { [ Cyrillic_te,       Cyrillic_TE,       	greater         ] };
+  key <AB08> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, 	guillemotleft   ] };
+  key <AB09> { [ Cyrillic_ve,       Cyrillic_VE,       	guillemotright  ] };
+  key <AB10> { [ Cyrillic_yu,       Cyrillic_YU,       	backslash       ] };
+
+  // End alphanumeric section
+
+  key <SPCE> { [ space,             space,             	nobreakspace    ] };
+
+  include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+// Contact: Walter Bender <walter@laptop.org>
+
+  include "mn(basic)"
+
+  key <BKSL> { [ backslash,         bar,     		exclam          ] };
+
+  include "group(olpc)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/mt b/xorg-server/xkbdata.src/symbols/mt
new file mode 100644
index 000000000..5069aa4ed
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/mt
@@ -0,0 +1,80 @@
+// $XKeyboardConfig$
+
+// Maltese keyboard map (based on MSA Standard DMS100)
+// by Ramon Casha (ramon.casha@linux.org.mt)
+//
+// $XFree86: xc/programs/xkbcomp/symbols/mt,v 1.3 2002/12/13 04:18:04 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin"
+
+    name[Group1]="Malta";
+
+    // Copied from GB layout
+    key <AE02> { [         2,   quotedbl,  twosuperior,    oneeighth ] };
+    key <AE04> { [         4,     dollar,     EuroSign,   onequarter ] };
+    key <AC11> { [apostrophe,         at, dead_circumflex, dead_caron] };
+    key <BKSL> { [numbersign, asciitilde,   dead_grave,   dead_breve ] };
+
+    // 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)"
+};
+
+// Maltese keyboard map (based on MSA Standard DMS100, annex A)
+// by Ramon Casha (ramon.casha@linux.org.mt)
+
+partial alphanumeric_keys
+xkb_symbols "us" {
+
+    include "latin"
+
+    // Describes the differences between the mt
+    // keyboard and a US-based physical keyboard
+
+    name[Group1]="Malta - Maltese keyboard with US layout";
+
+    // The following four sets are the four additional letters, with the US
+    // equivalents
+    key <TLDE>	{ [ cabovedot,  Cabovedot,        grave,   asciitilde ]	};
+    key <AD11>	{ [ gabovedot,  Gabovedot,  bracketleft,    braceleft ]	};
+    key <AD12>	{ [   hstroke,    Hstroke, bracketright,   braceright ]	};
+    key <LSGT>	{ [ zabovedot,  Zabovedot,    backslash,          bar ]	};
+    key <BKSL>	{ [ zabovedot,  Zabovedot,    backslash,          bar ]	};
+
+    // Euro symbol
+    key <AE03>	{ [         3,   EuroSign,     numbersign             ]	};
+
+    // 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)"
+
+};
diff --git a/xorg-server/xkbdata.src/symbols/mv b/xorg-server/xkbdata.src/symbols/mv
new file mode 100644
index 000000000..22aa33986
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/mv
@@ -0,0 +1,82 @@
+// $XKeyboardConfig$
+//
+// NOTES:
+//
+//Keymap for thaana/divehi script (divehi language)
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    name[Group1]="Maldives";
+
+// The key <TLDE> should have the same values as US_en keyboard
+
+    key <TLDE> { [	quoteleft,        asciitilde   ]       };
+    key <AE01> { [               1,          exclam      ]       };
+    key <AE02> { [               2,              at      ]       };
+    key <AE03> { [               3,      numbersign      ]       };
+    key <AE04> { [               4,          dollar      ]       };
+    key <AE05> { [               5,         percent      ]       };
+    key <AE06> { [               6,     asciicircum      ]       };
+    key <AE07> { [               7,       ampersand      ]       };
+    key <AE08> { [               8,        asterisk      ]       };
+    key <AE09> { [               9,       parenleft      ]       };
+    key <AE10> { [               0,      parenright      ]       };
+    key <AE11> { [           minus,      underscore      ]       };
+    key <AE12> { [           equal,            plus      ]       };
+						
+    key <AD01> { [	0x10007B0,	0x10007A4      ]       };
+    key <AD02> { [	0x1000787,	0x10007A2      ]       };
+    key <AD03> { [	0x10007AC,     	0x10007AD      ]       };
+    key <AD04> { [	0x1000783,     	0x100079C      ]       };
+    key <AD05> { [	0x100078C,      0x1000793      ]       };
+    key <AD06> { [	0x1000794, 	0x10007A0      ]       };
+    key <AD07> { [	0x10007AA,      0x10007AB      ]       };
+    key <AD08> { [	0x10007A8,      0x10007A9      ]       };
+    key <AD09> { [	0x10007AE,      0x10007AF      ]       };
+    key <AD10> { [	0x1000795,    	division       ]       };
+// The following brackets are as they appear on the US_en keyboard. 
+//Please verify whether the names used are correct. I referred to keysymdef.h
+    key <AD11> {	[ 	bracketleft,	braceleft      ]	};
+    key <AD12> {	[ 	bracketright,	braceright     ]	};
+
+
+    key <AC01> { [	0x10007A6,       0x10007A7     ]       };
+    key <AC02> { [	0x1000790,       0x1000781     ]       };
+    key <AC03> { [	0x100078B,       0x1000791     ]       };
+    key <AC04> { [	0x100078A,       0x100fdf2     ]       };
+    key <AC05> { [	0x100078E,       0x10007A3     ]       };
+    key <AC06> { [	0x1000780,	 0x1000799     ]       };
+    key <AC07> { [	0x1000796,       0x100079B     ]       };
+    key <AC08> { [	0x1000786,       0x100079A     ]       };
+    key <AC09> { [	0x100078D,       0x1000785     ]       };
+    key <AC10> { [	semicolon,       colon         ]       };
+//I used singleloquotemark- if this is the wrong name, please replace with the name for the 
+//standard US_en keyboard format- its the same in the Thaana phonetic keyboard
+    key <AC11> { [      quoteright,        quotedbl      ]       };
+    key <BKSL> { [ 	backslash,	 bar           ]       };
+
+    key <LSGT> { [        bar,      	brokenbar	]       };
+    key <AB01> { [ 	0x1000792,    	0x10007A1       ]       };
+//multiply sign is the same as the algebraic symbol which looks like an italicized x. I am presuming its the same thing here. If not, please substitute an 'x' instead
+    key <AB02> { [	multiply,      	0x1000798	  ]       };
+    key <AB03> { [	0x1000797,     	0x100079D	  ]       };
+    key <AB04> { [	0x1000788,      0x10007A5	  ]       };
+    key <AB05> { [	0x1000784,      0x100079E         ]       };
+    key <AB06> { [	0x1000782, 	0x100078F 	  ]       };
+    key <AB07> { [	0x1000789,    	0x100079F         ]       };
+    key <AB08> { [	Arabic_comma,   less              ]       };
+    key <AB09> { [	period,         greater           ]       };
+    key <AB10> { [	slash, 		Arabic_question_mark ]       };
+
+    // End alphanumeric section
+    
+    // Begin modifier mappings 
+
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3   { Mode_switch };
+};
+
+// Any additional keys (if need be added) should appear and function exactly as it does on the US_en keyboard.
diff --git a/xorg-server/xkbdata.src/symbols/nbsp b/xorg-server/xkbdata.src/symbols/nbsp
new file mode 100644
index 000000000..10334708a
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/nbsp
@@ -0,0 +1,83 @@
+// $XKeyboardConfig$
+//
+
+// Let space provide nobreakspace for the desired level.
+
+partial
+xkb_symbols "none" {
+  key <SPCE> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1]= [ space ]
+  };
+};
+
+partial
+xkb_symbols "level2" {
+  key <SPCE> {
+    type[Group1]="TWO_LEVEL",
+    symbols[Group1]= [ space, nobreakspace ]
+  };
+};
+
+
+// level3 & level3ns provide no-breaking spaces starting from level3
+// This is good for typographers but experience shows many users accidently
+// type no-breaking spaces on the CLI (resulting in errors)
+// Used by fr(latin9)
+partial
+xkb_symbols "level3" {
+  key <SPCE> {
+    type[Group1]="FOUR_LEVEL",
+    symbols[Group1]= [ space, space, nobreakspace ]
+  };
+};
+
+// level3s kills fourth level
+// Used by ca(multix)
+partial
+xkb_symbols "level3s" {
+  key <SPCE> {
+    type[Group1]="FOUR_LEVEL",
+    symbols[Group1]= [ space, space, nobreakspace, NoSymbol ]
+  };
+};
+
+// level3n provides narrow no-breaking space in addition to the normal one
+partial
+xkb_symbols "level3n" {
+  key <SPCE> {
+    type[Group1]="FOUR_LEVEL",
+    symbols[Group1]= [ space, space, nobreakspace, 0x100202F ]
+  };
+};
+
+
+// for this reason pushing no-breaking spaces to level4 is the safe default nowadays
+partial
+xkb_symbols "level4" {
+  key <SPCE> {
+    type[Group1]="FOUR_LEVEL",
+    symbols[Group1]= [ space, space, space, nobreakspace ]
+  };
+};
+
+// level4n provides narrow no-breaking space in addition to the normal one
+partial
+xkb_symbols "level4n" {
+ key <SPCE> {
+   type[Group1]="EIGHT_LEVEL",
+   symbols[Group1]= [ space, space, space, nobreakspace, space, 0x100202F, NoSymbol, NoSymbol ]
+ };
+};
+
+// level4nl provides narrow no-breaking space in addition to the normal one
+// without forcing the use of level5 for mostly four-level layouts
+// Used by fr(oss), be(oss)…
+partial
+xkb_symbols "level4nl" {
+ key <SPCE> {
+   type[Group1]="LOCAL_EIGHT_LEVEL",
+   symbols[Group1]= [ space, space, space, nobreakspace, space, 0x100202F, NoSymbol, NoSymbol ]
+ };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.am
new file mode 100644
index 000000000..ff070065a
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.am
@@ -0,0 +1,4 @@
+symbolsdir = $(xkb_base)/symbols/nec_vndr
+
+dist_symbols_DATA = \
+jp
diff --git a/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in
new file mode 100644
index 000000000..30b4c87c1
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in
@@ -0,0 +1,367 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = symbols/nec_vndr
+DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(symbolsdir)"
+dist_symbolsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_symbols_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+symbolsdir = $(xkb_base)/symbols/nec_vndr
+dist_symbols_DATA = \
+jp
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/nec_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  symbols/nec_vndr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_symbolsDATA: $(dist_symbols_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_symbolsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  $(dist_symbolsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+
+uninstall-dist_symbolsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(symbolsdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_symbolsDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_symbolsDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_symbolsDATA uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/symbols/nec_vndr/jp b/xorg-server/xkbdata.src/symbols/nec_vndr/jp
new file mode 100644
index 000000000..0439677e4
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/ng b/xorg-server/xkbdata.src/symbols/ng
new file mode 100644
index 000000000..8c3567b3a
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/ng
@@ -0,0 +1,117 @@
+// $XKeyboardConfig$
+//
+
+partial default alphanumeric_keys  
+xkb_symbols "basic" {
+
+    include "us"
+
+    name[Group1]= "Nigeria";
+    key <AE04> { [          4, 0x010020A6,     dollar,       cent ] };
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "yoruba" {
+    include "ng(basic)"
+
+    name[Group1]= "Nigeria - Yoruba";
+
+    key <AD01> { [ 0x01001EB9, 0x01001EB8,          q,          Q ] };
+    key <AB02> { [ 0x01001ECD, 0x01001ECC,          x,          X ] }; 
+    key <AB04> { [ 0x01001E63, 0x01001E62,          v,          V ] }; 
+};
+
+partial alphanumeric_keys
+xkb_symbols "igbo" {
+    include "ng(basic)"
+
+    name[Group1]= "Nigeria - Igbo";
+
+    key <AD01> { [ 0x01001ECB, 0x01001ECA,          q,          Q ] };
+    key <AB02> { [ 0x01001E45, 0x01001E44,          x,          X ] }; 
+    key <AC10> { [ 0x01001EE5, 0x01001EE4,   semicolon,	    colon ] };
+    key <AD11> { [ 0x01001ECD, 0x01001ECC, bracketleft, braceleft ] };		 
+};
+
+partial alphanumeric_keys
+xkb_symbols "hausa" {
+    include "ng(basic)"
+
+    name[Group1]= "Nigeria - Hausa";
+
+    key <AD01> { [ 0x01000071, 0x01000051,          q,          Q ] };
+    key <AD02> { [ udiaeresis, Udiaeresis,          w,          W ] };
+    key <AD03> { [          e,          E,   EuroSign,       cent ] };
+    key <AD11> { [ 0x010001B4, 0x010001B3,bracketleft,  braceleft ] };
+    key <AD12> { [     gcaron,     Gcaron,bracketright, braceright] };
+    key <AC03> { [ 0x01000257, 0x0100018A,         d,           D ] };
+    key <AC10> { [ 0x01000131, 0x01000130, semicolon,       colon ] };
+    key <AC11> { [ 0x010001DD, 0x0100018E,apostrophe,    quotedbl ] };
+    key <AB01> { [ 0x01000272, 0x0100019D,         z,           Z ] };
+    key <AB07> { [     ntilde,     Ntilde,         m,           M ] };
+    key <AB09> { [   ccedilla,   Ccedilla,    period,     greater ] };
+    key <AB10> { [   scedilla,   Scedilla,     slash,    question ] };
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+   include "ng(basic)"
+
+   // OLPC West Africa keyboard layout
+   // See: http://wiki.laptop.org/go/Image:Nigeria-B3.png
+
+   key <TLDE> { [     grave, asciitilde,    exclamdown,       exclamdown ] };
+   key <AE01> { [         1,     exclam,      sterling,         sterling ] };
+   key <AE02> { [         2,         at,      EuroSign,         EuroSign ] };
+   key <AE03> { [         3, numbersign,        dollar,          dollar ] };
+   key <AE04> { [         4,  0x10020A6,     0x1000301,        0x1000301 ] }; // Naira, combining acute
+   key <AE05> { [         5,    percent,     0x1000300,        0x1000300 ] }; // combining grave
+   key <AE06> { [         6,asciicircum,     0x100030A,        0x100030A ] }; // combining ring above
+   key <AE07> { [         7,  ampersand,     0x1000302,        0x1000302 ] }; // combining circumflex above
+   key <AE08> { [         8,   asterisk,     0x1000324,        0x1000324 ] }; // combining caron above
+   key <AE09> { [         9,  parenleft,     0x1000307,        0x1000307 ] }; // combining dot above
+   key <AE10> { [         0, parenright,     0x1000308,        0x1000308 ] }; // combining diaeresis above
+   key <AE11> { [     minus, underscore,     0x1000304,        0x1000304 ] }; // combining macron above
+   key <AE12> { [     equal,       plus,     0x1000303,        0x1000303 ] }; // combining tilde above
+
+   key <AD02> { [         w,          W,     0x1000,       0x1000 ] }; // E with dot below
+   key <AD03> { [         e,          E,     0x10001DD, 0x100018E ] }; // reversed E
+   key <AD04> { [         r,          R,     0x10001B4, 0x10001B3 ] }; // Y with hook
+   key <AD05> { [         t,          T,     0x1000327, 0x1000327 ] }; // combining cedilla
+   key <AD06> { [         y,          Y,     0x1000325, 0x1000325 ] }; // combining ring below
+   key <AD07> { [         u,          U,     0x100032D, 0x100032D ] }; // combining circumflex below
+   key <AD08> { [         i,          I,     0x100032C, 0x100032C ] }; // combining caron below
+   key <AD09> { [         o,          O,     0x1000323, 0x1000323 ] }; // combining dot below
+   key <AD10> { [         p,          P,     0x1000304, 0x1000304 ] }; // combining diaeresis below
+   key <AD11> { [ bracketleft,  braceleft,   0x1000331, 0x1000331 ] }; // combining macron below
+   key <AD12> { [bracketright, braceright,   0x1000330, 0x1000330 ] }; // combining tilde below
+
+   key <AC01>  { [         a,          A,   Greek_iota,       Greek_IOTA ] };
+   key <AC02>  { [        s,          S,    0x1001E63,        0x1001E62 ] }; // S with dot below
+   key <AC03>  { [         d,          D,    0x1000257,        0x100018A ] }; // D with hook
+   key <AC04>  { [        f,          F,    0x1001E0D,        0x1001E0C ] }; // D with dot below
+   key <AC05>  { [         g,          G,    0x1000272,               0x100019D ] }; // N with left hook
+   key <AC06>  { [         h,          H,    0x1001EE5,               0x1001EE4 ] }; // U with dot below
+   key <AC07>  { [         j,          J,    0x1001ECB,               0x1001ECA ] }; // I with dot below
+   key <AC08>  { [         k,          K,    0x1000199,               0x1000198 ] }; // K with hook
+   key <AC09>  { [         l,          L,    0x1001E37,        0x1001E36 ] }; // L with dot below
+   key <AC10>  { [ semicolon,      colon,    masculine,      ordfeminine ] };
+   key <AC11>  { [ apostrophe,  quotedbl,     currency,         currency ] };
+   key <BKSL>  { [ backslash,        bar,      section,          section ] };
+
+   key <AB03>  { [         c,          C,    0x1000254,        0x1000186 ] }; // open O
+   key <AB04>  { [         v,          V,    0x100028B,        0x10001B2 ] }; // V with hook
+   key <AB05>  { [         b,          B,    0x1000253,               0x1000181 ] }; // B with hook
+   key <AB06>  { [         n,          N,          eng,                     ENG ] };
+   key <AB07>  { [         m,          M,    0x1001E45,        0x1001E44 ] }; // N with dot above
+   key <AB08>  { [     comma,     less, guillemotleft,   guillemotleft ] };
+   key <AB09>  { [    period, greater, guillemotright,  guillemotright ] };
+   key <AB10>  { [     slash,   question, questiondown,     questiondown ] };
+
+   key <I219>  { [  multiply,   division, ISO_Next_Group, ISO_Prev_Group ] };
+
+   include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/nl b/xorg-server/xkbdata.src/symbols/nl
new file mode 100644
index 000000000..f4e698a94
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/nl
@@ -0,0 +1,155 @@
+// $XKeyboardConfig$
+
+// Basic layout based on converted file, from 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/nl,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+// Official layout by Benno Schulenberg <bensberg@justemail.net>, January 2007,
+// based on http://www.xs4all.nl/~koospol/public/Xmodmap-nl-deadkeys.gz
+
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin"
+
+    name[Group1]="Netherlands";
+
+    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
+    key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};
+    key <AE07>	{ [         7, underscore,     sterling, seveneighths ]	};
+    key <AE08>	{ [         8,  parenleft,    braceleft,  bracketleft ]	};
+    key <AE09>	{ [         9, parenright,   braceright, bracketright ]	};
+    key <AE10>	{ [         0, apostrophe,       degree,    trademark ]	};
+    key <AE11>	{ [     slash,   question,    backslash, questiondown ]	};
+    key <AE12>	{ [    degree, dead_tilde, dead_cedilla,  dead_ogonek ]	};
+
+    key <AD03>	{ [         e,          E,     EuroSign,         cent ] };
+    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_circumflex, 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>	{ [dead_acute, dead_grave,   apostrophe,        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>	{ [bracketright, bracketleft,       bar,    brokenbar ]	};
+
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "std" {
+
+    name[Group1]= "Netherlands - Standard";
+
+    key <TLDE>  { [             at,        section,        notsign ] };
+    key <AE01>  { [              1,         exclam,    onesuperior ] };
+    key <AE02>  { [              2,       quotedbl,    twosuperior ] };
+    key <AE03>  { [              3,     numbersign,  threesuperior ] };
+    key <AE04>  { [              4,         dollar,     onequarter ] };
+    key <AE05>  { [              5,        percent,        onehalf ] };
+    key <AE06>  { [              6,      ampersand,  threequarters ] };
+    key <AE07>  { [              7,     underscore,       sterling ] };
+    key <AE08>  { [              8,      parenleft,      braceleft ] };
+    key <AE09>  { [              9,     parenright,     braceright ] };
+    key <AE10>  { [              0,     apostrophe                 ] };
+    key <AE11>  { [          slash,       question,      backslash ] };
+    key <AE12>  { [         degree,     dead_tilde,   dead_cedilla ] };
+
+    key <AD01>  { [              q,              Q                 ] };
+    key <AD02>  { [              w,              W                 ] };
+    key <AD03>  { [              e,              E,       EuroSign ] };
+    key <AD04>  { [              r,              R,      paragraph ] };
+    key <AD05>  { [              t,              T                 ] };
+    key <AD06>  { [              y,              Y                 ] };
+    key <AD07>  { [              u,              U                 ] };
+    key <AD08>  { [              i,              I                 ] };
+    key <AD09>  { [              o,              O                 ] };
+    key <AD10>  { [              p,              P                 ] };
+    key <AD11>  { [ dead_diaeresis, dead_circumflex                ] };
+    key <AD12>  { [       asterisk,            bar                 ] };
+    key <BKSL>  { [           less,        greater                 ] };
+
+    key <AC01>  { [              a,              A                 ] };
+    key <AC02>  { [              s,              S,         ssharp ] };
+    key <AC03>  { [              d,              D                 ] };
+    key <AC04>  { [              f,              F                 ] };
+    key <AC05>  { [              g,              G                 ] };
+    key <AC06>  { [              h,              H                 ] };
+    key <AC07>  { [              j,              J                 ] };
+    key <AC08>  { [              k,              K                 ] };
+    key <AC09>  { [              l,              L                 ] };
+    key <AC10>  { [           plus,      plusminus                 ] };
+    key <AC11>  { [     dead_acute,     dead_grave                 ] };
+
+    key <LSGT>  { [   bracketright,    bracketleft,            bar ] };
+    key <AB01>  { [              z,              Z,  guillemotleft ] };
+    key <AB02>  { [              x,              X, guillemotright ] };
+    key <AB03>  { [              c,              C,           cent ] };
+    key <AB04>  { [              v,              V                 ] };
+    key <AB05>  { [              b,              B                 ] };
+    key <AB06>  { [              n,              N                 ] };
+    key <AB07>  { [              m,              M,             mu ] };
+    key <AB08>  { [          comma,      semicolon                 ] };
+    key <AB09>  { [         period,          colon, periodcentered ] };
+    key <AB10>  { [          minus,          equal                 ] };
+
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    // For naming consistency
+
+    include "nl(basic)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+
+     // For naming consistency
+
+    include "nl(Sundeadkeys)"
+    name[Group1]="Netherlands - Sun dead keys";
+};
+
+// Copied from macintosh_vndr/nl
+partial alphanumeric_keys 
+xkb_symbols "mac" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple netherland keybaord
+
+    include "latin"
+
+    name[Group1]= "Netherlands - Macintosh";
+
+    include "level3(ralt_switch)"
+
+// do just nothing
+
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/no b/xorg-server/xkbdata.src/symbols/no
new file mode 100644
index 000000000..80a10a2eb
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/no
@@ -0,0 +1,222 @@
+
+// based on a keyboard map from an 'xkb/symbols/no' file
+//
+// $XKeyboardConfig$
+// $XFree86: xc/programs/xkbcomp/symbols/no,v 1.3 2002/12/19 01:07:56 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a Norwegian keyboard with dead key support
+    // and all of ISO-8859-1 characters available.
+
+    include "latin(type2)"
+
+    name[Group1]="Norway";
+
+    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]	};
+
+    include "kpdl(comma)"
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic Norwegian layout to eliminate dead keys
+
+    include "no(basic)"
+
+    name[Group1]="Norway - Eliminate dead keys";
+
+    key <AE12>	{ [ backslash,      grave,        acute,       ogonek ]	};
+    key <AD12>	{ [ diaeresis, asciicircum,   asciitilde,      macron ]	};
+    key <AC10>	{ [    oslash,   Ooblique,        acute,  doubleacute ]	};
+    key <AC11>	{ [        ae,         AE,  asciicircum,        caron ]	};
+    key <AB08>	{ [     comma,  semicolon,      cedilla,       ogonek ]	};
+    key <AB09>	{ [    period,      colon, periodcentered,   abovedot ]	};
+};
+
+// Norwegian Dvorak
+partial alphanumeric_keys 
+xkb_symbols "dvorak" {
+    include "us(dvorak)"
+
+    name[Group1]="Norway - Dvorak";
+
+    key <TLDE> { [	  bar,	section, brokenbar, paragraph	] };
+
+    key <AE01> { [	    1,	exclam, exclamdown, onesuperior	] };
+    key <AE02> { [	    2,	quotedbl,   at,     twosuperior	] };
+    key <AE03> { [	    3,	numbersign, sterling, threesuperior ] };
+    key <AE04> { [	    4,	dollar,     currency,onequarter	] };
+    key <AE05> { [	    5,	percent,    onehalf,	onehalf	] };
+    key <AE06> { [	    6,	ampersand,  threequarters, threequarters ] };
+    key <AE07> { [	    7,	slash,      braceleft, division	] };
+    key <AE08> { [	    8,	parenleft,  bracketleft		] };
+    key <AE09> { [	    9,	parenright, bracketright	] };
+    key <AE10> { [	    0,	equal,	    braceright		] };
+    key <AE11> { [	 plus,	question,   plusminus, questiondown ] };
+    key <AE12> { [   backslash,	grave,	    dead_acute,	dead_grave  ] };
+
+    key <AD01> { [       aring,	Aring,  braceright, bracketright ] };
+    key <AD02> { [	comma,	semicolon, dead_cedilla, cedilla ] };
+    key <AD03> { [      period,	colon,  periodcentered		 ] };
+    key <AD04> { [	    p,	P,      thorn,	THORN		 ] };
+    key <AD05> { [	    y,	Y,      yen			 ] };
+    key <AD06> { [	    f,	F,      ordfeminine		 ] };
+    key <AD08> { [	    c,	C,      ccedilla, copyright	 ] };
+    key <AD09> { [	    r,	R,      registered		 ] };
+    key <AD11> { [  apostrophe,	asterisk, dead_circumflex, acute ] };
+    key <AD12> { [  asciitilde,	asciicircum, dead_diaeresis, dead_tilde	] };
+
+    key <AC03> { [	    e,	E,      EuroSign,	cent	 ] };
+    key <AC05> { [	    i,	I,      idotless,       Iabovedot] };
+    key <AC06> { [	    d,	D,      eth,		ETH	 ] };
+    key <AC10> { [	    s,	S,      ssharp			 ] };
+    key <AC11> { [	minus,	underscore, hyphen,	diaeresis] };
+
+    key <AB01> { [	   ae,	AE,     braceleft,	bracketleft] };
+    key <AB05> { [	    x,	X,      multiply		 ] };
+    key <AB07> { [	    m,	M,	mu			 ] };
+    key <BKSL> { [	 less,	greater, guillemotleft, guillemotright	] };
+
+    key <SPCE> { [	 space,	space, nobreakspace, nobreakspace] };
+
+    key <LSGT> { [	oslash,	Ooblique,  bar,	backslash	 ] };
+
+    // fixed https://bugs.freedesktop.org/show_bug.cgi?id=4397
+    include "level3(ralt_switch)"
+};
+
+// 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/sapmi,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial alphanumeric_keys
+xkb_symbols "smi" {
+    include "latin"
+
+    name[Group1]= "Norway - Northern Saami";
+
+    key <AE01>	{ [         1,     exclam,    copyright,   exclamdown ]	};
+    key <AE02>	{ [         2,   quotedbl,           at,   registered ]	};
+    key <AE03>	{ [         3, numbersign,     sterling,         less ]	};
+    key <AE04>	{ [         4,     dollar,       dollar,      greater ]	};
+    key <AE05>	{ [         5,    percent,        U2022,        U2030 ]	};
+    key <AE06>	{ [         6,  ampersand,      section,    paragraph ]	};
+    key <AE07>	{ [         7,      slash,    braceleft,          bar ]	};
+    key <AE08>	{ [         8,  parenleft,  bracketleft,    braceleft ]	};
+    key <AE09>	{ [         9, parenright, bracketright,   braceright ]	};
+    key <AE10>	{ [         0,      equal,   braceright,     notequal ]	};
+    key <AE11>	{ [      plus,   question,     division, questiondown ]	};
+    key <AE12>	{ [ backslash,      grave,        acute,   asciitilde ]	};
+
+    key <AD01>	{ [    aacute,     Aacute,            q,            Q ]	};
+    key <AD02>	{ [    scaron,     Scaron,            w,            W ]	};
+    key <AD03>	{ [         e,          E,       eacute,       Eacute ]	};
+    key <AD04>	{ [         r,          R,   registered,    trademark ]	};
+    key <AD06>	{ [         y,          Y,       yacute,       Yacute ]	};
+    key <AD07>	{ [         u,          U,   udiaeresis,   Udiaeresis ]	};
+    key <AD08>	{ [         i,          I,   idiaeresis,   Idiaeresis ]	};
+    key <AD09>	{ [         o,          O,           oe,           OE ]	};
+    key <AD11>	{ [     aring,      Aring,  acircumflex,  Acircumflex ]	};
+    key <AD12>	{ [       eng,        ENG,     quotedbl,  asciicircum ]	};
+
+    key <AC01>	{ [         a,          A,       agrave,       Agrave ]	};
+    key <AC02>	{ [         s,          S,       ssharp,   apostrophe ]	};
+    key <AC04>	{ [         f,          F,  ordfeminine,  ordfeminine ]	};
+    key <AC05>	{ [         g,          G,       gcaron,       Gcaron ]	};
+    key <AC06>	{ [         h,          H,        U01E5,        U01E4 ]	};
+    key <AC07>	{ [         j,          J,      notsign,     multiply ]	};
+    key <AC08>	{ [         k,          K,        U01E9,        U01E8 ]	};
+    key <AC09>	{ [         l,          L,       degree,       hyphen ]	};
+    key <AC10>	{ [    oslash,   Ooblique,   odiaeresis,   Odiaeresis ]	};
+    key <AC11>	{ [        ae,         AE,   adiaeresis,   Adiaeresis ]	};
+    key <TLDE>	{ [       bar,    section,    brokenbar,    paragraph ]	};
+
+    key <BKSL>	{ [   dstroke,    Dstroke,   apostrophe,     asterisk ]	};
+    key <AB01>	{ [         z,          Z,        U0292,        U01B7 ]	};
+    key <AB02>	{ [    ccaron,     Ccaron,            x,            X ]	};
+    key <AB03>	{ [         c,          C,     ccedilla,     Ccedilla ]	};
+    key <AB04>	{ [         v,          V, lessthanequal, guillemotleft ] };
+    key <AB05>	{ [         b,          B, greaterthanequal, guillemotright ] };
+    key <AB06>	{ [         n,          N, leftsinglequotemark, leftdoublequotemark ] };
+    key <AB07>	{ [         m,          M, rightsinglequotemark, rightdoublequotemark ]	};
+    key <AB08>	{ [     comma,  semicolon, singlelowquotemark, doublelowquotemark ] };
+    key <AB09>	{ [    period,      colon,     ellipsis, periodcentered ] };
+    key <AB10>	{ [     minus, underscore,       endash,       emdash ]	};
+
+    key <LSGT>	{ type[Group1] = "FOUR_LEVEL",
+                  [    zcaron,     Zcaron,        U01EF,        U01EE ]	};
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "smi_nodeadkeys" {
+
+    // Modifies the basic Norwegian layout to eliminate dead keys
+
+    include "no(smi)"
+
+    name[Group1]= "Norway - Northern Saami, eliminate dead keys";
+
+    key <AE12>	{ [ backslash,      grave,        acute,       ogonek ]	};
+};
+
+// Copied from macintosh_vndr/no
+partial alphanumeric_keys 
+xkb_symbols "mac" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple Norwegian keybaord
+
+    include "latin(type4)"
+    name[Group1]= "Norway - Macintosh";
+
+    key <TLDE>	{ [       bar,    section     ]	};
+    key <AE03>	{ [         3, numbersign,     sterling,     sterling ]	};
+    key <AE04>	{ [         4,   currency,       dollar,       dollar ]	};
+    key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};
+    key <AE07>	{ [         7,      slash,          bar,    backslash ]	};
+    key <AE08>	{ [         8,  parenleft,  bracketleft,    braceleft ]	};
+    key <AE09>	{ [         9, parenright, bracketright,   braceright ]	};
+    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     ]	};
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "mac_nodeadkeys" {
+
+    // Modifies the basic Norwegian layout to eliminate dead keys
+    include "no(mac)"
+    name[Group1]= "Norway - Macintosh, eliminate dead keys";
+
+    key <AE12>	{ [      grave,     acute,        acute,       ogonek ]	};
+    key <AD12>	{ [  diaeresis, asciicircum, asciitilde,       macron ]	};
+};
diff --git a/xorg-server/xkbdata.src/symbols/np b/xorg-server/xkbdata.src/symbols/np
new file mode 100644
index 000000000..26085c010
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/np
@@ -0,0 +1,124 @@
+// $XKeyboardConfig$
+
+// based on a keyboard map from an 'xkb/symbols/dev' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/dev,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+      name[Group1]= "Nepal";
+
+// `,1,2,3,4,5,6,7,8,9,0,-,=
+
+      key <TLDE> { [      0x100093D,0x100093C ]	};
+      key <AE01> { [      0x1000967	 		]	};
+      key <AE02> { [      0x1000968			]	};
+      key <AE03> { [      0x1000969 	 		]	};
+      key <AE04> { [      0x100096A  	 		]	};
+      key <AE05> { [      0x100096B  	 		]	};
+      key <AE06> { [      0x100096C  	 		]	};
+      key <AE07> { [      0x100096D                     ]	};
+      key <AE08> { [      0x100096e  	 		]	};
+      key <AE09> { [      0x100096F	 		]	};
+      key <AE10> { [      0x1000966,0x1000970		]	};
+      key <AE11> { [      minus, 0x1000952 		]	};
+      key <AE12> { [      equal, 0x100200C 		]	};
+
+// q,w,e,r,t,y,u,i,o,p,[,]
+
+      key <AD01> { [      0x100091F,  0x1000920       	]	};
+      key <AD02> { [      0x100094C,  0x1000914       	]	};
+      key <AD03> { [      0x1000947,  0x1000948       	]	};
+      key <AD04> { [      0x1000930,  0x1000943       	]	};
+      key <AD05> { [      0x1000924,  0x1000925       	]	};
+      key <AD06> { [      0x100092F,  0x100091E 	]	};
+      key <AD07> { [      0x1000941,  0x1000942 	]	};
+      key <AD08> { [      0x100093F,  0x1000940 	]	};
+      key <AD09> { [      0x100094B,  0x1000913		]	};
+      key <AD10> { [      0x100092A,  0x100092B 	]	};
+      key <AD11> { [      0x1000907,  0x1000908		]	};
+      key <AD12> { [      0x100090F,  0x1000910		]	};
+
+// a,s,d,f,g,h,j,k,l,;,',Backslash 
+      key <AC01> { [      0x100093E,  0x1000906       	]	};
+      key <AC02> { [      0x1000938,  0x1000936       	]	};
+      key <AC03> { [      0x1000926,  0x1000927       	]	};
+      key <AC04> { [      0x1000909,  0x100090A       	]	};
+      key <AC05> { [      0x1000917,  0x1000918       	]	};
+      key <AC06> { [      0x1000939,  0x1000905 	]	};
+      key <AC07> { [      0x100091C,  0x100091D 	]	};
+      key <AC08> { [      0x1000915,  0x1000916 	]	};
+      key <AC09> { [      0x1000932,  0x1000933 	]	};
+      key <AC10> { [      semicolon,  colon 		]	};
+      key <AC11> { [      quoteright, quotedbl 		]	};
+      key <BKSL> { [      0x1000950,  0x1000903 	]	};
+
+
+// z,x,c,v,b,n,m,,,.,/ 
+      key <AB01> { [      0x1000937,  0x100090B		]	};
+      key <AB02> { [      0x1000921,  0x1000922		]	};
+      key <AB03> { [      0x100091B,  0x100091A         ]       };
+      key <AB04> { [      0x1000935,  0x1000901		]       };
+      key <AB05> { [      0x100092C,  0x100092D		]       };
+      key <AB06> { [      0x1000928,  0x1000923         ]       };
+      key <AB07> { [      0x100092E,  0x1000902         ]       };
+      key <AB08> { [      comma,      0x1000919         ]       };
+      key <AB09> { [      0x1000964,  0x1000965		]       };
+      key <AB10> { [      0x100094D,  question		]       };
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+// Contact: Walter Bender <walter@laptop.org>
+
+  include "np"
+      key <TLDE> { [      grave,     asciitilde 	]	};
+      key <AE01> { [      0x1000967	 		]	}; // Nepali digit one
+      key <AE02> { [      0x1000968			]	}; // Nepali digit two
+      key <AE03> { [      0x1000969 	 		]	}; // Nepali digit three
+      key <AE04> { [      0x100096A  	 		]	}; // Nepali digit four
+      key <AE05> { [      0x100096B  	 		]	}; // Nepali digit five
+      key <AE06> { [      0x100096C,  sterling 	 	]	}; // Nepali digit six
+      key <AE07> { [      0x100096D,  eurosign 	 	]	}; // Nepali digit seven
+      key <AE08> { [      0x100096e  	 		]	}; // Nepali digit eight
+      key <AE09> { [      0x100096F	 		]	}; // Nepali digit nine
+      key <AE10> { [      0x1000966			]	}; // Nepali digit zero
+      key <AE12> { [      0x1000950,  0x1000903 	]	}; // OM, SIGN VISARGA
+
+      key <AD01> { [      0x100091C,  0x100091D 	]	}; // JA, JHA
+      key <AD02> { [      0x1000917,  0x1000918       	]	}; // GA, GHA
+      key <AD03> { [      0x100092F,  0x100091E 	]	}; // YA, YNA
+      key <AD04> { [      0x1000938,  0x1000936       	]	}; // SA, SHA
+      key <AD05> { [      0x100090F,  0x1000910		]	}; // E, AI
+      key <AD06> { [      0x100091B,  0x100091A         ]       }; // CHHA, CHA
+      key <AD07> { [      0x100092A,  0x100092B 	]	}; // PA, PHA
+      key <AD08> { [      0x1000947,  0x1000948       	]	}; // VOWEL SIGN E, VOWEL SIGN AI
+      key <AD09> { [      0x100094B,  0x100093E		]	}; // VOWEL SIGN O, VOWEL SIGN AA
+      key <AD10> { [      0x1000924,  0x1000925       	]	}; // TA, THA
+      key <AD11> { [      0x1000909,  0x100090A 	]	}; // HRSHWA U, DIRGHA UU
+      key <AD12> { [      0x100093F,  0x1000940 	]	}; // VOWEL SIGN HRSHWA I, VOWEL SIGN DIRGHA II
+
+      key <AC01> { [      0x100092E,  0x1000902         ]       }; // MA, SIGN ANUSVARA
+      key <AC02> { [      0x1000907,  0x1000908		]	}; // HRSHWA I, DIRGHA II
+      key <AC03> { [      0x1000928,  0x1000923         ]       }; // NA, NNA
+      key <AC04> { [      0x100094D,  0x1000921		]       }; // VIRAMA (HALANTA?), DDA
+      key <AC05> { [      0x100091F,  0x1000920       	]	}; // TTA, TTHA
+      key <AC06> { [      0x1000926,  0x1000927       	]	}; // DA, DHA
+      key <AC07> { [      0x100093E,  0x1000901       	]	}; // SIGN AA, SIGN CANDRABINDU
+      key <AC08> { [      0x1000930,  0x1000943       	]	}; // RA, VOWEL SIGN VOCALIC R
+      key <AC09> { [      0x1000915,  0x1000916 	]	}; // KA, KHA
+
+      key <AB01> { [      0x1000937,  0x100090B		]	}; // SSA, VOCALIC R (RRI)
+      key <AB02> { [      0x100092C,  0x100092D		]       }; // BA, BHA
+      key <AB03> { [      0x1000941,  0x1000942       	]	}; // VOWEL SIGN HRSHWA U, VOWEL SIGN DIRGHA U (UU)
+      key <AB04> { [      0x1000939,  0x1000922 	]	}; // HA, DDHA
+      key <AB05> { [      0x1000913,  0x1000914		]	}; // O, AU
+      key <AB06> { [      0x1000905,  0x1000906		]	}; // A, AA
+      key <AB07> { [      0x1000932,  0x1000919 	]	}; // LA, NGA
+      key <AB08> { [      comma,  0x1000935		]       }; // VA
+      key <AB09> { [      0x1000964,  0x1000965		]       }; // PURNA VIRAM, DIRGHA VIRAM
+
+      include "group(olpc)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/olpc b/xorg-server/xkbdata.src/symbols/olpc
new file mode 100644
index 000000000..4fda9949c
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/olpc
@@ -0,0 +1,22 @@
+// $XKeyboardConfig$
+//
+// Created by Bernardo Innocenti <bernie@codewiz.org>
+//
+// Additional symbol definitions for the OLPC keyboards
+//
+
+alphanumeric_keys modifier_keys
+xkb_symbols "olpc" {
+    include "pc(pc105)"
+
+    modifier_map Mod1 { KP_Home   }; // KP_Home  is the "square" game key
+    modifier_map Mod3 { KP_End    }; // KP_End   is the "tick" game key
+    modifier_map Mod4 { KP_Prior  }; // KP_Prior is the "O" game key
+    modifier_map Mod5 { KP_Next   }; // KP_Next  is the "X" game key
+
+    key <I220> { [ XF86Search    ] }; // search key
+    key <I221> { [ XF86Meeting   ] }; // fn+search key
+    key <I236> { [ XF86Start     ] }; // gear key (fn+space)
+    key <I147> { [ XF86TaskPane  ] }; // frame key (the top-right key)
+    key <I224> { [ XF86Messenger ] }; // overlay key (next to frame key)
+};
diff --git a/xorg-server/xkbdata.src/symbols/pc b/xorg-server/xkbdata.src/symbols/pc
new file mode 100644
index 000000000..444e3c1ac
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/pc
@@ -0,0 +1,150 @@
+// $XKeyboardConfig$
+
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc,v 1.9 2003/06/09 19:59:46 dawes Exp $
+
+default partial alphanumeric_keys modifier_keys 
+xkb_symbols "pc105" {
+
+    key <ESC>  {	[ Escape			]	};
+
+    // the extra key on most European keyboards
+    key <LSGT> {	[      less,    greater,          bar,    brokenbar ]	};
+
+    // these keys are common to all layouts
+    key <BKSL> {	[ backslash,	bar		]	};
+    key <SPCE> {	[ 	 space			]	};
+
+    include "pc(function)"
+    include "pc(editing)"
+    include "keypad(x11)"
+
+    key <BKSP> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ BackSpace,   Terminate_Server ]
+    };
+
+    key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
+    key <RTRN> {	[ Return	]	};
+
+    key <CAPS> {	[ Caps_Lock	]	};
+
+    key <NMLK> {	[ Num_Lock, Pointer_EnableKeys		]	};
+
+    key <LFSH> {	[ Shift_L	]	};
+    key <LCTL> {	[ Control_L	]	};
+
+    key <LWIN> {	[ Super_L			]	};
+
+    key <RTSH> {	[ Shift_R	]	};
+    key <RCTL> {	[ Control_R	]	};
+
+    key <RWIN> {	[ Super_R			]	};
+
+    key <MENU> {	[ Menu			]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L, Control_R };
+    modifier_map Mod2   { Num_Lock };
+
+    //  Fake keys for virtual<->real modifiers mapping 
+    key <LVL3> {	[ ISO_Level3_Shift	]	};
+    key <MDSW> {	[ Mode_switch 		]	};
+    modifier_map Mod5   { <LVL3>, <MDSW> };
+
+    key <ALT>  {	[ NoSymbol, Alt_L	]	};
+    include "altwin(meta_alt)"
+
+    key <META> {	[ NoSymbol, Meta_L	]	};
+    modifier_map Mod1   { <META> };
+
+    key <SUPR> {	[ NoSymbol, Super_L	]	};
+    modifier_map Mod4   { <SUPR> };
+
+    key <HYPR> {	[ NoSymbol, Hyper_L	]	};
+    modifier_map Mod4   { <HYPR> };
+
+    key <OUTP> { [ XF86Display ] };
+    key <KITG> { [ XF86KbdLightOnOff ] };
+    key <KIDN> { [ XF86KbdBrightnessDown ] };
+    key <KIUP> { [ XF86KbdBrightnessUp ] };
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "function" {
+    key <FK01> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F1,	XF86_Switch_VT_1 ]
+    };
+    key <FK02> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F2,	XF86_Switch_VT_2 ]
+    };
+    key <FK03> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F3,	XF86_Switch_VT_3 ]
+    };
+    key <FK04> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F4,	XF86_Switch_VT_4 ]
+    };
+    key <FK05> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F5,	XF86_Switch_VT_5 ]
+    };
+    key <FK06> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F6,	XF86_Switch_VT_6 ]
+    };
+    key <FK07> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F7,	XF86_Switch_VT_7 ]
+    };
+    key <FK08> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F8,	XF86_Switch_VT_8 ]
+    };
+    key <FK09> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F9,	XF86_Switch_VT_9 ]
+    };
+    key <FK10> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F10,	XF86_Switch_VT_10 ]
+    };
+    key <FK11> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F11,	XF86_Switch_VT_11 ]
+    };
+    key <FK12> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F12,	XF86_Switch_VT_12 ]
+    };
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "editing" {
+    key <PRSC> {
+	type= "PC_ALT_LEVEL2",
+	symbols[Group1]= [ Print, Sys_Req ]
+    };
+    key <SCLK> {  [  Scroll_Lock	]	};
+    key <PAUS> {
+	type= "PC_CONTROL_LEVEL2",
+	symbols[Group1]= [ Pause, Break ]
+    };
+    key  <INS> {	[  Insert		]	};
+    key <HOME> {	[  Home			]	};
+    key <PGUP> {	[  Prior		]	};
+    key <DELE> {	[  Delete		]	};
+    key  <END> {	[  End			]	};
+    key <PGDN> {	[  Next			]	};
+
+    key   <UP> {	[  Up			]	};
+    key <LEFT> {	[  Left			]	};
+    key <DOWN> {	[  Down			]	};
+    key <RGHT> {	[  Right		]	};
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/pk b/xorg-server/xkbdata.src/symbols/pk
new file mode 100644
index 000000000..43ee86241
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/pk
@@ -0,0 +1,220 @@
+// $XKeyboardConfig$
+
+// Urdu keymap
+// Developed by:
+// Zaeem Arshad <zaeem@linux.net.pk>
+// Last update: 2004-03-12
+//Notice:
+//Alt key combinations are yet to be put in. The unavailable keys are those which do not have a corresponding //glyph in unicode.
+
+partial default alphanumeric_keys
+xkb_symbols "urd" {
+   name[Group1]= "Pakistan";
+
+   // Keys '~' - '='
+   //  All keys checked and complete
+   key <TLDE> {  [ 0x10006d4 ] };
+   key <AE01> {  [ 0x1000661, exclam ] };
+   key <AE02> {  [ 0x1000662, 0x1000040 ] };
+   key <AE03> {  [ 0x1000663, 0x1000023 ] };
+   key <AE04> {  [ 0x10006f4, 0x1000024 ] };
+   key <AE05> {  [ 0x10006f5, 0x1000025 ] };
+   key <AE06> {  [ 0x1000666, 0x100005e ] };
+   key <AE07> {  [ 0x1000667, 0x1000026 ] };
+   key <AE08> {  [ 0x1000668, asterisk ] };
+   key <AE09> {  [ 0x1000669, parenleft ] };
+   key <AE10> {  [ 0x1000660, parenright ] };
+   key <AE11> {  [ minus, 0x100005f ] };
+   key <AE12> {  [ equal, plus ] };
+
+   //Keys 'Q' - ']'
+   //Checked but incomplete with three shift sequences not available
+   key <AD01> {  [  Arabic_qaf, 0x10006e1 ] };
+   key <AD02> {  [  0x1000648, 0x100fdf9  ] }; //shift key not available
+   key <AD03> {  [  0x1000639, 0x100fdf7  ] }; //shift key not available
+   key <AD04> {  [  0x1000631, 0x1000691  ] };
+   key <AD05> {  [  Arabic_teh, 0x1000679  ] };
+   key <AD06> {  [  0x10006d2, 0x100fe7c  ] };
+   key <AD07> {  [  0x1000621,  0x100064c ] };
+   key <AD08> {  [  0x10006cc, 0x1000656  ] }; //shift key not available
+   key <AD09> {  [  0x1000647, 0x1000629  ] };
+   key <AD10> {  [  0x100067e, 0x100064f  ] };
+   key <AD12> {  [  bracketright, braceright  ] };
+   key <AD11> {  [  bracketleft, braceleft  ] };
+
+
+   // Keys 'A' - '''
+   // Checked but incomplete with two shift sequences not available
+   key <AC01> { [  0x1000627, 0x1000622  ] };
+   key <AC02> { [  Arabic_seen, 0x1000635  ] };
+   key <AC03> { [  0x100062f, 0x1000688  ] };
+   key <AC04> { [  0x1000641, 0x1000670  ] };
+   key <AC05> { [  0x10006af, 0x100063a  ] };
+   key <AC06> { [  0x10006be, 0x100062d ] };
+   key <AC07> { [  0x100062c, 0x1000636  ] };
+   key <AC08> { [  0x10006a9,  0x100062e  ] };
+   key <AC09> { [  0x1000644, 0x1000612 ] };//shift key not available
+   key <AC10> { [  0x100061b, 0x100003a  ] };
+   key <AC11> { [  0x1000027  ] }; // shift key not available
+
+
+   // These two are fine
+   key <BKSL> { [  backslash, bar  ] };
+   key <SPCE> { [  space  ] };
+
+
+   // Keys: 'Z' - '/'
+   //Keys checked with two shift sequences not available
+   key <AB01> { [  Arabic_zain, Arabic_thal  ] };
+   key <AB02> {  [  0x1000634, 0x1000698  ] };
+   key <AB03> {  [ 0x1000686 , 0x100062b  ] };
+   key <AB04> {  [  0x1000637, 0x1000638  ] };
+   key <AB05> {  [  0x1000628, 0x1000628  ] };//shift key unavailable
+   key <AB06> {  [  0x1000646, 0x10006ba  ] };
+   key <AB07> {  [  0x1000645, 0x1000645  ] };//shift key not available
+   key <AB08> {  [  0x100060c, 0x100064e  ] };
+   key <AB09> {  [  0x10006d4, 0x1000650  ] };
+   key <AB10> {  [  slash, Arabic_question_mark  ] };
+
+   //End alphanumeric key mappings
+
+   //Begin modifier mappings
+
+   modifier_map Shift {Shift_L, Shift_R };
+   modifier_map Lock {Caps_Lock };
+};
+
+partial alphanumeric_keys
+xkb_symbols "ara" {
+   name[Group1]= "Pakistan - 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 ?
+//
+// How is this different from ara(basic)? --bernie
+
+   key <TLDE> {  [     0x100064d  ,       0x100064b      ]     };
+   key <AE01> {  [     0x10006F1  ,       0x1000021      ]     };
+   key <AE02> {  [     0x10006F2  ,       0x1000003      ]     };
+   key <AE03> {  [     0x10006F3  ,       0x100002f      ]     };
+   key <AE04> {  [     0x10006F4  ,       0x1000626      ]     };
+   key <AE05> {  [     0x10006F5  ,       0x1000003      ]     };
+   key <AE06> {  [     0x10006F6  ,       0x10006d6      ]     };
+   key <AE07> {  [     0x10006F7  ,       0x1000654      ]     };
+   key <AE08> {  [     0x10006F8  ,       0x100064c      ]     };
+   key <AE09> {  [     0x10006F9  ,       0x1000029      ]     };
+   key <AE10> {  [     0x10006F0  ,       0x1000028      ]     };
+   key <AE11> {  [     0x1000623  ,       0x1000651      ]     };
+   key <AE12> {  [     0x1000624  ,       0x1000622      ]     };
+   key <AD01> {  [     0x1000642  ,       0x1000652      ]     };
+   key <AD02> {  [     0x1000648  ,       0x10000a3      ]     };
+   key <AD03> {  [     0x1000639  ,       0x10000a5      ]     };
+   key <AD04> {  [     0x1000631  ,       0x1000691      ]     };
+   key <AD05> {  [     0x100062a  ,       0x1000679      ]     };
+   key <AD06> {  [     0x10006d2  ,       0x1000601      ]     };
+   key <AD07> {  [     0x1000621  ,       0x100060c      ]     };
+   key <AD08> {  [     0x10006cc  ,       0x1000670      ]     };
+   key <AD09> {  [     0x10006c1  ,       0x10006c3      ]     };
+   key <AD10> {  [     0x100067e  ,       0x100064f      ]     };
+   key <AD11> {  [     0x100005d  ,       0x1000670      ]     };
+   key <AD12> {  [     0x100005b  ,       0x1000670      ]     };
+
+   key <AC01> {  [     0x1000627  ,       0x1000653      ]     };
+   key <AC02> {  [     0x1000633  ,       0x1000635      ]     };
+   key <AC03> {  [     0x100062f  ,       0x1000688      ]     };
+   key <AC04> {  [     0x1000641  ,       0x1000003      ]     };
+   key <AC05> {  [     0x10006af  ,       0x100063a      ]     };
+   key <AC06> {  [     0x10006be  ,       0x100062d      ]     };
+   key <AC07> {  [     0x100062c  ,       0x1000636      ]     };
+   key <AC08> {  [     0x10006a9  ,       0x100062e      ]     };
+   key <AC09> {  [     0x1000644  ,       0x1000613      ]     };
+   key <AC10> {  [     0x100061b  ,       0x100003a      ]     };
+   key <AC11> {  [     0x1000670  ,       0x1000022       ]     };
+   key <BKSL> {  [     0x100060e ,        0x1000614      ]     };
+
+   key <LSGT> {  [            bar ,       brokenbar      ]     };
+   key <AB01> {  [     0x1000632  ,       0x1000630      ]     };
+   key <AB02> {  [     0x1000634  ,       0x1000698      ]     };
+   key <AB03> {  [     0x1000686  ,       0x100062b      ]     };
+   key <AB04> {  [     0x1000637  ,       0x1000638      ]     };
+   key <AB05> {  [     0x1000628  ,       0x1000612      ]     };
+   key <AB06> {  [     0x1000646  ,       0x10006ba      ]     };
+   key <AB07> {  [     0x1000645  ,       0x1000003      ]     };
+   key <AB08> {  [     0x100060c  ,       0x1000650      ]     };
+   key <AB09> {  [     0x10006d4  ,       0x100064e      ]     };
+   key <AB10> {  [     0x1000003  ,       0x100061f      ]     };
+
+   // End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+// Contact: Walter Bender <walter@laptop.org>
+
+   include "pk(ara)"
+
+   name[Group1]= "Pakistan";
+
+   // Keys '~' - '='
+   key <TLDE> {  [ 0x1000654, 0x100064B ] };
+   key <AE01> {  [ 0x10006F1, 0x1000603 ] };
+   key <AE02> {  [ 0x10006F2, 0x1000602 ] };
+   key <AE03> {  [ 0x10006F3, 0x1000601 ] };
+   key <AE04> {  [ 0x10006F4, 0x1000600 ] };
+   key <AE05> {  [ 0x10006F5, 0x100060F ] };
+   key <AE06> {  [ 0x10006F6, 0x100060E ] };
+   key <AE07> {  [ 0x10006F7, 0x1000614 ] };
+   key <AE08> {  [ 0x10006F8, 0x1000612 ] };
+   key <AE09> {  [ 0x10006F9, 0x1000611 ] };
+   key <AE10> {  [ 0x10006F0, 0x1000613 ] };
+   key <AE11> {  [ minus,     0x1000610 ] };
+   key <AE12> {  [ equal, plus ] };
+
+   //Keys 'Q' - ']'
+   key <AD01> {  [ 0x1000642, 0x1000652 ] };
+   key <AD02> {  [ 0x1000648, 0x1000651 ] };
+   key <AD03> {  [ 0x1000639, 0x1000670 ] };
+   key <AD04> {  [ 0x1000631, 0x1000691 ] };
+   key <AD05> {  [ 0x100062A, 0x1000679 ] };
+   key <AD06> {  [ 0x10006D2, 0x100064E ] };
+   key <AD07> {  [ 0x1000621, 0x1000626 ] };
+   key <AD08> {  [ 0x10006CC, 0x1000650 ] };
+   key <AD09> {  [ 0x10006C1, 0x10006C3 ] };
+   key <AD10> {  [ 0x100067E, 0x100064F ] };
+   key <AD12> {  [ 0x100FDFD, 0x100FDFA ] };
+   key <AD11> {  [ 0x100FDF2, 0x100FDFB ] };
+
+   // Keys 'A' - '''
+   key <AC01> {  [ 0x1000627, 0x1000622 ] };
+   key <AC02> {  [ 0x1000633, 0x1000635 ] };
+   key <AC03> {  [ 0x100062F, 0x1000688 ] };
+   key <AC04> {  [ 0x1000641 ] }; //shift key not available
+   key <AC05> {  [ 0x10006AF, 0x100063A ] };
+   key <AC06> {  [ 0x100062D, 0x10006BE ] };
+   key <AC07> {  [ 0x100062C, 0x1000636 ] };
+   key <AC08> {  [ 0x10006A9, 0x100062E ] };
+   key <AC09> {  [ 0x1000644, 0x1000656 ] };
+   key <AC10> {  [ 0x100061B, colon ] };
+   key <AC11> {  [ quote, doublequote  ] };
+
+   key <BKSL> { [  backslash, bar  ] };
+   key <SPCE> { [  space  ] };
+
+   // Keys: 'Z' - '/'
+   key <AB01> {  [ 0x1000632, 0x1000622 ] };
+   key <AB02> {  [ 0x1000634, 0x1000635 ] };
+   key <AB03> {  [ 0x1000686, 0x1000688 ] };
+   key <AB04> {  [ 0x1000637 ] }; //shift key unavailable
+   key <AB05> {  [ 0x1000628, 0x100063A ] };
+   key <AB06> {  [ 0x1000646, 0x10006BE ] };
+   key <AB07> {  [ 0x1000645, 0x1000636 ] };
+   key <AB08> {  [ 0x100060C, 0x100062E ] };
+   key <AB09> {  [ 0x10006D4, 0x1000656 ] };
+   key <AB10> {  [ slash,     0x100061F ] };
+
+   include "group(olpc)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/pl b/xorg-server/xkbdata.src/symbols/pl
new file mode 100644
index 000000000..58b96e5dc
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/pl
@@ -0,0 +1,270 @@
+// $XKeyboardConfig$
+
+// based on a keyboard map from an 'xkb/symbols/pl' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pl,v 1.3 2003/04/19 12:22:12 pascal Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin"
+
+    name[Group1]="Poland";
+
+    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 "kpdl(comma)"
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "qwertz" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple QWERTZ Polish keybaord
+
+    include "latin(type3)"
+
+    name[Group1]="Poland - qwertz";
+
+    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 ]	};
+    key <AB10>  { [     minus, underscore, dead_belowdot, dead_abovedot ] };
+
+    include "kpdl(comma)"
+
+    include "level3(ralt_switch)"
+};
+
+// Polish Dvorak keymaps
+// by Rafal Rzepecki <divide@users.sf.net>
+
+// The base keymap "pl" places Polish quotes on quotemark key and 
+// moves the dead symbols from there to "1/!" key. If you are used to common 
+// 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 "dvorak" {
+    include "us(dvorak)"
+    
+    name[Group1] = "Poland - 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	]	};
+    
+    include "kpdl(comma)"
+
+    // 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 "dvorak_quotes" {
+    include "pl(dvorak)"
+    
+    name[Group1] = "Poland - Dvorak, Polish quotes on quotemark key";
+
+    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 "dvorak_altquotes" {
+    include "pl(dvorak)"
+
+    name[Group1] = "Poland - Dvorak, Polish quotes on key 1/!";
+
+    key <AE01> { [	    1,	exclam, doublelowquotemark, rightdoublequotemark	]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "csb" {
+
+    include "latin"
+
+    name[Group1]="Poland - Kashubian";
+
+    key <AD03>	{ [         e,          E,      eacute,      Eacute ]	};
+    key <AD04>	{ [         r,           R,      ediaeresis,      Ediaeresis ]	};
+    key <AD06>      { [         y,          Y,      EuroSign,         cent ]        };
+    key <AD07>	{ [          u,          U,       ugrave,       Ugrave ]	};
+    key <AD08>	{ [         i,            I,       ograve,       Ograve ]	};
+    key <AD09>	{ [         o,          O,       oacute,       Oacute ]	};
+    key <AD10>	{ [         p,          P,       ocircumflex,       Ocircumflex ]	};
+
+    key <AC01>	{ [         a,          A,      aogonek,      Aogonek ]	};
+    key <AC02>	{ [         s,          S,      atilde,      Atilde ]	      };
+    key <AC09>	{ [         l,          L,      lstroke,      Lstroke ]      };
+
+    key <AB01>	{ [         z,          Z,    zabovedot,    Zabovedot ]	};
+    key <AB06>	{ [         n,          N,       nacute,       Nacute ]	};
+
+    include "kpdl(comma)"
+
+    include "level3(ralt_switch)"
+};
+
+// Russian Polish-phonetic Dvorak
+// by Adrian Dziubek <adrian.dziubek@gmail.com>
+//
+// This layout aims to enable Polish Dvorak users to type with Russian
+// Cyrillic alphabet by using the sound correspondence between Polish and
+// Russian languages.
+//
+// This keyboard should be intuitive. Please let me know, if my intuition
+// lets You down.
+//
+// The guidelines used:
+// - no Cyrillic symbols are placed on punctuation symbols,
+// - visual similarities are ignored if there is a sound correspondence:
+//   no Cyrillic_es on c, no Cyrillic_er on p, no Cyrillic_ha on x etc.,
+// - the Latin symbols that have close sound correspondence (as read in Polish)
+//   to Cyrillic symbols (as read in Russian) are mapped respectively:
+//         * j -> Cyrillic_shorti,
+//         * k -> Cyrillic_ka,
+//         * b -> Cyrillic_be,
+//         * m -> Cyrillic_em,
+//         * w -> Cyrillic_ve,
+//         * z -> Cyrillic_ze
+//         * a -> Cyrillic_a,
+//         * o -> Cyrillic_o,
+//         * u -> Cyrillic_u,
+//         * i -> Cyrillic_i,
+//         * d -> Cyrillic_de,
+//         * h -> Cyrillic_ha,
+//         * t -> Cyrillic_te,
+//         * n -> Cyrillic_en,
+//         * s -> Cyrillic_es,
+//         * p -> Cyrillic_pe,
+//         * y -> Cyrillic_yeru,
+//         * f -> Cyrillic_ef,
+//         * g -> Cyrillic_ghe,
+//         * c -> Cyrillic_tse,
+//         * r -> Cyrillic_er,
+//         * l -> Cyrillic_el,
+// - ...and little more distant:
+//         * AltGr + s (sacute) -> Cyrillic_sha,
+//         * AltGr + z (zabovedot) -> Cyrillic_zhe,
+//         * AltGr + c (cacute) -> Cyrillic_che,
+// - the soft versions of Russian vowels are accessible through AltGr + vowel:
+//         * AltGr + a -> Cyrillic_ya,
+//         * AltGr + o -> Cyrillic_io,
+//         * AltGr + u -> Cyrillic_yu,
+// - ...except for Cyrillic_ie which is more frequently used than Cyrillic_e:
+//         * AltGr + e -> Cyrillic_e,
+//         * e -> Cyrillic_ie,
+// - q is also mapped to Cyrillic_ya, following the US phonetic keyboard
+//   choice, as Cyrillic_ya and Cyrillic_a are both often used:
+//         * q -> Cyrillic_ya,
+// - the soft and hard symbols that have no Polish counterparts are mapped
+//   to rarely used in Polish x character:
+//         * x -> Cyrillic_softsign
+//         * AltGr + x -> Cyrillic_hardsign,
+// - the soft sign is additionally available as AltGr + consonant combination
+//   for every consonant that can be softened or separated by soft sign:
+//         * AltGr + l -> Cyrillic_softsign,
+//         * AltGr + d -> Cyrillic_softsign,
+//         * AltGr + n -> Cyrillic_softsign,
+//         * AltGr + r -> Cyrillic_softsign,
+//         * AltGr + t -> Cyrillic_softsign,
+//         * AltGr + p -> Cyrillic_softsign,
+// - ...and also because of visual similarity under level3 b:
+//         * AltGr + b -> Cyrillic_softsign,
+//         * Shift + AltGr + b -> Cyrillic_hardsign,
+// - the Cyrillic_shcha symbol is placed under AltGr + w (visual similarity):
+//         * AltGr + w -> Cyrillic_shcha
+// - v, also rarely unused in Polish is mapped like w:
+//         * v -> Cyrillic_ve,
+//
+partial alphanumeric_keys
+xkb_symbols "ru_phonetic_dvorak" {
+   include "us(dvorak)"
+
+   name[Group1] = "Poland - Russian phonetic Dvorak";
+
+   // lower row
+   key <AB02> { [ Cyrillic_ya, Cyrillic_YA ] };
+   key <AB03> { [ Cyrillic_shorti, Cyrillic_SHORTI ] };
+   key <AB04> { [ Cyrillic_ka, Cyrillic_KA ] };
+   key <AB05> { [ Cyrillic_shcha, Cyrillic_SHCHA ] };
+   key <AB06> { [ Cyrillic_be, Cyrillic_BE, Cyrillic_hardsign, Cyrillic_HARDSIGN ] };
+   key <AB07> { [ Cyrillic_em, Cyrillic_EM ] };
+   key <AB08> { [ Cyrillic_ve, Cyrillic_VE, Cyrillic_shcha, Cyrillic_SHCHA ] };
+   key <AB09> { [ Cyrillic_ve, Cyrillic_VE, Cyrillic_shcha, Cyrillic_SHCHA ] };
+   key <AB10> { [ Cyrillic_ze, Cyrillic_ZE, Cyrillic_zhe, Cyrillic_ZHE ] };
+   // home row
+   key <AC01> { [ Cyrillic_a, Cyrillic_A, Cyrillic_ya, Cyrillic_YA  ] };
+   key <AC02> { [ Cyrillic_o, Cyrillic_O, Cyrillic_io, Cyrillic_IO ] };
+   key <AC03> { [ Cyrillic_ie, Cyrillic_IE, Cyrillic_e, Cyrillic_E ] };
+   key <AC04> { [ Cyrillic_u, Cyrillic_U, Cyrillic_yu, Cyrillic_YU  ] };
+   key <AC05> { [ Cyrillic_i, Cyrillic_I ] };
+   key <AC06> { [ Cyrillic_de, Cyrillic_DE, Cyrillic_softsign, Cyrillic_SOFTSIGN ] };
+   key <AC07> { [ Cyrillic_ha, Cyrillic_HA ] };
+   key <AC08> { [ Cyrillic_te, Cyrillic_TE, Cyrillic_softsign, Cyrillic_SOFTSIGN ] };
+   key <AC09> { [ Cyrillic_en, Cyrillic_EN, Cyrillic_softsign, Cyrillic_SOFTSIGN ] };
+   key <AC10> { [ Cyrillic_es, Cyrillic_ES, Cyrillic_sha, Cyrillic_SHA ] };
+   // upper row
+   key <AD04> { [ Cyrillic_pe, Cyrillic_PE, Cyrillic_softsign, Cyrillic_SOFTSIGN ] };
+   key <AD05> { [ Cyrillic_yeru, Cyrillic_YERU ] };
+   key <AD06> { [ Cyrillic_ef, Cyrillic_EF ] };
+   key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE ] };
+   key <AD08> { [ Cyrillic_tse, Cyrillic_TSE, Cyrillic_che, Cyrillic_CHE ] };
+   key <AD09> { [ Cyrillic_er, Cyrillic_ER, Cyrillic_softsign, Cyrillic_SOFTSIGN ] };
+   key <AD10> { [ Cyrillic_el, Cyrillic_EL, Cyrillic_softsign, Cyrillic_SOFTSIGN ] };
+
+   include "kpdl(comma)"
+
+   include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/pt b/xorg-server/xkbdata.src/symbols/pt
new file mode 100644
index 000000000..ba141b3c0
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/pt
@@ -0,0 +1,224 @@
+// $XKeyboardConfig$
+
+// based on a keyboard map from an 'xkb/symbols/pt' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pt,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin(type4)"
+
+    name[Group1]="Portugal";
+
+    key <LSGT>  { [      less,    greater ] };
+    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)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    include "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 "pt(Sundeadkeys)" // for consistent naming
+
+    name[Group1]="Portugal - Sun dead keys";
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    include "pt(basic)" // for consistent naming
+
+    name[Group1]="Portugal - Eliminate dead keys";
+
+    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 ]	};
+};
+
+// mac version from Ricardo Cabral <bfe00991@mail.telepac.pt>
+// Copied from macintosh_vndr/pt
+partial alphanumeric_keys 
+xkb_symbols "mac" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple Portuguese keybaord
+
+    include "pt"
+    name[Group1]= "Portugal - Macintosh";
+
+    key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};
+    key <AE08>	{ [         8,  parenleft,  bracketleft,    braceleft ]	};
+    key <AE09>	{ [         9, parenright, bracketright,   braceright ]	};
+    key <AE12>	{ [      plus,   asterisk, dead_diaeresis     ]	};
+    key <AC11>	{ [ dead_tilde, dead_circumflex       ]	};
+    key <AD11>	{ [ masculine, ordfeminine            ]	};
+    key <BKSL>	{ [ backslash,        bar,   dead_grave,   dead_breve ]	};
+    key <TLDE>	{ [     grave, asciitilde,      notsign,      notsign ]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "mac_sundeadkeys" {
+    include "pt(mac)"
+    name[Group1]= "Portugal - Macintosh, Sun dead keys";
+    
+    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 "mac_nodeadkeys" {
+    include "pt(mac)"
+    name[Group1]= "Portugal - Macintosh, eliminate dead keys";
+
+    key <AE12> {	[	     plus,        asterisk, 	 quotedbl,        quotedbl      ]	};
+    key <AC11> {	[      asciitilde,     asciicircum	]	};
+    key <AD12> {	[	    acute,           grave 	]	};
+};
+
+
+//
+// Teclado Nativo Portugues                                2005-07-19
+// Portuguese Nativo Keyboard
+//      This is a Dvorak-based layout, designed for the Portuguese language
+//
+// Ari Caldeira     ari@tecladobrasileiro.com.br
+//
+partial alphanumeric_keys
+xkb_symbols "nativo" {
+
+    name[Group1]="Portugal - Nativo";
+
+// Numeric row
+    key <TLDE> { [         plus,        asterisk,       dead_diaeresis,        plusminus ] };
+    key <AE01> { [            1,          exclam,          onesuperior,       exclamdown ] };
+    key <AE02> { [            2,        quotedbl,                   at,      twosuperior ] };
+    key <AE03> { [            3,      numbersign,             sterling,    threesuperior ] };
+    key <AE04> { [            4,          dollar,              section,       onequarter ] };
+    key <AE05> { [            5,         percent,                 cent,       0x01002030 ] };
+    key <AE06> { [            6,       ampersand,              notsign,        diaeresis ] };
+    key <AE07> { [            7,           slash,            braceleft,       0x0100032D ] };
+    key <AE08> { [            8,       parenleft,          bracketleft,       0x01000331 ] };
+    key <AE09> { [            9,      parenright,         bracketright,        dead_horn ] };
+    key <AE10> { [            0,           equal,           braceright,        dead_hook ] };
+    key <AE11> { [    masculine,     ordfeminine,          dead_ogonek,       0x01000326 ] };
+    key <AE12> { [         less,         greater,         dead_cedilla,   dead_abovering ] };
+
+// Upper row
+    key <AD01> { [   apostrophe,        question,               degree,     questiondown ] };
+    key <AD02> { [        comma,       semicolon,           0x01000329,       0x01000315 ] };
+    key <AD03> { [       period,           colon,           0x01002022,   periodcentered ] };
+    key <AD04> { [            h,               H,            paragraph,        paragraph ] };
+    key <AD05> { [            x,               X,             multiply,         division ] };
+    key <AD06> { [            w,               W,               ubreve,           Ubreve ] };
+    key <AD07> { [            l,               L,              lstroke,          Lstroke ] };
+    key <AD08> { [            t,               T,            trademark,        trademark ] };
+    key <AD09> { [            c,               C,            copyright,        copyright ] };
+    key <AD10> { [            p,               P,                thorn,            THORN ] };
+    key <AD11> { [   dead_tilde, dead_circumflex,           dead_caron, dead_doubleacute ] };
+    key <AD12> { [        minus,      underscore,           0x01002015,       0x01000336 ] };
+
+// Central row
+    key <AC01> { [            i,               I,             idotless,        Iabovedot ] };
+    key <AC02> { [            e,               E,             EuroSign,         EuroSign ] };
+    key <AC03> { [            a,               A,                   ae,               AE ] };
+    key <AC04> { [            o,               O,                   oe,               OE ] };
+    key <AC05> { [            u,               U,               oslash,         Ooblique ] };
+    key <AC06> { [            m,               M,                   mu,               mu ] };
+    key <AC07> { [            d,               D,                  eth,              ETH ] };
+    key <AC08> { [            s,               S,               ssharp,           ssharp ] };
+    key <AC09> { [            r,               R,           registered,       registered ] };
+    key <AC10> { [            n,               N,                  eng,              ENG ] };
+    key <AC11> { [   dead_acute,      dead_grave,          dead_macron,       dead_breve ] };
+    key <BKSL> { [    backslash,             bar,        dead_belowdot,    dead_abovedot ] };
+
+// Lower row
+    key <LSGT> { [ guillemotleft, guillemotright,           0x01002039,       0x0100203A ] };
+    key <AB01> { [            y,               Y,                  yen,              yen ] };
+    key <AB02> { [     ccedilla,        Ccedilla                                         ] };
+    key <AB03> { [            j,               J,           0x01000292,       0x010001B7 ] };
+    key <AB04> { [            b,               B,           apostrophe,         quotedbl ] };
+    key <AB05> { [            k,               K,             currency,        brokenbar ] };
+    key <AB06> { [            q,               Q,           0x01000259,       0x0100018F ] };
+    key <AB07> { [            v,               V,   doublelowquotemark, singlelowquotemark ] };
+    key <AB08> { [            g,               G,  leftdoublequotemark, leftsinglequotemark ] };
+    key <AB09> { [            f,               F, rightdoublequotemark, rightsinglequotemark ] };
+    key <AB10> { [            z,               Z,           0x0100201F,       0x0100201B ] };
+
+    key <SPCE> { [        space,           space,         nobreakspace,     nobreakspace ] };
+
+// Configures the use of the AltGr key
+    include "level3(ralt_switch)"
+
+};
+
+
+//
+// Teclado Nativo Portugues para o teclado estadunidense   2005-07-19
+// Portuguese Nativo Keyboard for USA keyboards
+//
+// Ari Caldeira     ari@tecladobrasileiro.com.br
+//
+partial alphanumeric_keys
+xkb_symbols "nativo-us" {
+    include "pt(nativo)"
+
+    name[Group1]="Portugal - Nativo for USA keyboards";
+
+// Lower row
+    key <AB01> { [            y,               Y,              ccedilla,        Ccedilla ] };
+    key <AB02> { [ guillemotleft, guillemotright,           0x01002039,       0x0100203A ] };
+
+};
+
+
+//
+// Teclado Nativo Portugues para digitacao em Esperanto    2005-07-19
+// Portuguese Nativo Keyboard for typing Esperanto
+//
+// Ari Caldeira     ari@tecladobrasileiro.com.br
+//
+partial alphanumeric_keys
+xkb_symbols "nativo-epo" {
+    include "pt(nativo)"
+
+    name[Group1]="Portugal - Nativo for Esperanto";
+
+// Upper row Esperanto
+    key <AD04> { [            h,               H,          hcircumflex,      Hcircumflex ] };
+    key <AD05> { [  ccircumflex,     Ccircumflex,                    x,                X ] };
+    key <AD06> { [       ubreve,          Ubreve,                    w,                W ] };
+
+// Lower row Esperanto
+    key <AB01> { [  jcircumflex,     Jcircumflex,                    y,                Y ] };
+    key <AB02> { [  scircumflex,     Scircumflex,             ccedilla,         Ccedilla ] };
+    key <AB06> { [  gcircumflex,     Gcircumflex,                    q,                Q ] };
+
+};
\ No newline at end of file
diff --git a/xorg-server/xkbdata.src/symbols/ro b/xorg-server/xkbdata.src/symbols/ro
new file mode 100644
index 000000000..e4ed70585
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/ro
@@ -0,0 +1,195 @@
+// $XKeyboardConfig$
+// $XFree86: xc/programs/xkbcomp/symbols/ro,v 1.6 2003/09/08 13:12:51 pascal Exp $
+//
+// Complete set of Romanian keyboards as described in the new Romanian standard
+// SR 13392:2004 adopted in December 2004 by ASRO, "Asociatia de Standardizare 
+// din Romania".
+// 
+// The default mapping is the RO_US/Programmers layout because of the lack of 
+// Romanian hardware keyboards. The primary standard layout is implemented as 
+// the "std" variant. If you're determined to get cedillas as in ISO-8859-2  
+// (and not commabelow accents as in ISO-8859-16) use the defined variants 
+// "cedilla" for the default layout or "std_cedilla" for the standard one. 
+// Pre-Vista MS compatible layout included (use the "winkeys" variant).
+// 
+// Created by Cristian Gafton, <gafton@redhat.com> (C) 2000
+// Modified by Marius Andreiana, <mandreiana@yahoo.com> (C) 2001
+// Completed by Misu Moldovan, <dumol@gnome.ro> (C) 2001, 2004-2008.
+// v 1.4
+
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+// This RO_US/Programmers layout, although the secondary layout in the 
+// Romanian standard, has always been the "de facto" standard in the 
+// Linux/Unix world. It is implemented here as the default layout and it's
+// fully compatible with an US keyboard (Euro on AltGr+5 doesn't count).
+
+    include "us"
+
+    name[Group1]="Romania";
+
+    key <AE01> { [ 1,                 exclam,  dead_tilde		  ] };
+    key <AE02> { [ 2,                     at,  dead_caron		  ] };
+    key <AE03> { [ 3,             numbersign,  dead_circumflex 	  	  ] };
+    key <AE04> { [ 4,                 dollar,  dead_breve		  ] };
+    key <AE05> { [ 5,                percent,  dead_abovering		  ] };
+    key <AE06> { [ 6,            asciicircum,  dead_ogonek		  ] };
+    key <AE07> { [ 7,              ampersand,  dead_grave		  ] };
+    key <AE08> { [ 8,               asterisk,  dead_abovedot		  ] };
+    key <AE09> { [ 9,              parenleft,  dead_acute		  ] };
+    key <AE10> { [ 0,             parenright,  dead_doubleacute	  	  ] };
+    key <AE11> { [ minus,         underscore,  dead_diaeresis,     endash ] };
+    key <AE12> { [ equal,               plus,  dead_cedilla,    plusminus ] };
+    key <AD01> { [ q,                      Q,  acircumflex,   Acircumflex ] };
+    key <AD02> { [ w,                      W,  ssharp	 	          ] };
+    key <AD03> { [ e,                      E,  EuroSign  	          ] };
+    key <AD05> { [ t,                      T,  0x100021b,       0x100021a ] };
+    key <AD08> { [ i,                      I,  icircumflex,   Icircumflex ] };
+    key <AD10> { [ p,                      P,  section 			  ] };
+    key <AD11> { [ bracketleft,    braceleft,  doublelowquotemark 	  ] };
+    key <AD12> { [ bracketright,  braceright,  rightdoublequotemark 	  ] };
+    key <AC01> { [ a,                      A,  abreve,             Abreve ] };
+    key <AC02> { [ s,                      S,  0x1000219,       0x1000218 ] };
+    key <AC03> { [ d,                      D,  dstroke,  	  Dstroke ] };
+    key <AC09> { [ l,                      L,  lstroke,  	  Lstroke ] };
+    key <LSGT> { [ backslash,            bar                              ] };
+    key <AB03> { [ c,                      C,  copyright 	       	  ] };
+    key <AB08> { [ comma, 	        less,  guillemotleft	          ] };
+    key <AB09> { [ period, 	     greater,  guillemotright 	          ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "cedilla" {
+    // Variant of the basic layout with cedillas.
+    // Implements S and T with cedilllas as in ISO-8859-2.
+    // Included for compatibility reasons (this used to be the def variant).
+
+    include "ro(basic)"
+
+    name[Group1]="Romania - Cedilla";
+
+    key <AD05> { [ t,                      T,  tcedilla,	 Tcedilla ] };
+    key <AC02> { [ s,                      S,  scedilla,	 Scedilla ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "std" {
+    // Primary layout in the new Romanian standard.
+    // Implemented here as a variant because of the lack of hardware 
+    // Romanian keyboards and because of the predilection of Romanian
+    // X users towards the secondary layout from the new standard.
+
+    include "us"
+
+    name[Group1]="Romania - Standard";
+
+    key <TLDE> { [ doublelowquotemark, rightdoublequotemark, grave, asciitilde ] };
+    key <AE01> { [ 1,                 exclam,  dead_tilde		  ] };
+    key <AE02> { [ 2,                     at,  dead_caron		  ] };
+    key <AE03> { [ 3,             numbersign,  dead_circumflex 	  	  ] };
+    key <AE04> { [ 4,                 dollar,  dead_breve		  ] };
+    key <AE05> { [ 5,                percent,  dead_abovering		  ] };
+    key <AE06> { [ 6,            asciicircum,  dead_ogonek		  ] };
+    key <AE07> { [ 7,              ampersand,  dead_grave		  ] };
+    key <AE08> { [ 8,               asterisk,  dead_abovedot		  ] };
+    key <AE09> { [ 9,              parenleft,  dead_acute		  ] };
+    key <AE10> { [ 0,             parenright,  dead_doubleacute	  	  ] };
+    key <AE11> { [ minus,         underscore,  dead_diaeresis,     endash ] };
+    key <AE12> { [ equal,               plus,  dead_cedilla,    plusminus ] };
+    key <AD03> { [ e,                      E,  EuroSign  	          ] };
+    key <AD10> { [ p,                      P,  section 			  ] };
+    key <AD11> { [ abreve, 	      Abreve,  bracketleft,     braceleft ] };
+    key <AD12> { [ icircumflex,  Icircumflex,  bracketright,   braceright ] };
+    key <BKSL> { [ acircumflex,  Acircumflex,  backslash,             bar ] };
+    key <AC02> { [ s, 			   S,  ssharp			  ] };
+    key <AC03> { [ d,                      D,  dstroke,  	  Dstroke ] };
+    key <AC09> { [ l,                      L,  lstroke,  	  Lstroke ] };
+    key <AC10> { [ 0x1000219,	   0x1000218,  semicolon, 	    colon ] };
+    key <AC11> { [ 0x100021b,	   0x100021a,  apostrophe, 	 quotedbl ] };
+    key <LSGT> { [ backslash,            bar                              ] };
+    key <AB03> { [ c,                      C,  copyright 	       	  ] };
+    key <AB08> { [ comma, 	   semicolon,  less, 	    guillemotleft ] };
+    key <AB09> { [ period,             colon,  greater,    guillemotright ] };
+
+    key <KPDL> { [ KP_Delete,   KP_Separator ] };
+
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "std_cedilla" {
+    // Variant of the "std" layout with cedillas.
+    // Implements S and T with cedillas as in ISO-8859-2.
+    // Included for compatibility reasons.
+
+    include "ro(std)"
+
+    name[Group1]="Romania - Standard (Cedilla)";
+
+    key <AC10> { [ scedilla, 	    Scedilla ] };
+    key <AC11> { [ tcedilla, 	    Tcedilla ] };
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "winkeys" {
+    // 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 "latin"
+
+    name[Group1]="Romania - Winkeys";
+
+    // 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"
+    include "kpdl(comma)"
+    // End "Keypad" section
+
+    include "level3(ralt_switch)"
+
+};
diff --git a/xorg-server/xkbdata.src/symbols/rs b/xorg-server/xkbdata.src/symbols/rs
new file mode 100644
index 000000000..673b143fb
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/rs
@@ -0,0 +1,261 @@
+// Bosnian, Croatian, Serbian and Slovenian XKB keyboard mapping
+// (derived from "Danube" D.2)
+//
+// Danube D.2 from 2003-05-12 is available at http://srpski.org/dunav/
+//
+// Original authors:
+//  Danilo Segan (Данило Шеган) <danilo@kvota.net>
+//  Chusslove Illich (Ча�лав Илић) <chaslav@sezampro.yu>
+//
+// Danilo Segan <danilo@kvota.net>:
+// - Modified for inclusion in XFree86
+// - Further modifications on 2005-08-18 to support Bosnian, Croatian
+//   and Slovenian in xkeyboard-config
+//  
+// $XKeyboardConfig$
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+  name[Group1]= "Serbia";
+
+  include "rs(level3)"
+  include "rs(common)"
+  include "rs(cyralpha)"
+  include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "latin" {
+
+  name[Group1]= "Serbia - Latin";
+
+  include "latin(type3)"
+  include "rs(latalpha)"
+  include "rs(level3)"
+  include "rs(common)"
+  include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "yz" {
+  // Cyrillic_zhe and Cyrillic_ze swapped.
+
+  name[Group1]= "Serbia - Z and ZHE swapped";
+
+  include "rs(basic)"
+
+  key <AD06> {   [ Cyrillic_zhe,        Cyrillic_ZHE,   any,any ]   }; // y
+  key <AB01> {   [ Cyrillic_ze,         Cyrillic_ZE,    any,any ]   }; // z
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "common" {
+  // "Common" keys: keys which are same for both latin and cyrillic keyboards
+
+  key.type[Group1] = "FOUR_LEVEL";
+
+  key <TLDE> {   [ quoteleft,           asciitilde,    any,any ]   }; //
+  key <AE01> {   [ 1,                   exclam,        any,any ]   }; //
+  key <AE02> {   [ 2,                   quotedbl,      any,any ]   }; //
+  key <AE03> {   [ 3,                   numbersign,    any,any ]   }; //
+  key <AE04> {   [ 4,                   dollar,        any,any ]   }; //
+  key <AE05> {   [ 5,                   percent,       any,any ]   }; //
+  key <AE06> {   [ 6,                   ampersand,     any,any ]   }; //
+  key <AE07> {   [ 7,                   slash,         any,any ]   }; //
+  key <AE08> {   [ 8,                   parenleft,     any,any ]   }; //
+  key <AE09> {   [ 9,                   parenright,    any,any ]   }; //
+  key <AE10> {   [ 0,                   equal,         any,any ]   }; //
+  key <AE11> {   [ apostrophe,          question,      any,any ]   }; //
+  key <AE12> {   [ plus,                asterisk,      any,any ]   }; //
+
+  key <AB08> {   [ comma,               semicolon,     any,any ]   }; //
+  key <AB09> {   [ period,              colon,         any,any ]   }; //
+  key <AB10> {   [ minus,               underscore,    any,any ]   }; //
+
+  include "kpdl(comma)"
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "cyralpha" {
+
+  key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
+
+  key <AD01> {   [ Cyrillic_lje,        Cyrillic_LJE,   any,any ]   }; // q
+  key <AD02> {   [ Cyrillic_nje,        Cyrillic_NJE,   any,any ]   }; // w
+  key <AD03> {   [ Cyrillic_ie,         Cyrillic_IE,    any,any ]   }; // e
+  key <AD04> {   [ Cyrillic_er,         Cyrillic_ER,    any,any ]   }; // r
+  key <AD05> {   [ Cyrillic_te,         Cyrillic_TE,    any,any ]   }; // t
+  key <AD06> {   [ Cyrillic_ze,         Cyrillic_ZE,    any,any ]   }; // y
+  key <AD07> {   [ Cyrillic_u,          Cyrillic_U,     any,any ]   }; // u
+  key <AD08> {   [ Cyrillic_i,          Cyrillic_I,     any,any ]   }; // i
+  key <AD09> {   [ Cyrillic_o,          Cyrillic_O,     any,any ]   }; // o
+  key <AD10> {   [ Cyrillic_pe,         Cyrillic_PE,    any,any ]   }; // p
+  key <AD11> {   [ Cyrillic_sha,        Cyrillic_SHA,   any,any ]   }; // [ {
+  key <AD12> {   [ Serbian_dje,         Serbian_DJE,    any,any ]   }; // ] }
+
+  key <AC01> {   [ Cyrillic_a,          Cyrillic_A,     any,any ]   }; // a
+  key <AC02> {   [ Cyrillic_es,         Cyrillic_ES,    any,any ]   }; // s
+  key <AC03> {   [ Cyrillic_de,         Cyrillic_DE,    any,any ]   }; // d
+  key <AC04> {   [ Cyrillic_ef,         Cyrillic_EF,    any,any ]   }; // f
+  key <AC05> {   [ Cyrillic_ghe,        Cyrillic_GHE,   any,any ]   }; // g
+  key <AC06> {   [ Cyrillic_ha,         Cyrillic_HA,    any,any ]   }; // h
+  key <AC07> {   [ Cyrillic_je,         Cyrillic_JE,    any,any ]   }; // j
+  key <AC08> {   [ Cyrillic_ka,         Cyrillic_KA,    any,any ]   }; // k
+  key <AC09> {   [ Cyrillic_el,         Cyrillic_EL,    any,any ]   }; // l
+  key <AC10> {   [ Cyrillic_che,        Cyrillic_CHE,   any,any ]   }; // ; :
+  key <AC11> {   [ Serbian_tshe,        Serbian_TSHE,   any,any ]   }; // ' "
+  key <BKSL> {   [ Cyrillic_zhe,        Cyrillic_ZHE,   any,any ]   }; // \ |
+
+  key <AB01> {   [ Cyrillic_zhe,        Cyrillic_ZHE,   any,any ]   }; // z
+  key <AB02> {   [ Cyrillic_dzhe,       Cyrillic_DZHE,  any,any ]   }; // x
+  key <AB03> {   [ Cyrillic_tse,        Cyrillic_TSE,   any,any ]   }; // c
+  key <AB04> {   [ Cyrillic_ve,         Cyrillic_VE,    any,any ]   }; // v
+  key <AB05> {   [ Cyrillic_be,         Cyrillic_BE,    any,any ]   }; // b
+  key <AB06> {   [ Cyrillic_en,         Cyrillic_EN,    any,any ]   }; // n
+  key <AB07> {   [ Cyrillic_em,         Cyrillic_EM,    any,any ]   }; // m
+};
+
+
+partial hidden alphanumeric_keys
+xkb_symbols "latalpha" {
+
+  key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
+
+  key <AD11> {   [ scaron,              Scaron,        any,any ]   }; //
+  key <AD12> {   [ dstroke,             Dstroke,       any,any ]   }; //
+
+  key <AC10> {   [ ccaron,              Ccaron,        any,any ]   }; //
+  key <AC11> {   [ cacute,              Cacute,        any,any ]   }; //
+  key <BKSL> {   [ zcaron,              Zcaron,        any,any ]   }; //
+
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "twoletter" {
+  // These are letters which are written in latin transcription with two-characters.
+
+  key <AD01> {   type[Group1] = "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC",
+                 [ U1C9,                U1C8,         any,   U1C7 ]   }; // q
+  key <AD02> {   type[Group1] = "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC",
+                 [ U1CC,                U1CB,         any,   U1CA ]   }; // w
+  key <AB02> {   type[Group1] = "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC",
+                 [ U1C6,                U1C5,         any,   U1C4 ]   }; // x
+
+  // Also replace letter Y with Zcaron, since Y is of no use any longer
+  key <AB01> {   [ zcaron,              Zcaron,        any,any ]   }; //
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "level3" {
+  key <TLDE> {   [ any,any,     notsign,             notsign     ]   }; // ` ~
+  key <AE01> {   [ any,any,     dead_tilde,          asciitilde  ]   }; // 1 !
+  key <AE02> {   [ any,any,     dead_caron,          caron 	 ]   }; // 2 @
+  key <AE03> {   [ any,any,     dead_circumflex,     asciicircum ]   }; // 3 #
+  key <AE04> {   [ any,any,     dead_breve,          breve 	 ]   }; // 4 $
+  key <AE05> {   [ any,any,     dead_abovering,      degree	 ]   }; // 5 %
+  key <AE06> {   [ any,any,     dead_ogonek,         ogonek	 ]   }; // 6 ^
+  key <AE07> {   [ any,any,     dead_grave,          grave 	 ]   }; // 7 &
+  key <AE08> {   [ any,any,     dead_abovedot,       abovedot 	 ]   }; // 8 *
+  key <AE09> {   [ any,any,     dead_acute,          apostrophe  ]   }; // 9 (
+  key <AE10> {   [ any,any,     dead_doubleacute,    doubleacute ]   }; // 0 )
+  key <AE11> {   [ any,any,     dead_diaeresis,      diaeresis 	 ]   }; // - _
+  key <AE12> {   [ any,any,     dead_cedilla,        cedilla 	 ]   }; // = +
+
+  key <AD01> {   [ any,any,     backslash,           Greek_OMEGA ]   }; // q
+  key <AD02> {   [ any,any,     bar,                 Lstroke 	 ]   }; // w
+  key <AD03> {   [ any,any,     EuroSign,            EuroSign 	 ]   }; // e
+  key <AD04> {   [ any,any,     paragraph,           registered  ]   }; // r
+  key <AD05> {   [ any,any,     tslash,              Tslash 	 ]   }; // t // ALPHABETIC
+  key <AD06> {   [ any,any,     leftarrow,           yen 	 ]   }; // y
+  key <AD07> {   [ any,any,     downarrow,           uparrow 	 ]   }; // u
+  key <AD08> {   [ any,any,     rightarrow,          idotless 	 ]   }; // i
+  key <AD09> {   [ any,any,     oslash,              Ooblique 	 ]   }; // o // ALPHABETIC
+  key <AD10> {   [ any,any,     thorn,               THORN 	 ]   }; // p // ALPHABETIC
+  key <AD11> {   [ any,any,     division,            dead_abovering ]   }; // [
+  key <AD12> {   [ any,any,     multiply,            dead_macron ]   }; // ]
+
+  key <AC01> {   [ any,any,     ae,            	     AE               ]   }; // a // ALPHABETIC
+  key <AC02> {   [ any,any,     doublelowquotemark,  guillemotright   ]   }; // s
+  key <AC03> {   [ any,any,     leftdoublequotemark, guillemotleft    ]   }; // d
+  key <AC04> {   [ any,any,     bracketleft,         ordfeminine      ]   }; // f
+  key <AC05> {   [ any,any,     bracketright,        ENG 	      ]   }; // g
+  key <AC06> {   [ any,any,     hstroke,             Hstroke 	      ]   }; // h // ALPHABETIC
+  key <AC07> {   [ any,any,     NoSymbol,            NoSymbol 	      ]   }; // j
+  key <AC08> {   [ any,any,     lstroke,             ampersand 	      ]   }; // k
+  key <AC09> {   [ any,any,     lstroke,             Lstroke 	      ]   }; // l
+  key <AC10> {   [ any,any,     dead_acute,          dead_doubleacute ]   }; // ;
+  key <AC11> {   [ any,any,     ssharp,              dead_caron       ]   }; // '
+  key <BKSL> {   [ any,any,     currency,            dead_breve       ]   }; // \
+
+  key <AB01> {   [ any,any,     leftsinglequotemark, guillemotright   ]   }; // z
+  key <AB02> {   [ any,any,     rightsinglequotemark,guillemotleft    ]   }; // x
+  key <AB03> {   [ any,any,     cent,                copyright 	      ]   }; // c
+  key <AB04> {   [ any,any,     at,                  grave 	      ]   }; // v
+  key <AB05> {   [ any,any,     braceleft,           apostrophe       ]   }; // b
+  key <AB06> {   [ any,any,     braceright,          braceright       ]   }; // n
+  key <AB07> {   [ any,any,     asciicircum,         masculine 	      ]   }; // m
+  key <AB08> {   [ any,any,     less,                multiply 	      ]   }; // , <
+  key <AB09> {   [ any,any,     greater,             division 	      ]   }; // . >
+  key <AB10> {   [ any,any,     emdash,              endash   	      ]   }; // / ?
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "latinunicode" {
+  // This mapping supports the Unicode characters 0x1c4-0x1cc (dz, lj, and nj
+  // as single character). You get the title form with AltGr+Shift.
+
+  name[Group1]= "Serbia - Latin Unicode";
+
+  include "rs(latin)"
+  include "rs(twoletter)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "latinyz" {
+  // For those who insist on using "english-position" Z and Y.
+
+  name[Group1]= "Serbia - Latin qwerty";
+
+  include "rs(latin)"
+
+  key <AD06> {   [ y,                   Y,             any,any ]   }; // y
+  key <AB01> {   [ z,                   Z,             any,any ]   }; // z
+};
+
+partial alphanumeric_keys
+xkb_symbols "latinunicodeyz" {
+  // Unicode, ZHE and Z swapped.
+
+  name[Group1]= "Serbia - Latin Unicode qwerty";
+
+  include "rs(latinunicode)"
+
+  key <AD06> {   [ zcaron,              Zcaron,        any,any ]   }; // y
+  key <AB01> {   [ z,                   Z,             any,any ]   }; // z
+};
+
+xkb_symbols "alternatequotes" {
+  // Another acceptable »pair of quotes« for Serbian 
+
+  name[Group1]= "Serbia - With guillemets";
+
+  include "rs(basic)"
+
+  key <AC02> {   [ any,any,     guillemotright, NoSymbol ]   }; // s
+  key <AC03> {   [ any,any,     guillemotleft,  NoSymbol ]   }; // d
+};
+
+xkb_symbols "latinalternatequotes" {
+  // Another acceptable »pair of quotes« for Serbian 
+
+  name[Group1]= "Serbia - Latin with guillemets";
+
+  include "rs(latin)"
+
+  key <AC02> {   [ any,any,     guillemotright, NoSymbol ]   }; // s
+  key <AC03> {   [ any,any,     guillemotleft,  NoSymbol ]   }; // d
+};
diff --git a/xorg-server/xkbdata.src/symbols/ru b/xorg-server/xkbdata.src/symbols/ru
new file mode 100644
index 000000000..110453bf1
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/ru
@@ -0,0 +1,367 @@
+// $XKeyboardConfig$
+
+// based on
+// russian standard keyboard
+// AEN <aen@logic.ru>
+// 2001/12/23 by Leon Kanter <leon@blackcatlinux.com>
+// 2005/12/09 Valery Inozemtsev <shrek@altlinux.ru>
+//
+// $XFree86: xc/programs/xkbcomp/symbols/ru,v 1.3 2003/02/15 22:27:05 dawes Exp $
+
+// Windows layout
+partial default alphanumeric_keys
+xkb_symbols "winkeys" {
+    include "ru(common)"
+
+    name[Group1]= "Russia";
+
+    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 hidden alphanumeric_keys 
+xkb_symbols "common" {
+
+    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	<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	<AB05> {	[      Cyrillic_i,	Cyrillic_I	]	};
+    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	]	};
+    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
+    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};
+    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
+
+    key.type[group1]="TWO_LEVEL";
+
+    include "kpdl(comma)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "legacy" {
+    include "ru(common)"
+
+    name[Group1]= "Russia - Legacy";
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+    include "ru(common)"
+
+    key        <TLDE> {        [          0x01000451,          0x01000401, grave       ]       }; // Ñ‘, �
+    key <AE03> {        [               3,      numbersign, 0x01002116      ]       }; // â„–
+    key <AE04> {        [               4,          dollar, semicolon   ]       };
+    key <AE06> {        [               6,      asciicircum, colon      ]       };
+    key <AE07> {        [               7,          ampersand           ]       };
+    key <AE09> {        [               9,          parenleft, acute    ]       };
+    key <AC12> {        [       backslash,          bar, slash          ]       };
+
+    include "group(olpc)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "typewriter" {
+    include "ru(common)"
+    name[Group1]= "Russia - Typewriter";
+    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	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	]	};
+    key	<AB10> {	[     Cyrillic_io,     Cyrillic_IO	]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "phonetic" {
+
+    name[Group1]= "Russia - Phonetic";
+
+    key	<AE01> {	[		1,	    exclam 	]	};
+    key	<AE02> {	[		2,        	at	]	};
+    key	<AE03> {	[		3,     Cyrillic_io 	]	};
+    key	<AE04> {	[		4,     Cyrillic_IO	]	};
+    key	<AE05> {	[		5, Cyrillic_hardsign   	]	};
+    key	<AE06> {	[		6, Cyrillic_HARDSIGN	]	};
+    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	<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	<AD11> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};
+    key	<AE12> {	[    Cyrillic_che,    Cyrillic_CHE	]	};
+    key	<AD12> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	]	};
+    key	<BKSL> {	[      Cyrillic_e,	Cyrillic_E	]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "tt" {
+    include "ru(winkeys)"
+    name[Group1]= "Russia - Tatar";
+
+    key.type[group1]="FOUR_LEVEL";
+
+    key <TLDE> {       [      0x010004bb,      0x010004ba,
+                             Cyrillic_io,     Cyrillic_IO      ]       };
+    key        <AD02> {        [      0x010004e9,      0x010004e8,
+                            Cyrillic_tse,    Cyrillic_TSE      ]       };
+    key        <AD09> {        [      0x010004d9,      0x010004d8,
+                          Cyrillic_shcha,  Cyrillic_SHCHA      ]       };
+    key        <AD12> {        [      0x010004af,      0x010004ae,
+                       Cyrillic_hardsign,Cyrillic_HARDSIGN     ]       };
+    key        <AC10> {        [      0x010004a3,      0x010004a2,
+                            Cyrillic_zhe,    Cyrillic_ZHE      ]       };
+    key        <AB07> {        [      0x01000497,      0x01000496,
+                       Cyrillic_softsign,Cyrillic_SOFTSIGN     ]       };
+
+    include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys 
+xkb_symbols "os_legacy" {
+    include "ru(common)"
+
+    name[Group1]= "Russia - Ossetian, legacy";
+
+    key	<TLDE> {	[      Cyrillic_e,      Cyrillic_E	]	};
+    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O, Cyrillic_io, Cyrillic_IO	]	};
+    key	<AC11> {	[      0x010004D5,      0x010004D4      ]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "os_winkeys" {
+    include "ru(winkeys)"
+
+    name[Group1]= "Russia - Ossetian, Winkeys";
+
+    key	<TLDE> {	[      Cyrillic_e,      Cyrillic_E	]	};
+    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O, Cyrillic_io, Cyrillic_IO	]	};
+    key	<AC11> {	[      0x010004D5,      0x010004D4      ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "cv" {
+    include "ru(winkeys)"
+
+    name[Group1]= "Russia - Chuvash";
+
+    key.type[group1]="FOUR_LEVEL";
+
+    key        <AD03> {        [      Cyrillic_u,	Cyrillic_U,
+                            0x010004f3,    0x010004f2      ]       };
+    key        <AD05> {        [      Cyrillic_ie,     Cyrillic_IE,
+                       0x01000115,	0x01000114     ]       };
+    key        <AC04> {        [      Cyrillic_a,	Cyrillic_A,
+                          abreve,  Abreve      ]       };
+    key        <AB03> {        [      Cyrillic_es,     Cyrillic_ES,
+                            ccedilla,    Ccedilla      ]       };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "udm" {
+    include "ru(winkeys)"
+
+    name[Group1]= "Russia - Udmurt";
+
+    key.type[group1]="FOUR_LEVEL";
+
+    key	<AE01> {	[	 question,	    exclam,    1,       1 	]	};
+    key	<AE02> {	[	parenleft,        quotedbl,    2,       2	]	};
+    key	<AE03> {	[      parenright,      numbersign,    3,       3	]	};
+    key	<AE04> {	[	    colon,       semicolon,    4,       4	]	};
+    key	<AE05> {	[	 asterisk,	   percent,    5,       5	]	};
+    key	<AE06> {	[      0x010004dd,	0x010004dc,    6,       6	]	};
+    key	<AE07> {	[      0x010004e7,	0x010004e6,    7,       7	]	};
+    key	<AE08> {	[      0x010004f5,	0x010004f4,    8,       8	]	};
+    key	<AE09> {	[      0x010004e5,	0x010004e4,    9,       9	]	};
+    key	<AE10> {	[      0x010004df,	0x010004de,    0,       0	]	};
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "cv_latin" {
+    include "us(alt-intl)"
+
+    name[Group1]= "Russia - Chuvash Latin";
+
+    key.type[group1]="FOUR_LEVEL";
+
+    key        <AD01> {	[	  q,	Q,    0x01000161,       0x01000160 ] };
+    key        <AD02> {	[	  w,	W,    udiaeresis,       Udiaeresis ] };
+    key        <AD03> { [         e,	E,    0x01000115,	0x01000114 ] };
+    key        <AD07> {	[	  u,	U,    udiaeresis,       Udiaeresis ] };
+    key        <AD08> {	[	  i,	I,    0x0100012d,       0x0100012c ] };
+    key        <AD09> {	[	  o,	O,    odiaeresis,       Odiaeresis ] };
+    key        <AC01> { [	  a,    A,        abreve,           Abreve ] };
+    key        <AC02> { [	  s,    S,      scedilla,         Scedilla ] };
+    key        <AC05> { [	  g,    G,        gbreve,           Gbreve ] };
+    key        <AC07> { [	  j,    J,    0x01000131,       0x01000130 ] };
+    key        <AB03> { [         c,    C,      ccedilla,         Ccedilla ] };
+
+    include "level3(ralt_switch)"
+
+};
+
+// Komi language layout
+// based on
+// russian standard keyboard
+// Vlad Shakhov <lumpen.intellectual@gmail.com>
+// Last Changes 2007/10/23 by Vlad Shakhov <lumpen.intellectual@gmail.com>
+
+partial alphanumeric_keys 
+xkb_symbols "kom" {
+
+    include "ru(winkeys)"
+
+    name[Group1]= "Russia - Komi";
+
+    key.type[group1]="FOUR_LEVEL_ALPHABETIC";
+
+// cyrilllic o with diaeresis 
+    key	<AC07> { [ 	Cyrillic_o,		Cyrillic_O,		
+			U04E7,  		U04E6		] };
+    
+// hard I as additional key for soft Cyrillic_I 
+    key <AB05> { [      Cyrillic_i,		Cyrillic_I,
+			Ukrainian_i,     	Ukrainian_I     ] };
+
+    include "level3(ralt_switch)"
+};
+
+// Yakut language layout
+// 2008/04/23 Yakov Aleksandrov <bertjickty@yandex.ru>
+// 2008/04/23 Anatoliy Zhozhikov <jav@sitc.ru>
+// 2008/04/23 Aleksandr Varlamov
+partial alphanumeric_keys
+xkb_symbols "sah" {
+
+    include "ru(winkeys)"
+
+    name[Group1]= "Russia - Yakut";
+
+    key.type[group1]="FOUR_LEVEL_ALPHABETIC";
+
+    key <TLDE> { [	Cyrillic_io,		Cyrillic_IO,
+    			U04EB,			U04EA			] };
+    key <AD01> { [	Cyrillic_shorti,	Cyrillic_SHORTI,
+			U048B,			U048A			] };
+    key <AD03> { [	Cyrillic_u,		Cyrillic_U,
+			Cyrillic_u_straight,	Cyrillic_U_straight	] };
+    key <AD04> { [	Cyrillic_ka,		Cyrillic_KA,
+    			U04C4,			U04C3			] };
+    key <AD06> { [	Cyrillic_en,		Cyrillic_EN,
+			U04A5,			U04A4			] };
+    key <AD07> { [	Cyrillic_ghe,		Cyrillic_GHE,
+			U0495,			U0494			] };
+    key <AD10> { [	Cyrillic_ze,		Cyrillic_ZE,
+    			U04E1,			U04E0			] };
+    key <AD11> { [	Cyrillic_ha,		Cyrillic_HA,
+			Cyrillic_shha,		Cyrillic_SHHA		] };
+    key <AC07> { [	Cyrillic_o,		Cyrillic_O,
+			Cyrillic_o_bar,		Cyrillic_O_bar		] };
+    key <AC10> { [	Cyrillic_zhe,		Cyrillic_ZHE,
+    			U0461,			U0460			] };
+    key <AB02> { [	Cyrillic_che,		Cyrillic_CHE,
+    			Cyrillic_u_macron,	Cyrillic_U_macron	] };
+    key <AB04> { [	Cyrillic_em,		Cyrillic_EM,
+    			U04C8,			U04C7			] };
+    key <AB05> { [	Cyrillic_i,		Cyrillic_I,
+			Cyrillic_i_macron,	Cyrillic_I_macron	] };
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/se b/xorg-server/xkbdata.src/symbols/se
new file mode 100644
index 000000000..427b89996
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/se
@@ -0,0 +1,256 @@
+
+// based on a keyboard map from an 'xkb/symbols/se' file
+//
+// $XKeyboardConfig$
+// $XFree86: xc/programs/xkbcomp/symbols/se,v 1.5 2003/01/26 02:01:48 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    include "latin(type2)"
+    include "se(se)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "se" {
+
+    name[Group1]="Sweden";
+
+    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 ]	};
+
+    include "kpdl(comma)"
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic Swedish layout to eliminate all dead keys
+
+    include "latin(type2)"
+    include "latin(type2_nodeadkeys)"
+    include "se(se)"
+
+    name[Group1]="Sweden - Eliminate dead keys";
+
+    key <AE12>	{ [     acute,      grave,    plusminus,      notsign ]	};
+
+};
+
+// Swedish Dvorak
+partial alphanumeric_keys 
+xkb_symbols "dvorak" {
+
+    name[Group1]="Sweden - Dvorak";
+
+    include "se(basic)"
+
+    key <AD01> { [     aring,      Aring,    backslash		     ]	};
+    key <AD02> { [  adiaeresis,	Adiaeresis,  braceleft,  bracketleft ]	};
+    key <AD03> { [ odiaeresis, Odiaeresis,  braceright, bracketright ]	};
+    key <AD04> { [         p,          P,        thorn,        THORN ]	};
+    key <AD05> { [         y,          Y,    leftarrow,          yen ]	};
+    key <AD06> { [         f,          F,      dstroke,  ordfeminine ]	};
+    key <AD07> { [         g,          G,          eng,          ENG ]	};
+    key <AD08> { [         c,          C,    copyright,    copyright ]	};
+    key <AD09> { [         r,          R,   registered,   registered ]	};
+    key <AD10> { [         l,          L,      lstroke,      Lstroke ]	};
+    key <AD11> { [     comma,  semicolon, dead_cedilla,  dead_ogonek ]	};
+    key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde,	asciicircum	]	};
+
+    key <AC01> { [         a,          A,           ae,           AE ]	};
+    key <AC02> { [         o,          O,           oe,           OE ]	};
+    key <AC03> { [         e,          E,     EuroSign,         cent ]	};
+    key <AC04> { [         u,          U,    downarrow,      uparrow ]	};
+    key <AC05> { [         i,          I,   rightarrow,     idotless ]	};
+    key <AC06> { [         d,          D,          eth,          ETH ]	};
+    key <AC07> { [         h,          H,      hstroke,      Hstroke ]	};
+    key <AC08> { [         t,          T,       tslash,       Tslash ]	};
+    key <AC09> { [         n,          N ]	};
+    key <AC10> { [         s,          S,       ssharp,      section ]	};
+    key <AC11> { [     minus, underscore, dead_belowdot, dead_abovedot ] };
+
+    key <AB01> { [    period,   colon, periodcentered, dead_abovedot ]	};
+    key <AB02> { [         q,          Q,           at,  Greek_OMEGA ]	};
+    key <AB03> { [         j,          J ]	};
+    key <AB04> { [         k,          K,          kra,    ampersand ]	};
+    key <AB05> { [         x,          X, guillemotright,    greater ]	};
+    key <AB06> { [         b,          B, rightdoublequotemark, apostrophe ] };
+    key <AB07> { [         m,          M,           mu,    masculine ]	};
+    key <AB08> { [         w,          W,      lstroke,      Lstroke ]	};
+    key <AB09> { [         v,          V, leftdoublequotemark, grave ]	};
+    key <AB10> { [         z,          Z, guillemotleft,        less ]	};
+};
+
+// Ivan Popov, 2005-07-17
+// phonetic layout for Russian cyrillic letters
+// on Swedish (latin type2) keyboards
+
+// level3 modifier is a shortcut to the "se" meaning of the keys where
+// we place cyrillic letters, handy for accessing the corresponding
+// punctuation marks.
+// It is important to have access to punctuation marks, and the rest of
+// alphabetical keys are added for being consequent so that the users
+// can expect the level3 modifier to give what the key label shows.
+
+partial alphanumeric_keys
+xkb_symbols "rus" {
+    include "se(basic)"
+
+    name[Group1]="Sweden - Russian phonetic";
+    key.type[group1]="ALPHABETIC";
+
+    key <TLDE> {	[ Cyrillic_io, Cyrillic_IO ]	};
+    key <AE12> {	[ Cyrillic_hardsign, Cyrillic_HARDSIGN ]	};
+
+    key <AD01> {	[ Cyrillic_ya, Cyrillic_YA ]	};
+    key <AD02> {	[ Cyrillic_ve, Cyrillic_VE ]	};
+    key <AD03> {	[ Cyrillic_ie, Cyrillic_IE ]	};
+    key <AD04> {	[ Cyrillic_er, Cyrillic_ER ]	};
+    key <AD05> {	[ Cyrillic_te, Cyrillic_TE ]	};
+    key <AD06> {	[ Cyrillic_yeru, Cyrillic_YERU ]	};
+    key <AD07> {	[ Cyrillic_u, Cyrillic_U ]	};
+    key <AD08> {	[ Cyrillic_i, Cyrillic_I ]	};
+    key <AD09> {	[ Cyrillic_o, Cyrillic_O ]	};
+    key <AD10> {	[ Cyrillic_pe, Cyrillic_PE ]	};
+    key <AD11> {	[ Cyrillic_e, Cyrillic_E ]	};
+
+    key <AC01> {	[ Cyrillic_a, Cyrillic_A ]	};
+    key <AC02> {	[ Cyrillic_es, Cyrillic_ES ]	};
+    key <AC03> {	[ Cyrillic_de, Cyrillic_DE ]	};
+    key <AC04> {	[ Cyrillic_ef, Cyrillic_EF ]	};
+    key <AC05> {	[ Cyrillic_ghe, Cyrillic_GHE ]	};
+    key <AC06> {	[ Cyrillic_ha, Cyrillic_HA ]	};
+    key <AC07> {	[ Cyrillic_shorti, Cyrillic_SHORTI ]	};
+    key <AC08> {	[ Cyrillic_ka, Cyrillic_KA ]	};
+    key <AC09> {	[ Cyrillic_el, Cyrillic_EL ]	};
+    key <AC10> {	[ Cyrillic_sha, Cyrillic_SHA ]	};
+    key <AC11> {	[ Cyrillic_shcha, Cyrillic_SHCHA ]	};
+    key <BKSL> {	[ Cyrillic_yu, Cyrillic_YU ]	};
+
+    key <LSGT> {	[ Cyrillic_che, Cyrillic_CHE ]	};
+    key <AB01> {	[ Cyrillic_ze, Cyrillic_ZE ]	};
+    key <AB02> {	[ Cyrillic_softsign, Cyrillic_SOFTSIGN ]	};
+    key <AB03> {	[ Cyrillic_tse, Cyrillic_TSE ]	};
+    key <AB04> {	[ Cyrillic_zhe, Cyrillic_ZHE ]	};
+    key <AB05> {	[ Cyrillic_be, Cyrillic_BE ]	};
+    key <AB06> {	[ Cyrillic_en, Cyrillic_EN ]	};
+    key <AB07> {	[ Cyrillic_em, Cyrillic_EM ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "rus_nodeadkeys" {
+
+    include "se(nodeadkeys)"
+    include "se(rus)"
+
+    name[Group1]="Sweden - Russian phonetic, eliminate dead keys";
+
+    key <AE12> {	[ Cyrillic_hardsign, Cyrillic_HARDSIGN ]	};
+};
+
+xkb_symbols "smi" {
+
+    // 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 "fi(smi)"
+
+    name[Group1]= "Sweden - Northern Saami";
+};
+
+// Copied from macintosh_vndr/se
+partial alphanumeric_keys 
+xkb_symbols "mac" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple Swedish(Sweden) keybaord
+
+    include "latin"
+    name[Group1]= "Sweden - Macintosh";
+
+    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			]	};
+
+    include "kpdl(comma)"
+    include "level3(ralt_switch)"
+};
+
+// Svdvorak
+// This version of Dvorak follows danish and norwegian style in hope for a
+// Scandinavian standard.
+partial alphanumeric_keys
+xkb_symbols "svdvorak" {
+
+   name[Group1]="Sweden - Svdvorak";
+
+   include "se(basic)"
+
+   key <AD01> { [ aring, Aring, braceleft ] };
+   key <AD02> { [ comma, semicolon, bracketleft ] };
+   key <AD03> { [ period, colon, bracketright ] };
+   key <AD04> { [ p, P, braceright ] };
+   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> { [ apostrophe, asterisk ] };
+
+   key <AC01> { [ a, A ] };
+   key <AC02> { [ o, O, parenleft ] };
+   key <AC03> { [ e, E, parenright ] };
+   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, ssharp ] };
+   key <AC11> { [ minus, underscore ] };
+   key <BKSL> { [ less, greater, bar ] };
+
+   key <LSGT> { [ odiaeresis, Odiaeresis ] };
+   key <AB01> { [ adiaeresis, Adiaeresis ] };
+   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 ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.am
new file mode 100644
index 000000000..b1123e70e
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.am
@@ -0,0 +1,4 @@
+symbolsdir = $(xkb_base)/symbols/sgi_vndr
+
+dist_symbols_DATA = \
+jp
diff --git a/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in
new file mode 100644
index 000000000..9993b5a89
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in
@@ -0,0 +1,367 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = symbols/sgi_vndr
+DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(symbolsdir)"
+dist_symbolsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_symbols_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+symbolsdir = $(xkb_base)/symbols/sgi_vndr
+dist_symbols_DATA = \
+jp
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/sgi_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  symbols/sgi_vndr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_symbolsDATA: $(dist_symbols_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_symbolsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  $(dist_symbolsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+
+uninstall-dist_symbolsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(symbolsdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_symbolsDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_symbolsDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_symbolsDATA uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/symbols/sgi_vndr/jp b/xorg-server/xkbdata.src/symbols/sgi_vndr/jp
new file mode 100644
index 000000000..31bb3b59a
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/shift b/xorg-server/xkbdata.src/symbols/shift
new file mode 100644
index 000000000..eb7533f79
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/shift
@@ -0,0 +1,19 @@
+// $XKeyboardConfig$
+
+partial modifier_keys 
+xkb_symbols "breaks_caps" {
+    key <LFSH> {
+	type = "ALPHABETIC",
+    	actions [Group1] = [
+	    SetMods(modifiers=Shift),
+	    SetMods(modifiers=Shift+Lock,clearLocks)
+	]
+    };
+    key <RTSH> {
+	type = "ALPHABETIC",
+	actions [Group1] = [
+	    SetMods(modifiers=Shift),
+	    SetMods(modifiers=Shift+Lock,clearLocks)
+	]
+    };
+};
diff --git a/xorg-server/xkbdata.src/symbols/si b/xorg-server/xkbdata.src/symbols/si
new file mode 100644
index 000000000..8e49cac51
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/si
@@ -0,0 +1,43 @@
+// $XKeyboardConfig$
+//
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    name[Group1]="Slovenia";
+
+    include "rs(latin)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "us" {
+
+    name[Group1]= "Slovenia - US keyboard with Slovenian letters";
+
+    include "rs(latinyz)"
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "alternatequotes" {
+
+    name[Group1]= "Slovenia - Use guillemets for quotes";
+
+    include "rs(latinalternatequotes)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "unicode" {
+
+    name[Group1]= "Slovenia - Use Slovenian digraphs";
+
+    include "rs(latinunicode)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "unicodeus" {
+
+    name[Group1]= "Slovenia - US keyboard with Slovenian digraphs";
+
+    include "rs(latinunicodeyz)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/sk b/xorg-server/xkbdata.src/symbols/sk
new file mode 100644
index 000000000..62d0e7998
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sk
@@ -0,0 +1,108 @@
+// $XKeyboardConfig$
+
+// $XFree86: xc/programs/xkbcomp/symbols/sk,v 1.2 2002/11/22 04:02:22 dawes 
+// Exp $
+
+partial default 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 "latin"
+
+    name[Group1] = "Slovakia";
+
+    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 ] };
+
+    include "level3(ralt_switch)"
+};
+
+// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
+xkb_symbols "bksl" {
+    include "sk(basic)"
+
+    name[Group1] = "Slovakia - Extended Backslash";
+
+    key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "qwerty" {
+ 
+    // 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 "sk(basic)"
+
+    name[Group1] = "Slovakia - qwerty";
+
+    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 "qwerty_bksl" {
+    include "sk(qwerty)"
+
+    name[Group1] = "Slovakia - qwerty, extended Backslash";
+
+    key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
+};
diff --git a/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.am
new file mode 100644
index 000000000..e1a77d957
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.am
@@ -0,0 +1,4 @@
+symbolsdir = $(xkb_base)/symbols/sony_vndr
+
+dist_symbols_DATA = \
+us
diff --git a/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in
new file mode 100644
index 000000000..ffac4c57c
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in
@@ -0,0 +1,367 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = symbols/sony_vndr
+DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(symbolsdir)"
+dist_symbolsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_symbols_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+symbolsdir = $(xkb_base)/symbols/sony_vndr
+dist_symbols_DATA = \
+us
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/sony_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  symbols/sony_vndr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_symbolsDATA: $(dist_symbols_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_symbolsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  $(dist_symbolsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+
+uninstall-dist_symbolsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(symbolsdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_symbolsDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_symbolsDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_symbolsDATA uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/symbols/sony_vndr/us b/xorg-server/xkbdata.src/symbols/sony_vndr/us
new file mode 100644
index 000000000..76d41053c
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/srvr_ctrl b/xorg-server/xkbdata.src/symbols/srvr_ctrl
new file mode 100644
index 000000000..712f763e6
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/srvr_ctrl
@@ -0,0 +1,137 @@
+// $XKeyboardConfig$
+
+// $XFree86: xc/programs/xkbcomp/symbols/srvr_ctrl,v 1.4 2003/12/18 14:14:38 pascal Exp $
+//
+// Actions which control the server's behavior
+
+partial keypad_keys function_keys
+xkb_symbols "xfree86" {
+    include "srvr_ctrl(stdkeypad)"
+    include "srvr_ctrl(fkey2vt)"
+};
+
+partial keypad_keys 
+xkb_symbols "stdkeypad" {
+
+    key <BKSP> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ BackSpace,   Terminate_Server ]
+    };
+
+// 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 ]
+    };
+
+// +VMode switches to the next video mode
+    key <KPAD> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ KP_Add,	XF86_Next_VMode]
+    };
+
+};
+
+partial function_keys 
+xkb_symbols "fkey2vt" {
+
+    key <FK01> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F1,	XF86_Switch_VT_1 ]
+    };
+
+    key <FK02> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F2,	XF86_Switch_VT_2 ]
+    };
+
+    key <FK03> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F3,	XF86_Switch_VT_3 ]
+    };
+
+    key <FK04> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F4,	XF86_Switch_VT_4 ]
+    };
+
+    key <FK05> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F5,	XF86_Switch_VT_5 ]
+    };
+
+    key <FK06> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F6,	XF86_Switch_VT_6 ]
+    };
+
+    key <FK07> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F7,	XF86_Switch_VT_7 ]
+    };
+
+    key <FK08> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F8,	XF86_Switch_VT_8 ]
+    };
+
+    key <FK09> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F9,	XF86_Switch_VT_9 ]
+    };
+
+    key <FK10> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F10,	XF86_Switch_VT_10 ]
+    };
+
+    key <FK11> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F11,	XF86_Switch_VT_11 ]
+    };
+
+    key <FK12> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F12,	XF86_Switch_VT_12 ]
+    };
+
+};
+
+partial function_keys keypad_keys
+xkb_symbols "no_srvr_keys" {
+
+    key.type="TWO_LEVEL";
+
+    key <FK01> { [ F1, F1 ]	};
+    key <FK02> { [ F2, F2 ]	};
+    key <FK03> { [ F3, F3 ]	};
+    key <FK04> { [ F4, F4 ]	};
+    key <FK05> { [ F5, F5 ]	};
+    key <FK06> { [ F6, F6 ]	};
+    key <FK07> { [ F7, F7 ]	};
+    key <FK08> { [ F8, F8 ]	};
+    key <FK09> { [ F9, F9 ]	};
+    key <FK10> { [ F10, F10 ]	};
+    key <FK11> { [ F11, F11 ]	};
+    key <FK12> { [ F12, F12 ]	};
+
+    key <BKSP> { [ BackSpace,	BackSpace	] };
+
+    key <KPDV> { [ KP_Divide,	KP_Divide	] };
+    key <KPMU> { [ KP_Multiply,	KP_Multiply	] };
+    key <KPSU> { [ KP_Subtract,	KP_Subtract	] };
+    key <KPAD> { [ KP_Add,	KP_Add		] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.am
new file mode 100644
index 000000000..db036de67
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.am
@@ -0,0 +1,9 @@
+symbolsdir = $(xkb_base)/symbols/sun_vndr
+
+dist_symbols_DATA = \
+ cs cz de dk es \
+ fi fr gb gr hu \
+ it jp ko lt lv \
+ nl no pl pt ru \
+ se solaris sw tr tuv \
+ tw us usb
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in
new file mode 100644
index 000000000..3fc8cbccc
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in
@@ -0,0 +1,372 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = symbols/sun_vndr
+DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(symbolsdir)"
+dist_symbolsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_symbols_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+symbolsdir = $(xkb_base)/symbols/sun_vndr
+dist_symbols_DATA = \
+ cs cz de dk es \
+ fi fr gb gr hu \
+ it jp ko lt lv \
+ nl no pl pt ru \
+ se solaris sw tr tuv \
+ tw us usb
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/sun_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  symbols/sun_vndr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_symbolsDATA: $(dist_symbols_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_symbolsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  $(dist_symbolsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+
+uninstall-dist_symbolsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(symbolsdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_symbolsDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_symbolsDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_symbolsDATA uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/cs b/xorg-server/xkbdata.src/symbols/sun_vndr/cs
new file mode 100644
index 000000000..e487ba096
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/cs
@@ -0,0 +1,59 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+xkb_symbols "type5" {
+    include "sun_vndr/us(type5)"
+    include "cz"
+
+    // A few keys are different
+    
+
+    key <TLDE> { [ quoteleft, asciitilde	]			};
+//     key <AE02> { [ ecaron, 2		], [ at 		]	};
+//     key <AE03> { [ scaron, 3		], [ numbersign		]	};
+//     key <AE04> { [ ccaron, 4		], [ dollar		]	};
+//     key <AE05> { [ rcaron, 5		], [ percent		]	};
+//     key <AE06> { [ zcaron, 6		], [ asciicircum	]	};
+//     key <AE07> { [ yacute, 7		], [ ampersand		]	};
+//     key <AE08> { [ aacute, 8		], [ asterisk		]	};
+    key <AE09> { [ iacute, 9		], [ braceleft		]	};
+    key <AE10> { [ eacute, 0		], [ braceright		]	};
+
+    key <AD03> { [ e, E		        ]                               };
+    key <AD11> { [ uacute, slash        ], [ bracketleft		] };
+    key <AD12> { [ parenright, parenleft], [ bracketright		] };
+    
+    key <AC02> { [ s, S			], [ ssharp, ssharp		] };
+    key <BKSL> { [ SunFA_Diaeresis, backslash	]			  };
+
+    key <LSGT> { [ backslash, bar		]			};
+    
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/cz b/xorg-server/xkbdata.src/symbols/sun_vndr/cz
new file mode 100644
index 000000000..e487ba096
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/cz
@@ -0,0 +1,59 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+xkb_symbols "type5" {
+    include "sun_vndr/us(type5)"
+    include "cz"
+
+    // A few keys are different
+    
+
+    key <TLDE> { [ quoteleft, asciitilde	]			};
+//     key <AE02> { [ ecaron, 2		], [ at 		]	};
+//     key <AE03> { [ scaron, 3		], [ numbersign		]	};
+//     key <AE04> { [ ccaron, 4		], [ dollar		]	};
+//     key <AE05> { [ rcaron, 5		], [ percent		]	};
+//     key <AE06> { [ zcaron, 6		], [ asciicircum	]	};
+//     key <AE07> { [ yacute, 7		], [ ampersand		]	};
+//     key <AE08> { [ aacute, 8		], [ asterisk		]	};
+    key <AE09> { [ iacute, 9		], [ braceleft		]	};
+    key <AE10> { [ eacute, 0		], [ braceright		]	};
+
+    key <AD03> { [ e, E		        ]                               };
+    key <AD11> { [ uacute, slash        ], [ bracketleft		] };
+    key <AD12> { [ parenright, parenleft], [ bracketright		] };
+    
+    key <AC02> { [ s, S			], [ ssharp, ssharp		] };
+    key <BKSL> { [ SunFA_Diaeresis, backslash	]			  };
+
+    key <LSGT> { [ backslash, bar		]			};
+    
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/de b/xorg-server/xkbdata.src/symbols/sun_vndr/de
new file mode 100644
index 000000000..a80de66b5
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/de
@@ -0,0 +1,71 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+    // A few keys are different
+    key <BKSL> { [ less, braceleft      ]                       };
+
+    key <BRCR> { [ greater, braceright  ]                       };
+    key <DELE> { [ Delete               ]                       };
+
+    key <AE01> { [ 1, plus              ], [exclam      ]       };
+    key <AE02> { [ 2, quotedbl          ], [at          ]       };
+    key <AE03> { [ 3, asterisk          ], [numbersign  ]       };
+    key <AE04> { [ 4, ccedilla          ], [cent        ]       };
+    key <AE05> { [ 5, percent           ], [asciitilde  ]       };
+    key <AE06> { [ 6, ampersand         ], [section     ]       };
+    key <AE07> { [ 7, slash             ], [bar         ]       };
+    key <AE08> { [ 8, parenleft         ], [degree      ]       };
+    key <AE09> { [ 9, parenright        ], [backslash   ]       };
+    key <AE10> { [ 0, equal             ], [asciicircum ]       };
+    Key <AE11> { [ quoteright, question ], [quoteleft   ]       };
+    key <AE12> { [ SunFA_Circum, SunFA_Grave    ]               };
+    key <AD03> { [ e, E                 ], [EuroSign    ]       };
+    key <AD06> { [ Z                    ]                       };
+    key <AD11> { [ udiaeresis, egrave   ]                       };
+    key <AD12> { [ SunFA_Diaeresis, SunFA_Acute ]               };
+    key <AC10> { [ odiaeresis, eacute   ]                       };
+    key <AC11> { [ adiaeresis, agrave   ]                       };
+    key <TLDE> { [ dollar, SunFA_Tilde  ], [sterling    ]       };
+    key <LSGT> { [ bracketright, bracketleft   ], [ backslash ] };
+    key <AB01> { [ Y                    ]                       };
+    key <AB07> { [ M, NoSymbol          ], [mu  ]               };
+    key <AB08> { [ comma, semicolon     ]                       };
+    key <AB09> { [ period, colon        ]                       };
+    key <AB10> { [ minus, underscore    ]                       };
+    key <COMP> { [ SunAltGraph          ]                       };
+    key <ALGR> { [ SunCompose           ]                       };
+
+
+
+};
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/dk b/xorg-server/xkbdata.src/symbols/sun_vndr/dk
new file mode 100644
index 000000000..15f8603bc
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/dk
@@ -0,0 +1,77 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+    // A few keys are different
+   key <BKSL> { [ onehalf, section	]                       };
+   key <BRCR> { [ asciitilde, asciicircum	 ] 		};
+   key <AE02> { [ 2, quotedbl		], [ at		]	};
+   key <AE03> { [ 3, numbersign		], [ sterling	]	};
+   key <AE04> { [ 4, currency		], [ dollar	]	};
+   key <AE06> { [ 6, ampersand		] 			};
+   key <AE07> { [ 7, slash		], [ braceleft	]	};
+   key <AE08> { [ 8, parenleft		], [ bracketleft]	};
+   key <AE09> { [ 9, parenright		], [ bracketright] 	};
+   key <AE10> { [ 0, equal		], [ braceright	]	};
+   key <AE11> { [ plus, question	]			};
+   key <AE12> { [ SunFA_Acute, SunFA_Grave], [ bar	]	};
+   key <AD03> { [ e, E			], [ EuroSign	]	};
+   key <AD11> { [ Aring			]			};
+   key <AD12> { [ SunFA_Diaeresis, SunFA_Circum], [SunFA_Tilde] };
+   key <LCTL> { [ Caps_Lock		]			};
+   key <AC10> { [ AE			]			};
+   key <AC11> { [ Ooblique		]			};
+   key <TLDE> { [ quoteright, asterisk	], [ quoteleft	]	};
+   key <LSGT> { [ less, greater		], [ backslash  ]	};
+   key <AB08> { [ comma, semicolon	]			};
+   key <AB09> { [ period, colon		]			};
+   key <AB10> { [ minus, underscore	]			};
+   key <CAPS> { [ Control_L		]			};
+   key <COMP> { [ SunAltGraph		]			};
+   key <ALGR> { [ SunCompose		]			};
+
+
+
+
+};
+
+xkb_symbols "type5" {
+   include "dk"
+
+    key <AE05> { [ 5, percent		], [asciitilde			]};
+    key <AE06> { [ 6, ampersand		], [asciicircum			]};
+    key <AE07> { [ 7, slash		], [ braceleft			]};
+    key <AE08> { [ 8, parenleft		], [ bracketleft		]};
+    key <AE09> { [ 9, parenright	], [ bracketright		]};
+    key <AE10> { [ 0, equal		], [ braceright			]};
+    key <BKSL> { [ quoteright, asterisk	], [ quoteleft			]};
+  
+};
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/es b/xorg-server/xkbdata.src/symbols/sun_vndr/es
new file mode 100644
index 000000000..e863d6a97
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/es
@@ -0,0 +1,91 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+partial
+xkb_symbols "type4" {
+    key <BKSL> { [ bracketleft, braceleft ], [ guillemotleft	] };
+    key <BRCR> { [ bracketright, braceright ], [ guillemotright ] };
+    key <AE02> { [ 2, quotedbl		], [ at			] };
+    key <AE03> { [ 3, periodcentered    ], [ numbersign       ] };
+    key <AE05> { [ 5, percent           ], [ degree           ] };
+    key <AE06> { [ 6, ampersand         ], [ notsign          ] };
+    key <AE07> { [ 7, slash             ]                       };
+    key <AE08> { [ 8, parenleft         ] 			};
+    key <AE09> { [ 9, parenright        ], [ backslash        ] };
+    key <AE10> { [ 0, equal             ], [ bar              ] };
+    key <AE11> { [ quoteright, question ], [ quoteleft        ] };
+    key <AE12> { [ exclamdown, questiondown ] };
+    key <AD03> { [ e, E                 ], [ EuroSign         ] };
+    key <AD09> { [ o, O                 ], [ masculine        ] };
+    key <AD11> { [ SunFA_Grave, SunFA_Circum ], [ asciicircum ] };
+    key <AD12> { [ plus, asterisk       ], [ asciitilde       ] };
+    key <AC01> { [ a, A			], [ ordfeminine      ] };
+    key <AC10> { [ Ntilde		]			};
+    key <AC11> { [ SunFA_Acute, SunFA_Diaeresis ]			};
+    key <TLDE> { [ Ccedilla		]			};
+    key <RALT> { [ Alt_R                ]                       };
+    key <LCTL> { [ Caps_Lock ] };
+    key <CAPS> { [ Control_L ] };
+    key <LSGT> { [ less, greater	]			};
+    key <AB08> { [ comma, semicolon	]			};
+    key <AB09> { [ period, colon	]			};
+    key <AB10> { [ minus, underscore	]			};
+};
+
+partial
+xkb_symbols "type5" {
+    include "es"
+
+    key <AE03> { [ 3, periodcentered	], [ numbersign			] };
+    key <AE04> { [ 4, dollar		], [ asciicircum		] };
+    key <AE05> { [ 5, percent		], [ asciitilde			] };
+    key <AE07> { [ 7, slash		], [ braceleft			]};
+    key <AE08> { [ 8, parenleft		], [ bracketleft		]};
+    key <AE09> { [ 9, parenright	], [ bracketright		]};
+    key <AE10> { [ 0, equal		], [ braceright			]};
+    key <AE11> { [ quoteright, question	], [ quoteleft			] };
+
+    key <AD11> { [ SunFA_Grave, SunFA_Circum ], [ bracketleft		] };
+
+    key <AC11> { [ SunFA_Acute, SunFA_Diaeresis ], [ braceleft		] };
+};
+
+partial 
+xkb_symbols "type6" {
+    include "es(Sundeadkeys)"
+
+    key <AE04> { [ 4, dollar		], [ asciicircum		] };
+    key <AE05> { [ 5, percent		], [ asciitilde			] };
+    key <AE07> { [ 7, slash		], [ braceleft			]};
+    key <AE08> { [ 8, parenleft		], [ bracketleft		]};
+    key <AE09> { [ 9, parenright	], [ bracketright		]};
+    key <AE10> { [ 0, equal		], [ braceright			]};
+    key <AE11> { [ quoteright, question	], [ quoteleft			] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/fi b/xorg-server/xkbdata.src/symbols/sun_vndr/fi
new file mode 100644
index 000000000..2c524180e
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/fi
@@ -0,0 +1,42 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+xkb_symbols "basic" {
+    include "fi"
+    // A few keys are different
+    key <AE11> {	[            plus,        question      ],
+			[	backslash			]	};
+    key <AD12> {	[       diaeresis,     asciicircum     	],
+			[      asciitilde			]	};
+    key <BKSL> {	[      apostrophe,        asterisk	],
+			[	quoteleft			]	};
+
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/fr b/xorg-server/xkbdata.src/symbols/sun_vndr/fr
new file mode 100644
index 000000000..3517eed27
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/fr
@@ -0,0 +1,92 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+// NOTE:
+// These are the French keyboard symbols
+// French Swiss symbols are in sw
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+
+    key <BKSL> { [ bracketleft, braceleft ]			};
+    key <BRCR> { [ bracketright, braceright ]			};
+    key <DELE> { [ Delete               ]                       };
+
+    key <AE01> { [ ampersand, 1		], [			]	};
+    key <AE02> { [ eacute, 2		], [ twosuperior	]	};
+    key <AE03> { [ quotedbl, 3		], [ threesuperior	]	};
+    key <AE04> { [ quoteright, 4	]				};
+    key <AE05> { [ parenleft, 5		]				};
+    key <AE06> { [ section, 6		], [ asciicircum	]	};
+    key <AE07> { [ egrave, 7		]				};
+    key <AE08> { [ exclam, 8		], [ sterling		]	};
+    key <AE09> { [ ccedilla, 9		], [ backslash		]	};
+    key <AE10> { [ agrave, 0		] 				};
+    Key <AE11> { [ parenright, degree	], [ asciitilde		]	};
+    key <AE12> { [ minus, underscore 	], [ numbersign		]  	};
+
+    key <AD01> { [ a, A			]				};
+    key <AD02> { [ z, Z			] 				};
+    key <AD03> { [ e, E			], [EuroSign	]		};
+    key <AD11> { [ SunFA_Circum, SunFA_Diaeresis	]		};
+    key <AD12> { [ quoteleft, dollar	], [ at		]		};
+ 
+    key <AC01> { [ q, Q			]				};
+    key <AC10> { [ m, M			], [ mu		]		};
+    key <AC11> { [ ugrave, percent	]				};
+    key <TLDE> { [ asterisk, bar	], [ currency	]		};
+
+    key <LSGT> { [ less, greater	]				};
+    key <AB01> { [ w, W			]			};
+
+    key <AB07> { [ comma, question	]			};
+    key <AB08> { [ semicolon, period	]			};
+    key <AB09> { [ colon, slash		]			};
+    key <AB10> { [ equal, plus		]			};
+
+    key <CAPS> { [ SunAltGraph		]			};
+    key <ALGR> { [ Caps_Lock		]			}; 
+
+
+
+};
+
+xkb_symbols "type5" {
+    include "fr"
+
+    key <LSGT> { [ less, greater	]				};
+};
+
+xkb_symbols "type6" {
+    include "sun_vndr/us(type6)"
+    include "fr"
+
+    key <LSGT> { [ less, greater	]				};
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/gb b/xorg-server/xkbdata.src/symbols/sun_vndr/gb
new file mode 100644
index 000000000..d2c21124d
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/gb
@@ -0,0 +1,53 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+    // A few keys are different
+    key <AE01> { [ 1, exclam		], [brokenbar	]	};
+    key <AE03> { [ 3, sterling		], [numbersign	]	};
+    key <AE04> { [ 4, dollar		], [EuroSign	]	};
+    key <AE11> { [ minus, underscore	], [notsign	]	};
+    key <AD03> { [ e, E			], [EuroSign	]	};
+
+
+};
+
+partial
+xkb_symbols "type5" {
+    include "gb(Sundeadkeys)"
+
+    key <TLDE> { [ quoteleft, notsign	], [ brokenbar	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+};
+
+partial
+xkb_symbols "type6" {
+  include "sun_vndr/gb(type5)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/gr b/xorg-server/xkbdata.src/symbols/sun_vndr/gr
new file mode 100644
index 000000000..cce87510b
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/gr
@@ -0,0 +1,39 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+xkb_symbols "type5" {
+    include "sun_vndr/us(type5basic)"
+    // A few keys are different
+    key <AE04> { [ 4, dollar ], [ EuroSign ] };
+    key <AD03> { [ e, E], [ EuroSign ] };
+    key <AC10> { [ dead_acute, dead_diaeresis ]			};
+    key <LSGT> { [ backslash, bar	]			};
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/hu b/xorg-server/xkbdata.src/symbols/sun_vndr/hu
new file mode 100644
index 000000000..62eb551d9
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/hu
@@ -0,0 +1,94 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+// $TOG: hu /main/2 1997/06/13 06:25:05 kaleb $
+default partial alphanumeric_keys 
+xkb_symbols "type5" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Hungarian keyboard.
+
+    // Alphanumeric section
+
+    name[group1]="Hungarian";
+
+    key <TLDE> {	[	0,		section		]	};
+    key <AE01> {	[	1,      	apostrophe	]	};
+    key <AE02> {	[	2,		quotedbl	]	};
+    key <AE03> {	[	3,		plus		],
+			[	numbersign			]	};
+    key <AE04> {	[	4,		exclam		],
+			[	dollar				]	};
+    key <AE06> {	[	6,		slash		],
+			[	asciicircum			]	};
+    key <AE07> {	[	7,		equal		],
+			[	braceleft			]	};
+    key <AE08> {	[	8,		parenleft	],
+			[	bracketleft			]	};
+    key <AE09> {	[	9,		parenright	],
+			[	bracketright			]	};
+    key <AE10> {	[	odiaeresis,	Odiaeresis	],
+			[	braceright  			]	};
+    key <AE11> {	[	udiaeresis,	Udiaeresis	],
+			[	backslash			]	};
+    key <AE12> {	[	oacute,		Oacute		],
+			[	asciitilde				]	};
+
+    key <AD01> {	[	q,		Q		],
+			[	at				]	};
+    key <AD06> {        [       z,              Z               ]	};
+    key <AD11> {	[	odoubleacute,	Odoubleacute	]	};
+    key <AD12> {	[	uacute,		Uacute		]	};
+
+    key <AC02> {	[	s,		S		],
+			[	ssharp				]	};
+    key <AC08> {	[	k,		K		],
+			[	ampersand			]	};
+    key <AC10> {	[	eacute,		Eacute		],
+			[	semicolon			]	};
+    key <AC11> {	[	aacute,		Aacute		],
+			[	adiaeresis,	Adiaeresis	]	};
+    key <BKSL> {	[	udoubleacute,	Udoubleacute	]	};
+
+    key <LSGT> {	[	iacute,		Iacute		],
+			[       bar				]	};
+    key <AB01> {	[	y,		Y		],
+			[	less				]	};
+    key <AB02> {	[	x,		X		],
+			[	greater			]	};
+    key <AB03> {	[	c,		C		],
+			[	quoteleft			]	};
+    key <AB08> {	[	comma,		question	],
+			[	asterisk			]	};
+    key <AB09> {	[	period,		colon		]	};
+    key <AB10> {	[	minus,		underscore	]	};
+
+    // End alphanumeric section
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/it b/xorg-server/xkbdata.src/symbols/sun_vndr/it
new file mode 100644
index 000000000..6f42aa109
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/it
@@ -0,0 +1,77 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+xkb_symbols "type4" {
+
+    key <BKSL> { [ bracketleft, braceleft ], [ guillemotleft	]	 };
+    key <BRCR> { [ bracketright, braceright ], [ guillemotright ] 	};
+    key <AE02> { [ 2, quotedbl		], [ twosuperior	] 	};
+    key <AE03> { [ 3, sterling		], [ threesuperior	] 	};
+    key <AE06> { [ 6, ampersand		], [ notsign		] 	};
+    key <AE06> { [ 7, slash		]				};
+    key <AE06> { [ 8, parenleft		]				};
+    key <AE09> { [ 9, parenright        ], [ backslash		] 	};
+    key <AE10> { [ 0, equal             ], [ bar		] 	};
+    key <AE11> { [ quoteright, question ], [ quoteleft		] 	};
+    key <AE12> { [ igrave, asciicircum	] };
+
+    key <AD11> { [ egrave, eacute       ]				};
+    key <AD12> { [ plus, asterisk       ], [ asciitilde   	]	};
+
+    key <AC10> { [ ograve, ccedilla 	], [ at			]	};
+    key <AC11> { [ agrave, degree	], [ numbersign		]	};
+    key <TLDE> { [ ugrave, section	]				};
+
+    key <LSGT> { [ less, greater	]				};
+    key <AB08> { [ comma, semicolon	]				};
+    key <AB09> { [ period, colon	]				};
+    key <AB10> { [ minus, underscore	]				};
+    
+
+    key <LALT> { [ Alt_L	       	]              	       		};
+    key <COMP> { [ SunCompose       	]				};
+    key <RALT> { [ SunAltGraph		]				};
+    key <LCTL> { [ Caps_Lock 		] 				};
+    key <CAPS> { [ Control_L 		] 				};
+
+};
+
+xkb_symbols "type5" {
+    include "it"
+
+    key <AE08> { [ 8, parenleft		], [ braceleft			] };
+    key <AE09> { [ 9, parenright	], [ braceright			] };
+
+    key <BKSL> { [ ugrave, section	], [ asciitilde			] };
+};
+
+partial 
+xkb_symbols "type6" {
+    include "sun_vndr/it(type5)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/jp b/xorg-server/xkbdata.src/symbols/sun_vndr/jp
new file mode 100644
index 000000000..dd06b8bd1
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/jp
@@ -0,0 +1,798 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//All Rights Reserved.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// US/ASCII layout for a Type 4 Sun keyboard
+
+xkb_symbols "basic" {
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+
+    key <SPCE> { [ space		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
+//    key <BRCR> { [ Linefeed		]			};
+    key <EXEC> { [ Execute		]			};
+};
+xkb_symbols "type4" {
+
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+    key <RTSH> { [ Shift_R		]	};
+
+    key <LCTL> { [ Control_L		]			};
+    key <SPCE> { [ space		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+    key <LALT> { [ Alt_L		]			};
+    key <ALGR> { [ Mode_switch		]			};
+    key <LMTA> { [ Meta_L		]			};
+    key <RMTA> { [ Meta_R		]			};
+    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
+    key <COMP> { [ Multi_key		]			};
+    key <EXEC> { [ Execute		]			};
+//    key <TLFD> { [ Linefeed		]			};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
+    key <BRCR> { [ Linefeed		]			};
+
+    key <STOP> { [ L1,	L1		], [ SunStop	]	};
+    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
+    key <PROP> { [ L3,	L3		], [ SunProps	]	};
+    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
+    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
+    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
+    key <FIND> { [ L9,	L9		], [ SunFind	]	};
+    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2,	R2		], [ Print		] };
+    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
+    key <PAUS> { [ R1,	R1		], [ Pause		] };
+    key <DELE> { [ Delete		]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]			};
+    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
+    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
+    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
+    key <KPSU> { [ KP_Subtract		]			};
+
+    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
+    key  <KP8> { [ Up,	R8		], [ KP_8		] };
+    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
+    key <KPAD> { [ KP_Add		]			};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		] };
+    key  <KP5> { [ R11,	R11		], [ KP_5		] };
+    key  <KP6> { [ Right, R12		], [ KP_6		] };
+
+    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
+    key  <KP2> { [ Down, R14		], [ KP_2		] };
+    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
+    key <KPEN> { [ KP_Enter		]			}; 
+    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
+    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R, Shift_L };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2   	{ Mode_switch };
+    modifier_map Mod3   	{ Num_Lock };
+    modifier_map Mod4		{ Alt_L };
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5" {
+
+    // Alphanumeric section
+    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+    key <RTSH> { [ Shift_R		]	};
+
+    key <LCTL> { [ Control_L		]			};
+//    key <RCTL> { [ Control_R		]			};
+    key <EXEC> { [ Execute		]			};
+    key <SPCE> { [ space		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+    key <LALT> { [ Alt_L		]	};
+    key <ALGR> { [ Mode_switch		]	};
+    key <LMTA> { [ Meta_L		]	};
+    key <RMTA> { [ Meta_R		]	};
+    key <COMP> { [ Multi_key		]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1, L1		], [ SunStop	]	};
+    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
+    key <PROP> { [ L3, L3		], [ SunProps	]	};
+    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5, L5		], [ SunFront	]	};
+    key <COPY> { [ L6, L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
+    key <PAST> { [ L8, L8		], [ SunPaste	]	};
+    key <FIND> { [ L9, L9		], [ SunFind	]	};
+    key <CUT>  { [ L10, L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
+    key <LEFT> { [ Left			]			};
+    key <RGHT> { [ Right		]			};
+    key <UP>   { [ Up			]			};
+    key <DOWN> { [ Down			]			};
+
+    key <DELE> { [ Delete		]			};
+    key <INS>  { [ Insert		]			};
+    key <PGUP> { [ Prior		]			};
+    key <PGDN> { [ Next			]			};
+    key <HOME> { [ Home			]			};
+    key <END>  { [ End			]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]				};
+    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
+    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
+
+    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
+    key  <KP8> { [ Up, R8		], [ KP_8		]	};
+    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
+    key <KPAD> { [ KP_Add		]				};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		]	};
+    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
+    key  <KP6> { [ Right, R12		], [ KP_6		]	};
+
+    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
+    key  <KP2> { [ Down, R14		], [ KP_2		]	};
+    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
+    key <KPEN> { [ KP_Enter		]				};
+
+    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
+    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
+    // End "Keypad" section, 
+    // begin "four keys up on the right"
+
+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
+    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1	{ Meta_L, Meta_R };
+    modifier_map Mod2	{ Alt_R };
+    modifier_map Mod3	{ Num_Lock };
+    modifier_map Mod4	{ Alt_L };
+};
+
+xkb_symbols "type5hobo" {
+
+    // Alphanumeric section
+    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	], [ KP_7 ]};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	], [ KP_8 ]};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	], [ KP_9 ]};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	], [ KP_Multiply]};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U		], [ kana_NA		], [ KP_4 ]	};
+    key <AD08> { [ i, I		], [ kana_NI		], [ KP_5 ]	};
+    key <AD09> { [ o, O		], [ kana_RA		], [ KP_6 ]	};
+    key <AD10> { [ p, P		], [ kana_SE		], [ KP_Subtract]};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return	], [ NoSymbol, NoSymbol], [ KP_Enter	] };
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J		], [ kana_MA		], [ KP_1 ]};
+    key <AC08> { [ k, K		], [ kana_NO		], [ KP_2 ]};
+    key <AC09> { [ l, L		], [ kana_RI		], [ KP_3 ]};
+    key <AC10> { [ semicolon, plus], [ kana_RE		], [ KP_Add ]};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		], [ KP_0 ]};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ], [ KP_Decimal ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ], [ KP_Divide ]};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+    key <RTSH> { [ Shift_R		]	};
+
+    key <LCTL> { [ Control_L		]			};
+    key <EXEC> { [ Execute		]			};
+    key <SPCE> { [ space		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+    key <LALT> { [ Alt_L		]	};
+    key <ALGR> { [ Mode_switch		]	};
+    key <LMTA> { [ Meta_L		]	};
+    key <RMTA> { [ Meta_R		]	};
+    key <COMP> { [ Multi_key		]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1, L1		], [ SunStop	]	};
+    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
+    key <PROP> { [ L3, L3		], [ SunProps	]	};
+    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5, L5		], [ SunFront	]	};
+    key <COPY> { [ L6, L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
+    key <PAST> { [ L8, L8		], [ SunPaste	]	};
+    key <FIND> { [ L9, L9		], [ SunFind	]	};
+    key <CUT>  { [ L10, L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
+    key <LEFT> { [ Left			]			};
+    key <RGHT> { [ Right		]			};
+    key <UP>   { [ Up			]			};
+    key <DOWN> { [ Down			]			};
+
+    key <DELE> { [ Delete		]			};
+    key <INS>  { [ Insert		]			};
+    key <PGUP> { [ Prior		]			};
+    key <PGDN> { [ Next			]			};
+    key <HOME> { [ Home			]			};
+    key <END>  { [ End			]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+     key <NMLK> { [ Num_Lock 		]				};
+//     key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
+//     key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+//     key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
+
+//     key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
+//     key  <KP8> { [ Up, R8		], [ KP_8		]	};
+//     key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
+//     key <KPAD> { [ KP_Add		]				};
+
+//     key  <KP4> { [ Left, R10		], [ KP_4		]	};
+//     key  <KP5> { [ R11,	R11		], [ KP_5		]	};
+//     key  <KP6> { [ Right, R12		], [ KP_6		]	};
+
+//     key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
+//     key  <KP2> { [ Down, R14		], [ KP_2		]	};
+//     key  <KP3> { [ R15,	R15		], [ KP_3		]	};
+//     key <KPEN> { [ KP_Enter		]				};
+
+//     key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
+//     key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
+    // End "Keypad" section, 
+    // begin "four keys up on the right"
+
+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
+    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1	{ Meta_L, Meta_R };
+    modifier_map Mod2	{ Alt_R };
+    modifier_map Mod3	{ Num_Lock };
+    modifier_map Mod4	{ Alt_L };
+};
+
+// layout for a Japanese Type 6 Sun keyboard
+// Just shows differences from Type 6 US layout 
+partial
+xkb_symbols "type6" {
+
+    // Alphanumeric section
+    // Though Yen symbol is engraved on key AE13, JA L10N folks want backslash.
+    key <AE13> { [ backslash, bar       ], [ prolongedsound     ]       };
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+    key <AB11> { [ backslash, underscore], [ kana_RO		]	};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+
+    key <EXEC> { [ Execute		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+    key <ALGR> { [ Kana_Lock, Mode_switch ]	};
+    // End alphanumeric section
+};
+
+xkb_symbols "x86" {
+    include "sun_vndr/us(pc101)"
+    include "sun_vndr/jp(basic)"
+    key <TLDE> { [ Henkan_Mode, Henkan_Mode ], [ Henkan_Mode ] };
+
+    key <AE10> { [ 0, asciitilde	    ], [ kana_WA, kana_WO	]};
+    key <AE13> { [ backslash, bar	    ], [ prolongedsound		]};
+
+    
+    key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket	]};
+
+    key <ALGR> { [ Mode_switch ]	       };
+    key <RALT> { [ Alt_R ]	       };
+
+};
+
+xkb_symbols "J3100" {
+    include "sun_vndr/us(pc101)"
+
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+//    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+
+    key <SPCE> { [ space		]			};
+//    key <KANJ> { [ Kanji		]			};
+//    key <HENK> { [ Henkan_Mode		]			};
+//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
+//    key <BRCR> { [ Linefeed		]			};
+//    key <EXEC> { [ Execute		]			};
+
+    key <ESC>  { [ Escape, 3 ] };
+
+    key <AE02> { [ 2, at		], [ kana_FU			]};
+    key <AE06> { [ 6, asciicircum	], [ kana_O, kana_o		]};
+    key <AE07> { [ 7, ampersand		], [ kana_YA, kana_ya		]};
+    key <AE08> { [ 8, asterisk		], [ kana_YU, kana_yu		]};
+    key <AE09> { [ 9, parenleft		], [ kana_YO, kana_yo		]};
+    key <AE10> { [ 0, parenright	], [ kana_WA, kana_WO		]};
+    key <AE11> { [ minus, underscore	], [ kana_HO			]};
+    key <AE12> { [ equal, plus		], [ kana_HE			]};
+
+    key <BKSL> { [ backslash, bar	    ], [ prolongedsound		]};
+    key <AE12> { [ equal, plus		], [ kana_HE			]};
+
+    key <AD11> { [ bracketleft, braceleft  ], [ voicedsound		]};    
+    key <AD12> { [ bracketright, braceright  ], [ semivoicedsound, kana_openingbracket	]};    
+
+    key <AC10> { [ semicolon, colon	     ], [ kana_RE		]};    
+    key <AC11> { [ quoteright, quotedbl	     ], [ kana_KE		]};    
+
+    key <TLDE> { [ quoteleft, asciitilde ], [ kana_MU, kana_closingbracket	]};
+    key <LSGT> { [ backslash, bar	 ], [ kana_RO			]};
+//    key <ALGR> { [ Mode_switch ]	       };
+    key <RALT> { [ Henkan_Mode ]	       };
+    key <RCTL> { [ Mode_switch ]	       };
+
+};
+
+xkb_symbols "Muhenkan_x86" {
+    include "sun_vndr/jp(x86)"
+
+    key <EXEC> { [ Muhenkan ] };
+};
+
+
+
+partial
+xkb_symbols "type7" {
+    include "sun_vndr/jp(type6)"
+    key <AE10> { [ 0, asciitilde       ], [ kana_WA, kana_WO   ]       };
+    key <HZTG> { [ Henkan_Mode ] };
+    key <HENK> { [ Kana_Lock, Mode_switch ] };
+    key <ALGR> { [ Alt_R ] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ko b/xorg-server/xkbdata.src/symbols/sun_vndr/ko
new file mode 100644
index 000000000..ba26c5159
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/ko
@@ -0,0 +1,63 @@
+// $XdotOrg: $
+//
+// Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+//
+// Korean layout for a Type 4 Sun keyboard
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
+
+    key <LNFD> { [ Hangul		]			};
+    key <RALT> { [ Linefeed		]			};
+    key <COMP> { [ Hangul_Hanja		]			};
+
+};
+
+// Korean layout for a Type 5 Sun keyboard
+xkb_symbols "type5" {
+//    include "sun_vndr/us(type5basic)"
+
+    // A few keys are different
+    key <ALGR> { [ Hangul		]				  };
+    key <COMP> { [ Hangul_Hanja		]				  };
+    key <BKSL> { [ backslash, bar	], [ brokenbar			] };
+};
+
+// Korean layout for a Type 6 Sun keyboard
+partial
+xkb_symbols "type6" {
+//    include "sun_vndr/us(type5basic)"
+
+    // A few keys are different
+    key <ALGR> { [ Hangul		]				  };
+    key <COMP> { [ Hangul_Hanja		]				  };
+    key <BKSL> { [ backslash, bar	], [ brokenbar			] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/lt b/xorg-server/xkbdata.src/symbols/sun_vndr/lt
new file mode 100644
index 000000000..e9840a10e
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/lt
@@ -0,0 +1,81 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+// $TOG: hu /main/2 1997/06/13 06:25:05 kaleb $
+default partial alphanumeric_keys 
+xkb_symbols "type5" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Hungarian keyboard.
+
+    // Alphanumeric section
+
+    name[group1]="Lithuanian";
+
+    key <TLDE> {	[	quoteright,	asciitilde	],
+			[	quoteleft,	caron		]	};
+    key <AE02> {	[	2,		quotedbl	],
+			[	at				]	};
+    key <AE03> {	[	3,		slash		],
+			[	numbersign			]	};
+    key <AE04> {	[	4,		semicolon	],
+			[	dollar				]	};
+    key <AE05> {	[	5,		colon		],
+			[	percent				]	};
+    key <AE06> {	[	6,		comma		],
+			[	asciicircum			]	};
+    key <AE07> {	[	7,		period		],
+			[	ampersand			]	};
+    key <AE08> {	[	8,		question	],
+			[	asterisk			]	};
+    key <AE09> {	[	9,		parenleft	],
+			[	bracketleft,	braceleft	]	};
+    key <AE10> {	[	0,		parenright	],
+			[	bracketright,	braceright 	]	};
+    key <AD01> {	[	aogonek,	Aogonek		],
+			[	q,		Q		]	};
+    key <AD02> {	[	zcaron,		Zcaron		],
+			[	w,		W		]	};
+    key <AD11> {	[	iogonek,	Iogonek		]	};
+    key <AD12> {	[	ogonek				]	};
+    key <AC10> {	[	uogonek,	Uogonek		]	};
+    key <AC11> {	[	eabovedot,	Eabovedot	]	};
+    key <BKSL> {	[	asciicircum,	quoteright	]	};
+    key <LSGT> {	[	backslash,	bar		]	};
+    key <AB02> {	[	umacron,	Umacron		],
+			[	x,		X		]	};
+    key <AB08> {	[	ccaron,		Ccaron		],
+			[	less				]	};
+    key <AB09> {	[	scaron,		Scaron		],
+			[	greater				]	};
+    key <AB10> {	[	eogonek,	Eogonek		]	};
+
+    // End alphanumeric section
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/lv b/xorg-server/xkbdata.src/symbols/sun_vndr/lv
new file mode 100644
index 000000000..442242e53
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/lv
@@ -0,0 +1,75 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+default partial alphanumeric_keys 
+xkb_symbols "type5" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Latvian keyboard.
+
+    // Alphanumeric section
+
+    name[group1]="Latvian";
+
+    key <AE04> {	[	4,		dollar		],
+			[	section				]	};
+    key <AE08> {	[	8,		asterisk	],
+			[	multiply			]	};
+    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 <BKSL> {	[	degree,		bar		]	};
+    key <LSGT> {	[	backslash,	bar		]	};
+    key <AB01> {	[	z,		Z		],
+			[	zcaron,		Zcaron		]	};
+    key <AB03> {	[	c,		C		],
+			[	ccaron,		ccaron		]	};
+    key <AB06> {	[	n,		N		],
+			[	ncedilla,	Ncedilla	]	};
+    // End alphanumeric section
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/nl b/xorg-server/xkbdata.src/symbols/sun_vndr/nl
new file mode 100644
index 000000000..0feb57be7
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/nl
@@ -0,0 +1,68 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+    // A few keys are different
+
+    key <BKSL> { [ at, section		], [notsign ]		};
+    key <BRCR> { [ backslash, bar	]			};
+    key <AE01> { [ 1, exclam		], [onesuperior	]	};
+    key <AE02> { [ 2, quotedbl		], [twosuperior	]	};
+    key <AE03> { [ 3, numbersign	], [threesuperior]	};
+    key <AE04> { [ 4, dollar		], [onequarter	]	};
+    key <AE05> { [ 5, percent		], [onehalf	]	};
+    key <AE06> { [ 6, ampersand		], [threequarters]	};
+    key <AE07> { [ 7, underscore	], [sterling	]	};
+    key <AE08> { [ 8, parenleft		], [braceleft	]	};
+    key <AE09> { [ 9, parenright	], [braceright	]	};
+    key <AE10> { [ 0, quoteright	], [quoteleft	]	};
+    key <AE11> { [ slash, question	]			};
+    key <AE12> { [ degree, SunFA_Tilde	], [SunFA_Cedilla]	};
+    key <AD03> { [ e, E			], [EuroSign	]	};
+    key <AD11> { [ SunFA_Diaeresis, asciicircum], [SunFA_Circum]};
+    key <AD12> { [ asterisk, brokenbar	], [asciitilde	]	};
+    key <AC02> { [ S, NoSymbol		], [ssharp	]	};
+    key <AC10> { [ plus, plusminus	]			};
+    key <AC11> { [ SunFA_Acute, SunFA_Grave]			};
+    key <TLDE> { [ less, greater	]			};
+    key <LSGT> { [ bracketright, bracketleft]			};
+    key <AB01> { [ Z, NoSymbol		], [guillemotleft]	};
+    key <AB02> { [ X, NoSymbol		], [guillemotright]	};
+    key <AB03> { [ C, NoSymbol		], [cent	]	};
+    key <AB07> { [ M, NoSymbol		], [mu		]	};
+    key <AB08> { [ comma, semicolon	] 			};
+    key <AB09> { [ period, colon	]			};
+    key <AB10> { [ minus, equal		]			};
+    key <CAPS> { [ SunAltGraph		]			};
+//    key <COMP> { [ SunCompose		]			};
+    key <ALGR> { [ Caps_Lock		]			};
+ 
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/no b/xorg-server/xkbdata.src/symbols/sun_vndr/no
new file mode 100644
index 000000000..471e5e13d
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/no
@@ -0,0 +1,77 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+    // A few keys are different
+
+    key <BKSL> { [ bar, section		]			};
+    key <BRCR> { [ asciitilde, asciicircum]			};
+    key <AE02> { [ 2, quotedbl		], [at		]	};
+    key <AE03> { [ 3, numbersign	], [sterling	]	};
+    key <AE04> { [ 4, currency		], [dollar	]	};
+    key <AE06> { [ 6, ampersand		]			};
+    key <AE07> { [ 7, slash		], [braceleft	]	};
+    key <AE08> { [ 8, parenleft		], [bracketleft	]	};
+    key <AE09> { [ 9, parenright	], [bracketright]	};
+    key <AE10> { [ 0, equal		], [braceright	]	};
+    key <AE11> { [ plus, question	]			};
+    key <AE12> { [ backslash, SunFA_Grave], [SunFA_Acute]	};
+    key <AD03> { [ e, E			], [EuroSign	]	};
+    key <AD11> { [ Aring		]			};
+    key <AD12> { [ SunFA_Diaeresis, SunFA_Circum],[SunFA_Tilde] };
+    key <LCTL> { [ Caps_Lock		]			};
+    key <AC10> { [ Ooblique		]			};
+    key <AC11> { [ AE			]			};
+    key <TLDE> { [ quoteright, asterisk ], [quoteleft	]	};
+    key <LSGT> { [ less, greater	]			};
+    key <AB08> { [ comma, semicolon	]			};
+    key <AB09> { [ period, colon	]			};
+    key <AB10> { [ minus, underscore	]			};
+    key <CAPS> { [ Control_L		]			};
+
+};
+
+xkb_symbols "type5" {
+    include "no"
+
+    key <AE05> { [ 5, percent		], [asciitilde			]};
+    key <AE06> { [ 6, ampersand		], [asciicircum			]};
+    key <AE07> { [ 7, slash		], [ braceleft			]};
+    key <AE08> { [ 8, parenleft		], [ bracketright		]};
+    key <AE09> { [ 9, parenright	], [ bracketright		]};
+    key <AE10> { [ 0, equal		], [ braceright			]};
+
+    key <BKSL> { [ quoteright, asterisk	], [ quoteleft			]};
+    key <LSGT> { [ less, greater	]				};
+};
+
+
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/pl b/xorg-server/xkbdata.src/symbols/sun_vndr/pl
new file mode 100644
index 000000000..7c5362020
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/pl
@@ -0,0 +1,57 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+xkb_symbols "type5" {
+    include "sun_vndr/us(type5basic)"
+    // A few keys are different
+    key <TLDE> { [ quoteleft, asciitilde], [ degree, degree ]	};
+    key <AE02> { [ 2, quotedbl		], [ at		]	};
+    key <AE03> { [ 3, colon		], [ numbersign	]	};
+    key <AE04> { [ 4, question		], [ dollar	]	};
+    key <AE06> { [ 6, plus		], [ asciicircum ]	};
+    key <AE07> { [ 7, underscore	], [ ampersand	]	};
+    key <AE08> { [ 8, parenleft		], [ asterisk	]	};
+    key <AE09> { [ 9, parenright	]			};
+    key <AE10> { [ 0, equal		]			};
+    key <AE11> { [ zabovedot, Zabovedot	]			};
+    key <AE12> { [ dead_ogonek, Aacute ]			};
+    key <AD11> { [ oacute, zacute	], [ bracketleft, braceleft ] };
+    key <AD12> { [ slash, section	], [ bracketright, braceright ] };
+    key <AC02> { [ s, S			], [ ssharp	]	};
+    key <AC08> { [ k, K			], [ ampersand	]	};
+    key <AC10> { [ lstroke, Lstroke	]			};
+    key <AC11> { [ aogonek, eogonek	], [ quoteright	]	};
+    key <BKSL> { [ backslash, semicolon	], [ currency, bar ]	};
+    key <LSGT> { [ less, greater	]			};
+    key <AB08> { [ comma, sacute	], [ less	]	};
+    key <AB09> { [ period, nacute	], [ greater	]	};
+    key <AB10> { [ minus, cacute	]			};
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/pt b/xorg-server/xkbdata.src/symbols/sun_vndr/pt
new file mode 100644
index 000000000..8fdf8549d
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/pt
@@ -0,0 +1,88 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+xkb_symbols "type4" {
+    //this is a Portugal4 keyboard
+
+    key <BKSL> { [ bracketleft, braceleft], [guillemotleft]	};
+    key <BRCR> { [ bracketright, braceright], [guillemotright]	};
+    key <AE02> { [ 2, quotedbl		], [at		]	};
+    key <AE03> { [ 3, numbersign	], [sterling	]	};
+    key <AE04> { [ 4, dollar		], [section	]	};
+    key <AE06> { [ 6, ampersand		], [notsign	]	};
+    key <AE07> { [ 7, slash		]			};
+    key <AE08> { [ 8, parenleft		]			};
+    key <AE09> { [ 9, parenright	], [backslash	]	};
+    key <AE10> { [ 0, equal		], [bar		]	};
+    key <AE11> { [ quoteright, question	], [quoteleft	]	};
+    key <AE12> { [ exclamdown, questiondown]			};
+    key <AD03> { [ e, E			], [EuroSign	]	};
+    key <AD11> { [ SunFA_Diaeresis, asterisk], [plus	]	};
+    key <AD12> { [ SunFA_Acute, SunFA_Grave], [asciitilde]	};
+    key <LCTL> { [ Caps_Lock		]			};
+    key <AC10> { [ Ccedilla		]			};
+    key <AC11> { [ masculine, ordfeminine]			};
+    key <TLDE> { [ SunFA_Tilde, SunFA_Circum], [asciicircum]	};
+    key <LSGT> { [ less, greater	]			};
+    key <AB08> { [ comma, semicolon	]			};
+    key <AB09> { [ period, colon	]			};
+    key <AB10> { [ minus, underscore	]			};
+    key <CAPS> { [ Control_L		]			};
+
+};
+
+xkb_symbols "type5" {
+    include "pt"
+
+    key <TLDE> { [ backslash, bar	]				};
+    key <AE05> { [ 5, percent		], [asciitilde			]};
+    key <AE06> { [ 6, ampersand		], [asciicircum			]};
+    key <AE07> { [ 7, slash		], [ braceleft			]};
+    key <AE08> { [ 8, parenleft		], [ bracketleft		]};
+    key <AE09> { [ 9, parenright	], [ bracketright		]};
+    key <AE10> { [ 0, equal		], [ braceright			]};
+    key <AE11> { [ quoteright, question	], [quoteleft			]};
+
+    key <AD11> { [ plus, asterisk	], [SunFA_Diaeresis		]};
+
+};
+
+partial 
+xkb_symbols "type6" {
+    include "pt(sundeadkeys)"
+
+    key <AE05> { [ 5, percent		], [asciitilde			]};
+    key <AE06> { [ 6, ampersand		], [asciicircum			]};
+    key <AE07> { [ 7, slash		], [ braceleft			]};
+    key <AE08> { [ 8, parenleft		], [ bracketleft		]};
+    key <AE09> { [ 9, parenright	], [ bracketright		]};
+    key <AE10> { [ 0, equal		], [ braceright			]};
+    key <AE11> { [ quoteright, question	], [quoteleft			]};
+
+};
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ru b/xorg-server/xkbdata.src/symbols/sun_vndr/ru
new file mode 100644
index 000000000..97bd42df4
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/ru
@@ -0,0 +1,52 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+xkb_symbols "basic" {
+    include "ru"
+    // A few keys are different
+    key	<BKSL> {	[	backslash,	       bar	],
+			[	slash,           question	]	};
+   key	<AB10> {	[	    slash,	  question	],
+			[	  ediaeresis,	Ediaeresis	]	};
+
+};
+
+// layout for a Sun Type 6 Russian keyboard
+partial
+xkb_symbols "type6" {
+    include "sun_vndr/ru(basic)"
+
+    key <AE03> {        [               3,      numbersign      ],
+                        [               3,      numerosign      ]       };
+    key	<AE04> {	[		4,	dollar		],
+			[		4,	percent		]	};
+
+    key	<LSGT> {	[	backslash,	       bar	] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/se b/xorg-server/xkbdata.src/symbols/sun_vndr/se
new file mode 100644
index 000000000..38e530afa
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/se
@@ -0,0 +1,81 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+xkb_symbols "type4" {
+    key <BKSL> { [ section, onehalf	]			};
+    key <BRCR> { [ asciitilde, asciicircum ]			};
+    key <AE02> { [ 2, quotedbl		], [ at			] };
+    key <AE03> { [ 3, numbersign	], [ sterling		] };
+    key <AE04> { [ 4, currency		], [ dollar		] };
+    key <AE05> { [ 5, percent           ], [ degree           	] };
+    key <AE06> { [ 6, ampersand         ], [ notsign          	] };
+    key <AE07> { [ 7, slash             ], [ braceleft		] };
+    key <AE08> { [ 8, parenleft         ], [ bracketleft 	]};
+    key <AE09> { [ 9, parenright        ], [ bracketright     	] };
+    key <AE10> { [ 0, equal             ], [ braceright        	] };
+    key <AE11> { [ plus, question 	], [ backslash       	] };
+    key <AE12> { [ SunFA_Acute, SunFA_Grave ]			  };
+
+    key <AD03> { [ e, E                 ], [ EuroSign         ] };
+    key <AD11> { [ Aring ]					};
+    key <AD12> { [ SunFA_Diaeresis, SunFA_Circum ], [ SunFA_Tilde ] };
+
+    key <AC10> { [ Odiaeresis		]			};
+    key <AC11> { [ Adiaeresis		]			};
+    key <TLDE> { [ quoteright, asterisk	], [ quoteleft 		]};
+
+    key <LCTL> { [ Caps_Lock ] };
+    key <CAPS> { [ Control_L ] };
+    key <LSGT> { [ less, greater	]			};
+    key <AB08> { [ comma, semicolon	]			};
+    key <AB09> { [ period, colon	]			};
+    key <AB10> { [ minus, underscore	]			};
+};
+
+
+xkb_symbols "type5" {
+    include "se"
+
+    key <TLDE> { [ section, onehalf	]			};
+    key <AE07> { [ 7, slash             ], [ braceleft		] };
+    key <AE08> { [ 8, parenleft         ], [ bracketleft 	]};
+    key <AE09> { [ 9, parenright        ], [ bracketright     	] };
+    key <AE10> { [ 0, equal             ], [ braceright        	] };
+    key <AE11> { [ plus, question 	], [ backslash       	] };
+
+    key <AD12> { [ SunFA_Diaeresis, asciicircum ], [ asciitilde ] };
+    key <BKSL> { [ quoteright, asterisk	], [ quoteleft 		]};
+};
+  
+partial 
+xkb_symbols "type6" {
+    include "se(Sundeadkeys)"
+
+    key <AD12> { [ SunFA_Diaeresis, asciicircum ], [ asciitilde, caron ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/solaris b/xorg-server/xkbdata.src/symbols/sun_vndr/solaris
new file mode 100644
index 000000000..11a738143
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/solaris
@@ -0,0 +1,179 @@
+//-------------------------------------------------------------------------
+//
+// Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+//-------------------------------------------------------------------------
+//
+// ident "@(#)solaris 1.7     05/11/08 SMI"
+//
+
+// Default map provides backwards compatibility with Sun keyboards from
+// long ago and the key mappings still used in Solaris Xsun today
+
+partial default
+xkb_symbols "defaults" {
+
+    // Left side keys were labeled L1-L10 on Sun Type 2 & Type 3 keyboards
+    // and the names have stuck (you can spot a longtime Sun admin when you
+    // hear them say to hit "L1-A" to enter the OpenBoot PROM)
+    // These names get mapped to the keysyms F11-F20
+    key <STOP> { [ L1,  L1              ], [ SunStop    ]       };
+    key <AGAI> { [ L2,  L2              ], [ SunAgain   ]       };
+    key <PROP> { [ L3,  L3              ], [ SunProps   ]       };
+    key <UNDO> { [ L4,  L4              ], [ SunUndo    ]       };
+    key <FRNT> { [ L5,  L5              ], [ SunFront   ]       };
+    key <COPY> { [ L6,  L6              ], [ SunCopy    ]       };
+    key <OPEN> { [ L7,  L7              ], [ SunOpen    ]       };
+    key <PAST> { [ L8,  L8              ], [ SunPaste   ]       };
+    key <FIND> { [ L9,  L9              ], [ SunFind    ]       };
+    key <CUT>  { [ L10, L10             ], [ SunCut     ]       };
+
+    // And on the right side, the function keys were labeled R1-R15,
+    // which get mapped to the keysyms F21-F35
+    // This includes the keys that became the numeric keypad
+    key <PAUS> { [ R1,  R1              ], [ Pause              ] };
+    key <PRSC> { [ R2,  R2              ], [ Print              ] };
+    key <SCLK> { [ R3,  R3              ], [ Scroll_Lock, Break ] };
+
+    key <KPEQ> { [ KP_Equal             ], [ R4, KP_Equal       ] };
+    key <KPDV> { [ KP_Divide            ], [ R5, KP_Divide      ] };
+    key <KPMU> { [ KP_Multiply          ], [ R6, KP_Multiply    ] };
+
+    key  <KP7> { [ KP_Home,  KP_7, R7   ], [ R7, KP_7, Home     ] };
+    key  <KP8> { [ KP_Up,    KP_8, R8   ], [ R8, KP_8, Up       ] };
+    key  <KP9> { [ KP_Prior, KP_9, R9   ], [ R9, KP_9, Prior    ] };
+
+    key  <KP4> { [ KP_Left,  KP_4, R10  ], [ R10, KP_4, Left    ] };
+    key  <KP5> { [ KP_Begin, KP_5, R11  ], [ R11, KP_5          ] };
+    key  <KP6> { [ KP_Right, KP_6, R12  ], [ R12, KP_6, Right   ] };
+
+    key  <KP1> { [ KP_End,   KP_1, R13  ], [ R13, KP_1, End     ] };
+    key  <KP2> { [ KP_Down,  KP_2, R14  ], [ R14, KP_2, Down    ] };
+    key  <KP3> { [ KP_Next,  KP_3, R15  ], [ R15, KP_3, Next    ] };
+
+    // F11 & F12 are mapped to SunF36 and SunF37 since they were added
+    // after F11-F35 were already assigned on Sun keyboards
+    key <FK11> { [ SunF36               ], [ F11                ] };
+    key <FK12> { [ SunF37               ], [ F12                ] };
+
+    // These were added to the keyboard much later and simply got mapped
+    // to their logical names
+    key <HELP> { [ Help                 ]                       };
+    key <MUTE> { [  SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]	};
+    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness	]	};
+    key <POWR> { [  SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    key <LALT> { [ Alt_L                ]                       };
+    // key <RALT> { [ Mode_switch          ]                       };
+    // key <ALGR> { [ Mode_switch          ]                       };
+    key <LMTA> { [ Meta_L               ]                       };
+    key <RMTA> { [ Meta_R               ]                       };
+    key <COMP> { [ Multi_key            ]                       };
+
+    // begin modifier mappings
+    modifier_map Shift          { Shift_R, Shift_L };
+    modifier_map Mod1           { Alt_L };
+    modifier_map Mod2           { Alt_R, Mode_switch };
+    modifier_map Mod3           { Num_Lock };
+    modifier_map Mod4           { Meta_L, Meta_R };
+
+};
+
+// Map the keys to the actual key names instead of the ancient Sun function
+// keys
+partial
+xkb_symbols "keynames" {
+    key <FK11> { [ F11          ],      [ SunF36   ]    };
+    key <FK12> { [ F12          ],      [ SunF37   ]    };
+
+    key <STOP> { [ Cancel	],	[ F11	]	};
+    key <AGAI> { [ Redo		],	[ F12	]	};
+    key <PROP> { [ SunProps	],	[ F13	]	};
+    key <UNDO> { [ Undo		],	[ F14	]	};
+    key <FRNT> { [ SunFront	],	[ F15	]	};
+    key <COPY> { [ SunCopy	],	[ F16	]	};
+    key <OPEN> { [ SunOpen	],	[ F17	]	};
+    key <PAST> { [ SunPaste	],	[ F18	]	};
+    key <FIND> { [ Find		],	[ F19	]	};
+    key <CUT>  { [ SunCut	],	[ F20	]	};
+
+    key <HELP> { [ Help		]	                };
+
+    key <PAUS> {  [  Pause                      ]       };
+    key <PRSC> {  [  Print                      ]       };
+    key <SCLK> {  [  Scroll_Lock, Break         ]       };
+
+    key  <KP7> {        [  KP_Home,     KP_7    ]       };
+    key  <KP8> {        [  KP_Up,       KP_8    ]       };
+    key  <KP9> {        [  KP_Prior,    KP_9    ]       };
+
+    key  <KP4> {        [  KP_Left,     KP_4    ]       };
+    key  <KP5> {        [  KP_Begin,    KP_5    ]       };
+    key  <KP6> {        [  KP_Right,    KP_6    ]       };
+
+    key  <KP1> {        [  KP_End,      KP_1    ]       };
+    key  <KP2> {        [  KP_Down,     KP_2    ]       };
+    key  <KP3> {        [  KP_Next,     KP_3    ]       };
+
+    key <KPEN> {        [       KP_Enter        ]       };
+    key <KPEQ> {        [       KP_Equal        ]       };
+
+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ SunAudioLowerVolume, SunVideoLowerBrightness ]	};
+    key <VOL+> { [ SunAudioRaiseVolume, SunVideoRaiseBrightness	]	};
+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    key <LALT> { [ Alt_L                ]                       };
+    key <RALT> { [ Mode_switch          ]                       };
+    key <ALGR> { [ Mode_switch          ]                       };
+    key <LMTA> { [ Meta_L               ]                       };
+    key <RMTA> { [ Meta_R               ]                       };
+    key <COMP> { [ Multi_key            ]                       };
+
+};
+
+// Map the keys to the XFree86 key names instead of the Sun key names
+partial
+xkb_symbols "xf86keynames" {
+    key <STOP> { [ XF86Stop	],	[ F11	]	};
+    key <AGAI> { [ Redo		],	[ F12	]	};
+    key <PROP> { [ SunProps	],	[ F13	]	};
+    key <UNDO> { [ Undo		],	[ F14	]	};
+    key <FRNT> { [ SunFront	],	[ F15	]	};
+    key <COPY> { [ XF86Copy	],	[ F16	]	};
+    key <OPEN> { [ XF86Open	],	[ F17	]	};
+    key <PAST> { [ XF86Paste	],	[ F18	]	};
+    key <FIND> { [ Find		],	[ F19	]	};
+    key <CUT>  { [ XF86Cut	],	[ F20	]	};
+
+    key <MUTE> { [ XF86AudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ XF86AudioLowerVolume,SunVideoLowerBrightness ]	};
+    key <VOL+> { [ XF86AudioRaiseVolume,SunVideoRaiseBrightness	]	};
+    key <POWR> { [ XF86Sleep,		XF86PowerDown	]	};
+};
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/sw b/xorg-server/xkbdata.src/symbols/sun_vndr/sw
new file mode 100644
index 000000000..11a1b4774
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/sw
@@ -0,0 +1,173 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+xkb_symbols "type4de" {
+    include "sun_vndr/us(type4basic)"
+    // A few keys are different
+    key <BKSL> { [ less, braceleft      ]                       };
+
+    key <BRCR> { [ greater, braceright  ]                       };
+    key <DELE> { [ Delete               ]                       };
+
+    key <AE01> { [ 1, plus              ], [exclam      ]       };
+    key <AE02> { [ 2, quotedbl          ], [at          ]       };
+    key <AE03> { [ 3, asterisk          ], [numbersign  ]       };
+    key <AE04> { [ 4, ccedilla          ], [cent        ]       };
+    key <AE05> { [ 5, percent           ], [asciitilde  ]       };
+    key <AE06> { [ 6, ampersand         ], [section     ]       };
+    key <AE07> { [ 7, slash             ], [bar         ]       };
+    key <AE08> { [ 8, parenleft         ], [degree      ]       };
+    key <AE09> { [ 9, parenright        ], [backslash   ]       };
+    key <AE10> { [ 0, equal             ], [asciicircum ]       };
+    Key <AE11> { [ quoteright, question ], [quoteleft   ]       };
+    key <AE12> { [ SunFA_Circum, SunFA_Grave    ]               };
+    key <AD03> { [ e, E                 ], [EuroSign    ]       };
+    key <AD06> { [ Z                    ]                       };
+    key <AD11> { [ udiaeresis, egrave   ]                       };
+    key <AD12> { [ SunFA_Diaeresis, SunFA_Acute ]               };
+    key <AC10> { [ odiaeresis, eacute   ]                       };
+    key <AC11> { [ adiaeresis, agrave   ]                       };
+    key <TLDE> { [ dollar, SunFA_Tilde  ], [sterling    ]       };
+    key <LSGT> { [ bracketright, bracketleft   ], [ backslash ] };
+    key <AB01> { [ Y                    ]                       };
+    key <AB07> { [ M, NoSymbol          ], [mu  ]               };
+    key <AB08> { [ comma, semicolon     ]                       };
+    key <AB09> { [ period, colon        ]                       };
+    key <AB10> { [ minus, underscore    ]                       };
+    key <COMP> { [ SunAltGraph          ]                       };
+    key <ALGR> { [ SunCompose           ]                       };
+
+};
+
+xkb_symbols "type4fr" {
+    include "sun_vndr/us(type4basic)"
+    // A few keys are different
+    key <BKSL> { [ less, braceleft	]			};
+
+    key <BRCR> { [ greater, braceright  ]                       };
+    key <DELE> { [ Delete               ]                       };
+
+    key <AE01> { [ 1, plus		], [exclam	]	};
+    key <AE02> { [ 2, quotedbl		], [at	 	]	};
+    key <AE03> { [ 3, asterisk		], [numbersign	]	};
+    key <AE04> { [ 4, ccedilla		], [cent	]	};
+    key <AE05> { [ 5, percent		], [asciitilde	]	};
+    key <AE06> { [ 6, ampersand		], [section	]	};
+    key <AE07> { [ 7, slash		], [bar		]	};
+    key <AE08> { [ 8, parenleft		], [degree	]	};
+    key <AE09> { [ 9, parenright	], [backslash	]	};
+    key <AE10> { [ 0, equal		], [asciicircum	]	};
+    Key <AE11> { [ quoteright, question ], [quoteleft	]	};
+    key <AE12> { [ SunFA_Circum, SunFA_Grave	]		};
+    key <AD03> { [ e, E			], [EuroSign	]	};
+    key <AD06> { [ Z			]			};
+    key <AD11> { [ egrave, udiaeresis	]			};
+    key <AD12> { [ SunFA_Diaeresis, SunFA_Acute	]		};
+    key <AC10> { [ eacute, odiaeresis	]			};
+    key <AC11> { [ agrave, adiaeresis	]			};
+    key <TLDE> { [ dollar, SunFA_Tilde	], [sterling	]	};
+    key <LSGT> { [ bracketright, bracketleft   ], [ backslash ] };
+    key <AB01> { [ Y			]			};
+    key <AB07> { [ M, NoSymbol		], [mu	]		};
+    key <AB08> { [ comma, semicolon	]			};
+    key <AB09> { [ period, colon	]			};
+    key <AB10> { [ minus, underscore	]			};
+    key <COMP> { [ SunAltGraph		]			};
+    key <ALGR> { [ SunCompose		]			}; 
+
+
+
+};
+
+xkb_symbols "type5fr" {
+
+    key <TLDE> { [ section, degree	]				};
+
+    key <AE01> { [ 1, plus		], [bar				]};
+    key <AE02> { [ 2, quotedbl		], [at	 	]		};
+    key <AE03> { [ 3, asterisk		], [numbersign	]		};
+    key <AE04> { [ 4, ccedilla		], [asciicircum	]		};
+    key <AE05> { [ 5, percent		], [asciitilde	]		};
+    key <AE06> { [ 6, ampersand		], [section	]		};
+    key <AE07> { [ 7, slash		], [bar		]		};
+    key <AE08> { [ 8, parenleft		], [degree	]		};
+    key <AE09> { [ 9, parenright	], [backslash	]		};
+    key <AE10> { [ 0, equal		], [quoteleft	]		};
+    Key <AE11> { [ quoteright, question ], [SunFA_Acute	]		};
+    key <AE12> { [ SunFA_Circum, SunFA_Grave], [ SunFA_Tilde		]};
+    key <AD03> { [ e, E			], [EuroSign	]		};
+    key <AD06> { [ z, Z			]				};
+    key <AD11> { [ egrave, udiaeresis	], [ bracketleft		]};
+    key <AD12> { [ SunFA_Diaeresis, exclam], [ bracketright		]};
+
+    key <AC10> { [ eacute, odiaeresis	]				};
+    key <AC11> { [ agrave, adiaeresis	], [ braceleft			]};
+    key <BKSL> { [ dollar, sterling	], [ braceright			]};
+
+    key <LSGT> { [ less, greater	], [ backslash			]};
+    key <AB01> { [ y, Y			]			};
+    key <AB08> { [ comma, semicolon	]			};
+    key <AB09> { [ period, colon	]			};
+    key <AB10> { [ minus, underscore	]			};
+    
+};
+
+xkb_symbols "type5de" {
+
+    key <TLDE> { [ section, degree	]				};
+
+    key <AE01> { [ 1, plus		], [bar				]};
+    key <AE02> { [ 2, quotedbl		], [at	 	]		};
+    key <AE03> { [ 3, asterisk		], [numbersign	]		};
+    key <AE04> { [ 4, ccedilla		], [asciicircum	]		};
+    key <AE05> { [ 5, percent		], [asciitilde	]		};
+    key <AE06> { [ 6, ampersand		], [section	]		};
+    key <AE07> { [ 7, slash		], [bar		]		};
+    key <AE08> { [ 8, parenleft		], [degree	]		};
+    key <AE09> { [ 9, parenright	], [backslash	]		};
+    key <AE10> { [ 0, equal		], [quoteleft	]		};
+    Key <AE11> { [ quoteright, question ], [SunFA_Acute	]		};
+    key <AE12> { [ SunFA_Circum, SunFA_Grave], [ SunFA_Tilde		]};
+    key <AD03> { [ e, E			], [EuroSign	]		};
+    key <AD06> { [ z, Z			]				};
+    key <AD11> { [ udiaeresis, egrave	], [ bracketleft		]};
+    key <AD12> { [ SunFA_Diaeresis, exclam], [ bracketright		]};
+
+    key <AC10> { [ odiaeresis, eacute	]				};
+    key <AC11> { [ adiaeresis, agrave	], [ braceleft			]};
+    key <BKSL> { [ dollar, sterling	], [ braceright			]};
+
+    key <LSGT> { [ less, greater	], [ backslash			]};
+    key <AB01> { [ y, Y			]			};
+    key <AB08> { [ comma, semicolon	]			};
+    key <AB09> { [ period, colon	]			};
+    key <AB10> { [ minus, underscore	]			};
+    
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tr b/xorg-server/xkbdata.src/symbols/sun_vndr/tr
new file mode 100644
index 000000000..f70396e0e
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/tr
@@ -0,0 +1,119 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+xkb_symbols "basic" {
+   include "sun_vndr/tr(type6Q)"
+};
+
+xkb_symbols "type6Q" {
+
+   key <TLDE> { [ quotedbl, eacute	], [ asciitilde			]};
+   key <AE02> { [ 2, quoteright		]				};
+   key <AE03> { [ 3, asciicircum	], [ numbersign			]};
+   key <AE04> { [ 4, plus		], [ dollar			]};
+   key <AE06> { [ 6, ampersand		]				};
+   key <AE07> { [ 7, slash		], [ braceleft			]};
+   key <AE08> { [ 8, parenleft		], [ bracketright		]};
+   key <AE09> { [ 9, parenright		], [ bracketright		]};
+   key <AE10> { [ 0, equal		], [ braceright			]};
+   key <AE11> { [ asterisk, question	], [ backslash			]};
+   key <AE12> { [ minus, underscore	]				};
+
+   key <AD01> { [ q, Q			], [ at				]};
+   key <AD11> { [ gbreve, Gbreve	], [ gbreve, Gbreve		]};
+   key <AD12> { [ udiaeresis, Udiaeresis], [ asciitilde, Udiaeresis	]};
+
+   key <AC10> { [ scedilla, Scedilla	], [ comma			]};
+   key <AC11> { [ Iabovedot, Iabovedot	], [ Iabovedot, Iabovedot	]};
+   key <BKSL> { [ comma, semicolon	], [ quoteleft			]};
+
+   key <LSGT> { [ less, greater		], [ bar			]};
+   key <AB08> { [ odiaeresis, Odiaeresis], [ odiaeresis, Odiaeresis	]};
+   key <AB09> { [ ccedilla, Ccedilla	], [ ccedilla, Ccedilla		]};
+   key <AB10> { [ period, colon		], [ quotedbl			]};
+   
+};
+
+xkb_symbols "type6F" {
+
+
+   key	<TLDE> { [ plus     ,asterisk		],  [plusminus     ]};
+   key	<AE01> { [ 1	    ,exclam		],  [onesuperior   ]};
+   key	<AE02> { [ 2	    ,quotedbl		],  [twosuperior   ]};
+   key	<AE03> { [ 3	    ,asciicircum  	],  [numbersign    ]};
+   key	<AE04> { [ 4	    ,dollar		],  [onequarter    ]};
+   key	<AE05> { [ 5	    ,percent		],  [onehalf       ]};
+   key	<AE06> { [ 6	    ,ampersand		],  [threequarters ]};
+   key	<AE07> { [ 7	    ,quoteright   	],  [braceleft     ]};
+   key	<AE08> { [ 8	    ,parenleft		],  [bracketleft   ]};
+   key	<AE09> { [ 9	    ,parenright		],  [bracketright  ]};
+   key	<AE10> { [ 0	    ,equal		],  [braceright    ]};
+   key	<AE11> { [ slash    ,question    	],  [backslash     ]};
+   key	<AE12> { [ minus    ,underscore   	],  [bar           ]};
+
+   key  <AD01> { [ f         ,F            ],  [at		]};
+   key  <AD02> { [ g         ,G            ]};
+   key  <AD03> { [ gbreve    ,Gbreve       ],  [gbreve, Gbreve	]};
+   key  <AD04> { [ idotless  ,I            ],  [paragraph	]};
+   key  <AD05> { [ o         ,O            ]};
+   key  <AD06> { [ d         ,D            ],  [yen		]};
+   key  <AD07> { [ r         ,R            ]};
+   key  <AD08> { [ n         ,N            ]};
+   key  <AD09> { [ h         ,H            ],  [degree		]};
+   key  <AD10> { [ p         ,P            ],  [sterling	]};
+   key  <AD11> { [ q         ,Q            ],  [diaeresis	]};
+   key  <AD12> { [ w         ,W            ],  [asciitilde	]};
+   key  <BKSL> { [ x         ,X            ],  [quoteleft	]};
+
+   key  <AC01> { [ u         ,U        	],	[AE			]};
+   key  <AC02> { [ i	     ,Iabovedot	],	[ssharp			]};
+   key  <AC03> { [ e	     ,E  	]};
+   key  <AC04> { [ a	     ,A  	]};
+   key  <AC05> { [ udiaeresis,Udiaeresis]}; 
+   key  <AC06> { [ t	     ,T  	]};
+   key  <AC07> { [ k	     ,K  	]};
+   key  <AC08> { [ m	     ,M  	]};
+   key  <AC10> { [ y         ,Y		],	[quoteright		]};
+   key  <AC11> { [ scedilla  ,Scedilla	],	[numbersign,   Scedilla	]};
+
+   key  <LSGT> { [ less, greater           ],  [bar		]};
+   key  <AB01> { [ j           ,J          ],  [less		]};
+   key  <AB02> { [ odiaeresis  ,Odiaeresis ],  [greater		]};
+   key  <AB03> { [ v           ,V          ],  [cent		]};
+   key  <AB04> { [ c	       ,C          ]};
+   key  <AB05> { [ ccedilla    ,Ccedilla   ],  [ccedilla, Ccedilla	]};
+   key  <AB06> { [ z	       ,Z          ]};
+   key  <AB07> { [ s           ,S          ],  [mu		]};
+   key  <AB08> { [ b           ,B          ],  [multiply	]};
+   key  <AB09> { [ period      ,colon      ],  [division	]};
+   key  <AB10> { [ comma       ,semicolon  ]};
+
+
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tuv b/xorg-server/xkbdata.src/symbols/sun_vndr/tuv
new file mode 100644
index 000000000..cda512ecc
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/tuv
@@ -0,0 +1,241 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//All Rights Reserved.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// US/ASCII layout for a Type 4 Sun keyboard
+xkb_symbols "type4basic" {
+    include "us(basic)"
+
+    key <RTSH> { [ Shift_R		]			};
+    key <LALT> { [ Alt_L		]			};
+    key <ALGR> { [ Mode_switch		]			};
+    key <LMTA> { [ Meta_L		]			};
+    key <RMTA> { [ Meta_R		]			};
+    key <LNFD> { [ Linefeed		]			};
+    key <COMP> { [ Multi_key		]			};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1,	L1		], [ SunStop	]	};
+    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
+    key <PROP> { [ L3,	L3		], [ SunProps	]	};
+    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
+    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
+    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
+    key <FIND> { [ L9,	L9		], [ SunFind	]	};
+    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2,	R2		], [ Print		] };
+    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
+    key <PAUS> { [ R1,	R1		], [ Pause		] };
+    key <DELE> { [ Delete		]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]			};
+    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
+    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
+    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
+    key <KPSU> { [ KP_Subtract		]			};
+
+    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
+    key  <KP8> { [ Up, R8               ], [ KP_8               ] };
+//    key  <KP8> { [ R8,	R8		], [ KP_8		] };
+    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
+    key <KPAD> { [ KP_Add		]			};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		] };
+    key  <KP5> { [ R11,	R11		], [ KP_5		] };
+    key  <KP6> { [ Right, R12		], [ KP_6		] };
+
+    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
+    key  <KP2> { [ Down, R14		], [ KP_2		] };
+    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
+    key <KPEN> { [ KP_Enter		]			}; 
+    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
+    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R, Shift_L };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2   	{ Mode_switch };
+    modifier_map Mod3   	{ Num_Lock };
+    modifier_map Mod4		{ Alt_L };
+};
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5basic" {
+    include "us(basic)"
+
+    key <RTSH> { [ Shift_R		]	};
+    key <LALT> { [ Alt_L		]	};
+    key <ALGR> { [ Mode_switch		]	};
+    key <LMTA> { [ Meta_L		]	};
+    key <RMTA> { [ Meta_R		]	};
+    key <COMP> { [ Multi_key		]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1, L1		], [ SunStop	]	};
+    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
+    key <PROP> { [ L3, L3		], [ SunProps	]	};
+    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5, L5		], [ SunFront	]	};
+    key <COPY> { [ L6, L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
+    key <PAST> { [ L8, L8		], [ SunPaste	]	};
+    key <FIND> { [ L9, L9		], [ SunFind	]	};
+    key <CUT>  { [ L10, L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
+    key <LEFT> { [ Left			]			};
+    key <RGHT> { [ Right		]			};
+    key <UP>   { [ Up			]			};
+    key <DOWN> { [ Down			]			};
+
+    key <DELE> { [ Delete		]			};
+    key <INS>  { [ Insert		]			};
+    key <PGUP> { [ Prior		]			};
+    key <PGDN> { [ Next			]			};
+    key <HOME> { [ Home			]			};
+    key <END>  { [ End			]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]				};
+    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
+    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
+
+    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
+    key  <KP8> { [ Up, R8		], [ KP_8		]	};
+    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
+    key <KPAD> { [ KP_Add		]				};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		]	};
+    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
+    key  <KP6> { [ Right, R12		], [ KP_6		]	};
+
+    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
+    key  <KP2> { [ Down, R14		], [ KP_2		]	};
+    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
+    key <KPEN> { [ KP_Enter		]				};
+
+    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
+    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
+    // End "Keypad" section, 
+    // begin "four keys up on the right"
+
+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
+    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1	{ Meta_L, Meta_R };
+    modifier_map Mod2	{ Alt_R };
+    modifier_map Mod3	{ Num_Lock };
+    modifier_map Mod4	{ Alt_L };
+};
+
+xkb_symbols "type5" {
+    include "sun_vndr/us(type5basic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tw b/xorg-server/xkbdata.src/symbols/sun_vndr/tw
new file mode 100644
index 000000000..212c9fb57
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/tw
@@ -0,0 +1,59 @@
+// $XdotOrg: $
+//
+// Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+//
+// Taiwanese layout for a Type 4 Sun keyboard
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
+
+//    key <LNFD> { [ Hangul		]			};
+//    key <RALT> { [ Linefeed		]			};
+    key <COMP> { [ Henkan_Mode		]			};
+
+};
+
+// Taiwanese layout for a Type 5 Sun keyboard
+xkb_symbols "type5" {
+
+    // A few keys are different
+    key <ALGR> { [ Henkan_Mode		]			};
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
+
+};
+
+// Taiwanese layout for a Type 6 Sun keyboard
+partial
+xkb_symbols "type6" {
+    // A few keys are different from US layout - only those are shown here
+    key <ALGR> { [ Henkan_Mode		]			};
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/us b/xorg-server/xkbdata.src/symbols/sun_vndr/us
new file mode 100644
index 000000000..5378cf888
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/us
@@ -0,0 +1,330 @@
+// $XdotOrg: $
+//
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
+// Sun: @(#)us	1.5	03/04/21 SMI
+//
+//Copyright 1996, 1998  The Open Group
+//
+//All Rights Reserved.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+
+// Symbols shared by all Sun Keyboard layouts
+hidden
+xkb_symbols "sunbasic" {
+    include "srvr_ctrl(xfree86)"
+
+    // Needed for left function keys and volume keys
+    // Need to include this before us(basic) otherwise tilde is mapped to 
+    // a jp key
+    include "inet(evdev)"
+
+    include "us(basic)"
+    include "pc(function)"
+    include "pc(editing)"
+    include "keypad(x11)"
+
+    include "sun_vndr/us(left_funkeys)"
+
+    include "capslock(capslock)"
+    //include "capslock(shiftlock)"
+
+    key <LFSH> { [ Shift_L		]			};
+    key <RTSH> { [ Shift_R		]			};
+    key <LALT> { [ Alt_L		]			};
+    key <ALGR> { [ Mode_switch		]			};
+    key <LMTA> { [ Meta_L		]			};
+    key <RMTA> { [ Meta_R		]			};
+    key <LCTL> { [ Control_L		]			};
+    key <RCTL> { [ Control_R		]			};
+    key <COMP> { [ Multi_key		]			};
+
+    key  <TAB> { [ Tab,  ISO_Left_Tab	]			};
+    key <RTRN> { [ Return		]			};
+
+    key <ESC>  { [ Escape		]			}; 
+
+    key <NMLK> { [ Num_Lock, Pointer_EnableKeys	] };
+    key <SPCE> { [ space                        ] };
+
+    // By default, we use the same symbols as other XKB implementations
+    // for greater compatibility & AccessX MouseKeys support, but it is 
+    // different than the traditional Sun key mappings that date back to the
+    // Sun Type 2 keyboard, in which the right side numpad were "R" function
+    // keys.  To restore the original behavior, uncomment the section below 
+    // that lists the R key mappings.
+//    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
+//    key  <KP8> { [ Up, R8               ], [ KP_8               ] };
+//    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
+//    key <KPAD> { [ KP_Add		]			};
+//
+//    key  <KP4> { [ Left, R10		], [ KP_4		] };
+//    key  <KP5> { [ R11,	R11		], [ KP_5		] };
+//    key  <KP6> { [ Right, R12		], [ KP_6		] };
+//
+//    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
+//    key  <KP2> { [ Down, R14		], [ KP_2		] };
+//    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
+//    key <KPEN> { [ KP_Enter		]			}; 
+//    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
+//    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
+
+      // End "Keypad" section
+
+    modifier_map Control { Control_L, Control_R };
+    modifier_map Shift   { Shift_R, Shift_L };
+    modifier_map Mod1    { Meta_L, Meta_R };
+    modifier_map Mod2    { Mode_switch };
+    modifier_map Mod3    { Num_Lock };
+    modifier_map Mod4    { Alt_L };
+};
+
+hidden
+xkb_symbols "left_funkeys" {
+    // Suppliment to inet(evdev) for added functionality of left-funkeys
+    key <STOP> { [ NoSymbol ],      [ L1, L1   ]       };
+    key <AGAI> { [ NoSymbol ],      [ L2, L2   ]       };
+    key <PROP> { [ NoSymbol ],      [ L3, L3   ]       };
+    key <UNDO> { [ NoSymbol ],      [ L4, L4   ]       };
+    key <FRNT> { [ NoSymbol ],      [ L5, L5   ]       };
+    key <COPY> { [ NoSymbol ],      [ L6, L6   ]       };
+    key <OPEN> { [ NoSymbol ],      [ L7, L7   ]       };
+    key <PAST> { [ NoSymbol ],      [ L8, L8   ]       };
+    key <FIND> { [ NoSymbol ],      [ L9, L9   ]       };
+    key <CUT>  { [ NoSymbol ],      [ L10, L10 ]       };
+
+    // The above symbols were chosen for better compatibility withother xkb
+    // mappings.  The old mappings are kepy below in case someone needs them
+    //key <STOP> { [ L1,	L1		], [ SunStop	]	};
+    //key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
+    //key <PROP> { [ L3,	L3		], [ SunProps	]	};
+    //key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
+    //key <FRNT> { [ L5,	L5		], [ SunFront	]	};
+    //key <COPY> { [ L6,	L6		], [ SunCopy	]	};
+    //key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
+    //key <PAST> { [ L8,	L8		], [ SunPaste	]	};
+    //key <FIND> { [ L9,	L9		], [ SunFind	]	};
+    //key <CUT>  { [ L10,	L10		], [ SunCut	]	};
+};
+
+hidden
+xkb_symbols "volumekeys" {
+    // Suppliment to inet(evdev) for added functionality of audio keys
+    key <MUTE> { [ NoSymbol,	SunVideoDegauss		]	};
+    key <VOL-> { [ NoSymbol,	XF86MonBrightnessDown   ]	};
+    key <VOL+> { [ NoSymbol,	XF86MonBrightnessUp	]	};
+
+    // The above symbols were chosen for better compatibility withother xkb
+    // mappings.  The old mappings are kepy below in case someone needs them
+    //key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    //key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
+    //key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
+    //key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+};
+
+// US/ASCII layout for a Type 4 Sun keyboard
+xkb_symbols "type4basic" {
+    include "sun_vndr/us(sunbasic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+
+    key <LNFD> { [ Linefeed		]			};
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2,	R2		], [ Print		] };
+    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
+    key <PAUS> { [ R1,	R1		], [ Pause		] };
+
+    // End "Editing" section, begin "Keypad"
+    key <KPEQ> { [ R4,	KP_Equal	], [ KP_Equal		] };
+};
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5basic" {
+    include "sun_vndr/us(sunbasic)"
+    include "sun_vndr/us(volumekeys)"
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
+    // End "Editing" section
+};
+
+xkb_symbols "type5" {
+    include "sun_vndr/us(type5basic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5hobobasic" {
+    include "sun_vndr/us(type5basic)"
+};
+
+xkb_symbols "type5hobo" {
+    include "sun_vndr/us(type5hobobasic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar		], [ EuroSign 	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
+
+    // Here is the hobo keypad:
+
+    key <AE07> { [ 7, ampersand	], [ NoSymbol, NoSymbol	], [ KP_7	] };
+    key <AE08> { [ 8, asterisk	], [ NoSymbol, NoSymbol	], [ KP_8	] };
+    key <AE09> { [ 9, parenleft	], [ NoSymbol, NoSymbol	], [ KP_9	] };
+    key <AE10> { [ 0, parenright], [ NoSymbol, NoSymbol	], [ KP_Multiply] };
+
+    key <AD07> { [ u, U		], [ NoSymbol, NoSymbol	], [ KP_4	] };
+    key <AD08> { [ i, I		], [ NoSymbol, NoSymbol	], [ KP_5	] };
+    key <AD09> { [ o, O		], [ NoSymbol, NoSymbol	], [ KP_6	] };
+    key <AD10> { [ p, P		], [ NoSymbol, NoSymbol	], [ KP_Subtract]};
+
+    key <AC07> { [ j, J		], [ NoSymbol, NoSymbol	], [ KP_1	] };
+    key <AC08> { [ k, K		], [ NoSymbol, NoSymbol	], [ KP_2	] };
+    key <AC09> { [ l, L		], [ NoSymbol, NoSymbol	], [ KP_3	] };
+    key <AC10> { [ semicolon, colon], [ NoSymbol, NoSymbol], [ KP_Add	] };
+
+    key <RTRN> { [ Return	], [ NoSymbol, NoSymbol], [ KP_Enter	] };
+
+    key <AB07> { [ m, M		], [ NoSymbol, NoSymbol	], [ KP_0	] };
+
+    key <AB09> { [ period, greater], [ NoSymbol, NoSymbol], [ KP_Decimal] };
+    key <AB10> { [ slash, question], [ NoSymbol, NoSymbol], [ KP_Divide	] };
+};
+
+xkb_symbols "type6" {
+    include "sun_vndr/us(sunbasic)"
+    include "sun_vndr/us(volumekeys)"
+    include "eurosign(4)"
+
+    key <SYRQ> { [ SunSys_Req 			]};
+};
+
+xkb_symbols "pc101" {
+    include "us(pc101)"
+    key <RALT> { [ Mode_switch, Meta_R	] };
+};
+
+xkb_symbols "pc102" {
+    include "us(pc102)"
+    key <RALT> { [ Mode_switch, Meta_R	] };
+};
+
+xkb_symbols "pc104" {
+    include "us(pc104)"
+};
+
+xkb_symbols "pc101currency" {
+
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+    key <BKSL> { [ backslash, bar	], [ brokenbar			]};
+};
+
+xkb_symbols "US101A_Sun" {
+
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+    key <BKSL> { [ backslash, bar	], [ brokenbar			]};
+
+    // Begin "Editing" section
+    key <PRSC> { [ L5, L5		], [ Print, SunSys_Req 		]};
+    key <SCLK> { [ L7, L7		], [  Scroll_Lock		]};
+    key <PAUS> { [ L1, L1		], [ Pause, Break 		]};
+    key  <INS> { [ L8, L8		], [  Insert			]};
+    key <HOME> { [ L6, L6		], [  Home			]};
+    key <PGUP> { [ L3, L3		], [  Prior			]};
+
+
+    key <DELE> { [ L10, L10		], [ Delete			]};
+    key  <END> { [ L9, L9		], [  End			]};
+    key <PGDN> { [ L4, L4		], [  Next			]};
+
+    key   <UP> {	[  Up			]	};
+    key <LEFT> {	[  Left			]	};
+    key <DOWN> {	[  Down			]	};
+    key <RGHT> {	[  Right		]	};
+
+    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
+    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+
+    key  <KP7> { [ R7, KP_7		], [ KP_7, Home		]	};
+    key  <KP8> { [ KP_Up, KP_8		], [ KP_8		]	};
+    key  <KP9> { [ R9, KP_9		], [ KP_9, Prior	]	};
+    key <KPAD> { [ KP_Add		]				};
+
+    key  <KP4> { [ KP_Left, KP_4	], [ KP_4		]	};
+    key  <KP5> { [ R11,	KP_5		], [ KP_5		]	};
+    key  <KP6> { [ KP_Right, KP_6	], [ KP_6		]	};
+
+    key  <KP1> { [ R13,	KP_1		], [ KP_1, End		]	};
+    key  <KP2> { [ KP_Down, KP_2	], [ KP_2		]	};
+    key  <KP3> { [ R15,	KP_3		], [ KP_3, Next		]	};
+    key <KPEN> { [ KP_Enter		]				};
+
+    key <LALT> { [ Meta_L		]				};
+    key <RALT> { [ Alt_L		]				};
+    key <RCTL> { [ Multi_key		]				};
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/usb b/xorg-server/xkbdata.src/symbols/sun_vndr/usb
new file mode 100644
index 000000000..84648dd06
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/usb
@@ -0,0 +1,26 @@
+// 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/xorg-server/xkbdata.src/symbols/sy b/xorg-server/xkbdata.src/symbols/sy
new file mode 100644
index 000000000..f9a9f4249
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sy
@@ -0,0 +1,171 @@
+// $XKeyboardConfig$
+
+//
+// $XFree86: xc/programs/xkbcomp/symbols/syr,v 1.1 2002/11/22 03:06:50 dawes Exp $
+//
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    include "ara(basic)"
+    name[Group1]= "Syria";
+};
+
+partial alphanumeric_keys
+xkb_symbols "syc" {
+    name[Group1]= "Syria - 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 };
+
+};
+//
+// $XFree86: xc/programs/xkbcomp/symbols/syr_phonetic,v 1.1 2002/11/22 03:06:50 dawes Exp $
+//
+
+partial alphanumeric_keys
+xkb_symbols "syc_phonetic" {
+    name[Group1]= "Syria - 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 };
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "ku" {
+    include "tr(ku)"
+    name[Group1]= "Syria - Kurdish, Latin Q";
+};
+
+partial alphanumeric_keys
+xkb_symbols "ku_f" {
+    include "tr(ku_f)"
+    name[Group1]= "Syria - Kurdish, (F)";
+};
+
+partial alphanumeric_keys
+xkb_symbols "ku_alt" {
+    include "tr(ku_alt)"
+    name[Group1]= "Syria - Kurdish, Latin Alt-Q";
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/symbols.dir b/xorg-server/xkbdata.src/symbols/symbols.dir
new file mode 100644
index 000000000..917a260a8
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/symbols.dir
@@ -0,0 +1,858 @@
+-dp----- a------- mn(basic)
+--p----- a------- mn(olpc)
+--p----- -m------ compose(ralt)
+--p----- -m------ compose(lwin)
+--p----- -m------ compose(rwin)
+--p----- -m------ compose(menu)
+--p----- -m------ compose(rctrl)
+--p----- -m------ compose(caps)
+--p----- -m------ compose(102)
+-d------ -------- de(basic)
+--p----- a------- de(nodeadkeys)
+--p----- a------- de(deadgraveacute)
+--p----- a------- de(deadacute)
+--p----- a------- de(ro)
+--p----- a------- de(ro_nodeadkeys)
+--p----- a------- de(dvorak)
+--p----- a------- de(Sundeadkeys)
+--p----- a------- de(sundeadkeys)
+--p----- a------- de(neo)
+--p----- a------- de(mac)
+--p----- a------- de(mac_nodeadkeys)
+--p----- -------- nbsp1(none)
+--p----- -------- nbsp1(level2)
+--p----- -------- nbsp1(level3)
+--p----- -------- nbsp1(level3s)
+--p----- -------- nbsp1(level3n)
+--p----- -------- nbsp1(level4)
+--p----- -------- nbsp1(level4n)
+--p----- -------- nbsp1(level4nl)
+-dp----- a------- il(basic)
+--p----- a------- il(lyx)
+--p----- a------- il(phonetic)
+--p----- a------- il(biblical)
+-dp----- a------- ro(basic)
+--p----- a------- ro(cedilla)
+--p----- a------- ro(std)
+--p----- a------- ro(std_cedilla)
+--p----- a------- ro(winkeys)
+--p----- -------- eurosign(e)
+--p----- -------- eurosign(2)
+--p----- -------- eurosign(4)
+--p----- -------- eurosign(5)
+-dp----- a------- me(basic)
+--p----- a------- me(cyrillic)
+--p----- a------- me(cyrillicyz)
+--p----- a------- me(latinunicode)
+--p----- a------- me(latinyz)
+--p----- a------- me(latinunicodeyz)
+-------- -------- me(cyrillicalternatequotes)
+-------- -------- me(latinalternatequotes)
+-dp----- a------- mm(basic)
+-dp----- a------- ma(arabic)
+--p----- a------- ma(french)
+--p----- a------- ma(tifinagh)
+--p----- a------- ma(tifinagh-phonetic)
+--p----- a------- ma(tifinagh-extended)
+--p----- a------- ma(tifinagh-extended-phonetic)
+--p----- a------- ma(tifinagh-alt)
+--p----- a------- ma(tifinagh-alt-phonetic)
+-dp----- a------- fi(kotoistus)
+--p----- a------- fi(classic)
+h-p----- a------- fi(fi)
+--p----- a------- fi(nodeadkeys)
+-------- -------- fi(smi)
+--p----- a------- fi(mac)
+-dp----- a------- bt(basic)
+-dp----- a------- ie(basic)
+--p----- a------- ie(CloGaelach)
+--p----- a------- ie(UnicodeExpert)
+--p----- a------- ie(ogam)
+--p----- a------- ie(ogam_is434)
+-dp----- a------- be(basic)
+--p----- a------- be(iso-alternate)
+--p----- a------- be(sundeadkeys)
+--p----- a------- be(Sundeadkeys)
+--p----- a------- be(nodeadkeys)
+--p----- a------- be(wang)
+--p----- --kf---- srvr_ctrl(xfree86)
+--p----- --k----- srvr_ctrl(stdkeypad)
+--p----- ---f---- srvr_ctrl(fkey2vt)
+--p----- --kf---- srvr_ctrl(no_srvr_keys)
+-dp----- a------- ba(basic)
+--p----- a------- ba(us)
+--p----- a------- ba(alternatequotes)
+--p----- a------- ba(unicode)
+--p----- a------- ba(unicodeus)
+-dp----- a------- ng(basic)
+--p----- a------- ng(yoruba)
+--p----- a------- ng(igbo)
+--p----- a------- ng(hausa)
+--p----- a------- ng(olpc)
+-dp----- a------- af(basic)
+--p----- a------- af(ps)
+--p----- a------- af(uz)
+--p----- a------- af(olpc-ps)
+--p----- a------- af(olpc-fa)
+--p----- a------- af(olpc-uz)
+-dp----- a------- dk(basic)
+--p----- a------- dk(nodeadkeys)
+--p----- a------- dk(mac)
+--p----- a------- dk(mac_nodeadkeys)
+--p----- a------- dk(dvorak)
+-dp----- a------- fo(basic)
+--p----- a------- fo(nodeadkeys)
+-dp----- a---g--- gr(basic)
+--p----- a---g--- gr(simple)
+h-p----- a---g--- gr(bare)
+--p----- a---g--- gr(extended)
+--p----- a---g--- gr(polytonic)
+--p----- a---g--- gr(nodeadkeys)
+-------- -------- sony_vndr/us(nwp5461)
+-dp----- -------- hu(basic)
+--p----- -------- hu(standard)
+--p----- -------- hu(nodeadkeys)
+--p----- -------- hu(qwerty)
+--p----- -------- hu(101_qwertz_comma_dead)
+--p----- -------- hu(101_qwertz_comma_nodead)
+--p----- -------- hu(101_qwertz_dot_dead)
+--p----- -------- hu(101_qwertz_dot_nodead)
+--p----- -------- hu(101_qwerty_comma_dead)
+--p----- -------- hu(101_qwerty_comma_nodead)
+--p----- -------- hu(101_qwerty_dot_dead)
+--p----- -------- hu(101_qwerty_dot_nodead)
+--p----- -------- hu(102_qwertz_comma_dead)
+--p----- -------- hu(102_qwertz_comma_nodead)
+--p----- -------- hu(102_qwertz_dot_dead)
+--p----- -------- hu(102_qwertz_dot_nodead)
+--p----- -------- hu(102_qwerty_comma_dead)
+--p----- -------- hu(102_qwerty_comma_nodead)
+--p----- -------- hu(102_qwerty_dot_dead)
+--p----- -------- hu(102_qwerty_dot_nodead)
+h-p----- a------- hu(def_102)
+h-p----- a------- hu(def_101)
+h-p----- a------- hu(def_qwertz)
+h-p----- a------- hu(def_qwerty)
+h-p----- --k----- hu(def_dot)
+h-p----- a------- hu(def_dead)
+h-p----- a------- hu(def_nodead)
+h-p----- a------- hu(def_common)
+-------- -------- sun_vndr/de(type4)
+-------- -------- sun_vndr/fi(basic)
+-------- -------- sun_vndr/ko(type4)
+-------- -------- sun_vndr/ko(type5)
+--p----- -------- sun_vndr/ko(type6)
+-------- -------- sun_vndr/tw(type4)
+-------- -------- sun_vndr/tw(type5)
+--p----- -------- sun_vndr/tw(type6)
+-------- -------- sun_vndr/dk(type4)
+-------- -------- sun_vndr/dk(type5)
+-------- -------- sun_vndr/gr(type5)
+-dp----- a------- sun_vndr/hu(type5)
+-------- -------- sun_vndr/cz(type5)
+-dp----- -------- sun_vndr/solaris(defaults)
+--p----- -------- sun_vndr/solaris(keynames)
+--p----- -------- sun_vndr/solaris(xf86keynames)
+-dp----- a------- sun_vndr/lt(type5)
+-------- -------- sun_vndr/jp(basic)
+-------- -------- sun_vndr/jp(type4)
+-------- -------- sun_vndr/jp(type5)
+-------- -------- sun_vndr/jp(type5hobo)
+--p----- -------- sun_vndr/jp(type6)
+-------- -------- sun_vndr/jp(x86)
+-------- -------- sun_vndr/jp(J3100)
+-------- -------- sun_vndr/jp(Muhenkan_x86)
+--p----- -------- sun_vndr/jp(type7)
+-------- -------- sun_vndr/no(type4)
+-------- -------- sun_vndr/no(type5)
+-dp----- a------- sun_vndr/lv(type5)
+-------- -------- sun_vndr/pl(type5)
+-------- -------- sun_vndr/gb(type4)
+--p----- -------- sun_vndr/gb(type5)
+--p----- -------- sun_vndr/gb(type6)
+-------- -------- sun_vndr/tr(basic)
+-------- -------- sun_vndr/tr(type6Q)
+-------- -------- sun_vndr/tr(type6F)
+-------- -------- sun_vndr/pt(type4)
+-------- -------- sun_vndr/pt(type5)
+--p----- -------- sun_vndr/pt(type6)
+-------- -------- sun_vndr/sw(type4de)
+-------- -------- sun_vndr/sw(type4fr)
+-------- -------- sun_vndr/sw(type5fr)
+-------- -------- sun_vndr/sw(type5de)
+-------- -------- sun_vndr/fr(type4)
+-------- -------- sun_vndr/fr(type5)
+-------- -------- sun_vndr/fr(type6)
+-------- -------- sun_vndr/nl(type4)
+-------- -------- sun_vndr/se(type4)
+-------- -------- sun_vndr/se(type5)
+--p----- -------- sun_vndr/se(type6)
+h------- -------- sun_vndr/us(sunbasic)
+h------- -------- sun_vndr/us(left_funkeys)
+h------- -------- sun_vndr/us(volumekeys)
+-------- -------- sun_vndr/us(type4basic)
+-------- -------- sun_vndr/us(type4)
+-------- -------- sun_vndr/us(type5basic)
+-------- -------- sun_vndr/us(type5)
+-------- -------- sun_vndr/us(type5hobobasic)
+-------- -------- sun_vndr/us(type5hobo)
+-------- -------- sun_vndr/us(type6)
+-------- -------- sun_vndr/us(pc101)
+-------- -------- sun_vndr/us(pc102)
+-------- -------- sun_vndr/us(pc104)
+-------- -------- sun_vndr/us(pc101currency)
+-------- -------- sun_vndr/us(US101A_Sun)
+--p----- -------- sun_vndr/es(type4)
+--p----- -------- sun_vndr/es(type5)
+--p----- -------- sun_vndr/es(type6)
+-------- -------- sun_vndr/it(type4)
+-------- -------- sun_vndr/it(type5)
+--p----- -------- sun_vndr/it(type6)
+-------- -------- sun_vndr/tuv(type4basic)
+-------- -------- sun_vndr/tuv(type4)
+-------- -------- sun_vndr/tuv(type5basic)
+-------- -------- sun_vndr/tuv(type5)
+-------- -------- sun_vndr/cs(type5)
+-------- -------- sun_vndr/usb(sun_usb)
+-------- -------- sun_vndr/ru(basic)
+--p----- -------- sun_vndr/ru(type6)
+-dp----- a------- az(latin)
+--p----- a------- az(cyrillic)
+-dp----- a------- ge(basic)
+--p----- a------- ge(qwerty)
+--p----- a------- ge(ergonomic)
+--p----- a------- ge(mess)
+--p----- a------- ge(ru)
+--p----- a------- ge(os)
+-------- -------- hp_vndr/us(hil)
+-dp----- a------- et(basic)
+--p----- a------- et(olpc)
+-d------ -------- br(abnt2)
+--p----- a------- br(nodeadkeys)
+--p----- a------- br(thinkpad)
+--p----- a------- br(olpc)
+--p----- a------- br(dvorak)
+--p----- a------- br(nativo)
+--p----- a------- br(nativo-us)
+--p----- a------- br(nativo-epo)
+-dp----- a------- kz(basic)
+--p----- a------- kz(ruskaz)
+--p----- a------- kz(kazrus)
+--p----- a------- kz(olpc)
+--p----- --k----- kpdl(dot)
+--p----- --k----- kpdl(comma)
+--p----- --k----- kpdl(dotoss)
+--p----- --k----- kpdl(dotoss_latin9)
+--p----- --k----- kpdl(commaoss)
+--p----- --k----- kpdl(momayyezoss)
+--p----- --k----- kpdl(kposs)
+-dp----- a------- kh(basic)
+--p----- a------- kh(olpc)
+-dp----- a------- cn(basic)
+--p----- a------- cn(tib)
+--p----- a------- cn(tib_asciinum)
+--p----- -m------ altwin(meta_alt)
+--p----- -m------ altwin(ctrl_win)
+--p----- -m------ altwin(meta_win)
+--p----- -m------ altwin(left_meta_win)
+--p----- -m------ altwin(super_win)
+--p----- -m------ altwin(hyper_win)
+--p----- -m------ altwin(menu)
+--p----- -m------ altwin(alt_super_win)
+--p----- -m------ altwin(swap_lalt_lwin)
+--p----- -m------ ctrl(nocaps)
+--p----- -m------ ctrl(swapcaps)
+--p----- -m------ ctrl(ctrl_ac)
+--p----- -m------ ctrl(ctrl_aa)
+--p----- -m------ ctrl(ctrl_ra)
+-dp----- a------- lk(sin_phonetic)
+--p----- a------- lk(tam_unicode)
+--p----- a------- lk(tam_TAB)
+-dp----- a------- cz(basic)
+-------- -------- cz(bksl)
+--p----- a------- cz(qwerty)
+-------- -------- cz(qwerty_bksl)
+--p----- a---g--- cz(ucw)
+-dp----- a------- bg(bds)
+--p----- a------- bg(phonetic)
+-dp----- a------- sk(basic)
+-------- -------- sk(bksl)
+--p----- a------- sk(qwerty)
+-------- -------- sk(qwerty_bksl)
+-dp----- am------ lt(basic)
+--p----- am------ lt(us)
+--p----- am------ lt(std)
+--p----- am------ lt(ibm)
+--p----- am------ lt(lekp)
+--p----- am------ lt(lekpa)
+--p----- am------ lt(balticplus)
+-------- -------- fujitsu_vndr/jp
+-------- -------- fujitsu_vndr/us
+-dp----- a------- gn(basic)
+-dp----- a------- rs(basic)
+--p----- a------- rs(latin)
+--p----- a------- rs(yz)
+h-p----- a------- rs(common)
+h-p----- a------- rs(cyralpha)
+h-p----- a------- rs(latalpha)
+h-p----- a------- rs(twoletter)
+h-p----- a------- rs(level3)
+--p----- a------- rs(latinunicode)
+--p----- a------- rs(latinyz)
+--p----- a------- rs(latinunicodeyz)
+-------- -------- rs(alternatequotes)
+-------- -------- rs(latinalternatequotes)
+-dp----- a------- jp(106)
+h-p----- a------- jp(common)
+--p----- a------- jp(OADG109A)
+--p----- a------- jp(kana)
+--p----- a------- jp(nicola_f_bs)
+h-p----- --k----- keypad(overlay)
+h-p----- --k----- keypad(overlay1)
+h-p----- --k----- keypad(overlay2)
+hdp----- --k----- keypad(x11)
+-------- --k----- keypad(legacy)
+-------- --k----- keypad(legacy_wang)
+-------- --k----- keypad(oss)
+-------- --k----- keypad(oss_latin9)
+-------- --k----- keypad(oss_wang)
+-------- --k----- keypad(future)
+-------- --k----- keypad(future_wang)
+--p----- --k----- keypad(core)
+--p----- --k----- keypad(legacymath)
+--p----- --k----- keypad(ossmath)
+--p----- --k----- keypad(futuremath)
+--p----- --k----- keypad(ossmath_latin9)
+--p----- --k----- keypad(legacynumber)
+--p----- --k----- keypad(legacynumber_wang)
+--p----- --k----- keypad(ossnumber)
+--p----- --k----- keypad(ossnumber_wang)
+--p----- --k----- keypad(phone_hex)
+-dp----- a------- hr(basic)
+--p----- a------- hr(us)
+--p----- a------- hr(alternatequotes)
+--p----- a------- hr(unicode)
+--p----- a------- hr(unicodeus)
+-dp----- a------- latam(basic)
+--p----- a------- latam(Sundeadkeys)
+--p----- a------- latam(sundeadkeys)
+--p----- a------- latam(nodeadkeys)
+-dp----- a------- sy(basic)
+--p----- a------- sy(syc)
+--p----- a------- sy(syc_phonetic)
+--p----- a------- sy(ku)
+--p----- a------- sy(ku_f)
+--p----- a------- sy(ku_alt)
+-dp----- a------- am(basic)
+--p----- a------- am(olpc)
+-------- -------- am(phonetic)
+--p----- a------- am(phonetic-alt)
+--p----- a------- am(eastern)
+--p----- a------- am(western)
+--p----- a------- am(eastern-alt)
+--p----- -m------ level5(rctrl_switch)
+-d------ a------- kr(kr106)
+-------- a------- kr(kr104)
+h-p----- ---f---- kr(koreankeys)
+h-p----- ---f---- kr(koreankeys_raltctl)
+-d------ -------- xfree68_vndr/amiga(usa1)
+-d------ -------- xfree68_vndr/ataritt(us)
+-------- -------- xfree68_vndr/ataritt(de)
+-dp----- a------- no(basic)
+--p----- a------- no(nodeadkeys)
+--p----- a------- no(dvorak)
+--p----- a------- no(smi)
+--p----- a------- no(smi_nodeadkeys)
+--p----- a------- no(mac)
+--p----- a------- no(mac_nodeadkeys)
+-dp----- a------- mv(basic)
+-dp----- -------- latin(basic)
+--p----- -------- latin(type2)
+--p----- -------- latin(type3)
+--p----- -------- latin(type4)
+--p----- -------- latin(nodeadkeys)
+--p----- -------- latin(type2_nodeadkeys)
+--p----- -------- latin(type3_nodeadkeys)
+--p----- -------- latin(type4_nodeadkeys)
+-dp----- a------- ua(basic)
+--p----- a------- ua(winkeys)
+--p----- a------- ua(unicode)
+--p----- a------- ua(typewriter)
+--p----- a------- ua(phonetic)
+--p----- a------- ua(rstu)
+--p----- a------- ua(rstu_ru)
+--p----- a------- ua(homophonic)
+-dp----- a------- al(basic)
+-dp----- a------- iq(basic)
+--p----- a------- iq(ku)
+--p----- a------- iq(ku_f)
+--p----- a------- iq(ku_alt)
+--p----- a------- iq(ku_ara)
+-dp----- am------ pc(pc105)
+h-p----- a------- pc(function)
+h-p----- a------- pc(editing)
+-dp----- am------ lv(basic)
+--p----- am------ lv(apostrophe)
+--p----- am------ lv(tilde)
+--p----- am------ lv(fkey)
+-dp----- a------- si(basic)
+--p----- a------- si(us)
+--p----- a------- si(alternatequotes)
+--p----- a------- si(unicode)
+--p----- a------- si(unicodeus)
+-dp----- a------- by(basic)
+--p----- a------- by(winkeys)
+--p----- a------- by(latin)
+-dp----- -m------ level3(ralt_switch)
+--p----- -m------ level3(ralt_alt)
+--p----- -m------ level3(ralt_switch_multikey)
+h-p----- -m------ level3(ralt_switch_for_alts_toggle)
+--p----- -m------ level3(alt_switch)
+--p----- -m------ level3(lalt_switch)
+--p----- -m------ level3(switch)
+--p----- -m------ level3(menu_switch)
+--p----- -m------ level3(win_switch)
+--p----- -m------ level3(lwin_switch)
+--p----- -m------ level3(rwin_switch)
+h-p----- -m------ level3(enter_switch)
+-------- am------ olpc(olpc)
+-dp----- a------- pl(basic)
+--p----- a------- pl(qwertz)
+--p----- a------- pl(dvorak)
+--p----- a------- pl(dvorak_quotes)
+--p----- a------- pl(dvorak_altquotes)
+--p----- a------- pl(csb)
+--p----- a------- pl(ru_phonetic_dvorak)
+-dp----- a------- gb(basic)
+--p----- a------- gb(intl)
+--p----- a------- gb(colemak)
+--p----- a------- gb(dvorak)
+--p----- a------- gb(dvorakukp)
+--p----- a------- gb(mac)
+-dp----- a------- in(deva)
+--p----- a------- in(bolnagri)
+--p----- a------- in(ben)
+-------- -------- in(ben_probhat)
+--p----- a------- in(guj)
+--p----- a------- in(kan)
+--p----- a------- in(mal)
+--p----- a------- in(mal_lalitha)
+--p----- a------- in(ori)
+--p----- a------- in(tam)
+--p----- a------- in(tam_unicode)
+--p----- a------- in(tam_TSCII)
+--p----- a------- in(tam_TAB)
+--p----- a------- in(tel)
+--p----- a------- in(urd)
+--p----- a------- in(guru)
+--p----- a------- in(jhelum)
+--p----- a------- in(olpc)
+--p----- -m------ shift(breaks_caps)
+-dp----- a------- braille(home_row)
+--p----- a------- braille(left_hand)
+--p----- a------- braille(right_hand)
+h-p----- --k----- braille(keypad)
+-dp----- a------- ch(basic)
+--p----- a------- ch(de)
+--p----- a------- ch(de_Sundeadkeys)
+--p----- a------- ch(de_sundeadkeys)
+--p----- a------- ch(de_nodeadkeys)
+--p----- a------- ch(fr)
+--p----- a------- ch(fr_Sundeadkeys)
+--p----- a------- ch(fr_sundeadkeys)
+--p----- a------- ch(fr_nodeadkeys)
+--p----- a------- ch(de_mac)
+--p----- a------- ch(fr_mac)
+-------- -------- sgi_vndr/jp(jp106)
+-------- -------- sgi_vndr/jp(alternate106)
+-dp----- a------- macintosh_vndr/de(basic)
+--p----- a------- macintosh_vndr/de(Sundeadkeys)
+--p----- a------- macintosh_vndr/de(sundeadkeys)
+--p----- a------- macintosh_vndr/de(nodeadkeys)
+-dp----- a------- macintosh_vndr/fi(basic)
+--p----- a------- macintosh_vndr/fi(nodeadkeys)
+--p----- a------- macintosh_vndr/dk(basic)
+-dp----- a------- macintosh_vndr/dk(full)
+--p----- a------- macintosh_vndr/dk(nodeadkeys)
+--p----- a------- macintosh_vndr/dk(macbookpro)
+-dp----- a------- macintosh_vndr/latam(basic)
+-dp----- a------- macintosh_vndr/no(basic)
+--p----- a------- macintosh_vndr/no(nodeadkeys)
+-dp----- a------- macintosh_vndr/gb(basic)
+--p----- a------- macintosh_vndr/ch(extended)
+--p----- a------- macintosh_vndr/ch(de)
+--p----- a------- macintosh_vndr/ch(fr)
+--p----- a------- macintosh_vndr/ch(nodeadkeys)
+-dp----- -m------ macintosh_vndr/apple(extended)
+--p----- -m------ macintosh_vndr/apple(laptop)
+--p----- -m------ macintosh_vndr/apple(laptop_bad_switch)
+-dp----- a------- macintosh_vndr/pt(basic)
+--p----- a------- macintosh_vndr/pt(Sundeadkeys)
+--p----- a------- macintosh_vndr/pt(sundeadkeys)
+--p----- a------- macintosh_vndr/pt(nodeadkeys)
+-d------ -------- macintosh_vndr/fr(extended)
+-------- -------- macintosh_vndr/fr(nodeadkeys)
+-dp----- a------- macintosh_vndr/nl(basic)
+-dp----- a------- macintosh_vndr/se(basic)
+--p----- a------- macintosh_vndr/se(nodeadkeys)
+-------- -------- macintosh_vndr/us(extended)
+h------- -------- macintosh_vndr/us(oldmac)
+-dp----- a------- macintosh_vndr/es(basic)
+-------- -------- macintosh_vndr/it(extended)
+-dp----- a------- macintosh_vndr/is(basic)
+--p----- a------- macintosh_vndr/is(nodeadkeys)
+-dp----- a------- bd(basic)
+-------- -------- bd(probhat)
+-dp----- -------- tr(basic)
+--p----- -------- tr(f)
+--p----- -------- tr(alt)
+--p----- a------- tr(Sundeadkeys)
+--p----- a------- tr(sundeadkeys)
+--p----- -------- tr(ku)
+--p----- -------- tr(ku_f)
+--p----- -------- tr(ku_alt)
+--p----- -------- tr(intl)
+--p----- a------- tr(olpc)
+-dp----- a------- tj(basic)
+-dp----- a------- mao(basic)
+-dp----- a------- pt(basic)
+--p----- a------- pt(Sundeadkeys)
+--p----- a------- pt(sundeadkeys)
+--p----- a------- pt(nodeadkeys)
+--p----- a------- pt(mac)
+--p----- a------- pt(mac_sundeadkeys)
+--p----- a------- pt(mac_nodeadkeys)
+--p----- a------- pt(nativo)
+--p----- a------- pt(nativo-us)
+--p----- a------- pt(nativo-epo)
+-dp----- a------- ara(basic)
+--p----- a------- ara(qwerty)
+--p----- a------- ara(azerty)
+--p----- a------- ara(digits)
+--p----- a------- ara(qwerty_digits)
+--p----- a------- ara(azerty_digits)
+--p----- a------- ara(buckwalter)
+--p----- a------- ara(olpc)
+-dp----- -------- ca(fr)
+-------- -------- ca(fr-dvorak)
+--p----- -------- ca(fr-legacy)
+--p----- -------- ca(multi)
+--p----- -------- ca(multi-2gr)
+-------- a------- ca(ike)
+--p----- -------- ca(multix)
+--p----- a------- ca(shs)
+-------- -------- ca(olpc)
+--p----- a------- ca(kut)
+-d------ -------- nec_vndr/jp(pc98)
+h-p----- a------- inet(media_common)
+h-p----- a------- inet(nav_common)
+h-p----- a------- inet(media_nav_common)
+--p----- a------- inet(evdev)
+--p----- a------- inet(a4techKB21)
+--p----- a------- inet(a4techKBS8)
+--p----- a------- inet(a4_rfkb23)
+--p----- a------- inet(airkey)
+--p----- a------- inet(acer_c300)
+--p----- a------- inet(acer_ferrari4k)
+--p----- a------- inet(acer_laptop)
+--p----- a------- inet(asus_laptop)
+--p----- a------- inet(azonaRF2300)
+--p----- a------- inet(acpi)
+--p----- a------- inet(scorpius)
+--p----- a------- inet(brother)
+--p----- a------- inet(btc5113rf)
+--p----- a------- inet(btc5126t)
+--p----- a------- inet(btc6301urf)
+--p----- a------- inet(btc9000)
+--p----- a------- inet(btc9000a)
+-------- -------- inet(btc9001ah)
+--p----- a------- inet(btc5090)
+--p----- a------- inet(btc9019u)
+--p----- a------- inet(cherryblue)
+--p----- a------- inet(cherryblueb)
+--p----- a------- inet(cherrybluea)
+--p----- a------- inet(cherrycyboard)
+--p----- a------- inet(chicony)
+--p----- a------- inet(chicony0108)
+--p----- a------- inet(chicony9885)
+--p----- a------- inet(compaqeak8)
+--p----- a------- inet(compaqik7)
+--p----- a------- inet(compaqik13)
+--p----- a------- inet(compaqik18)
+--p----- a------- inet(armada)
+--p----- a------- inet(presario)
+--p----- a------- inet(ipaq)
+--p----- a------- inet(dell)
+--p----- a------- inet(dellm65)
+--p----- a------- inet(geniuskb19e)
+--p----- a------- inet(inspiron)
+--p----- a------- inet(latitude)
+--p----- a------- inet(precision_m)
+--p----- a------- inet(dellusbmm)
+--p----- a------- inet(dexxa)
+--p----- a------- inet(diamond)
+--p----- a------- inet(dtk2000)
+--p----- a------- inet(ennyah_dkb1008)
+--p----- a------- inet(fscaa1667g)
+--p----- a------- inet(genius)
+--p----- a------- inet(geniuscomfy)
+--p----- a------- inet(geniuscomfy2)
+--p----- a------- inet(gyration)
+--p----- a------- inet(hpi6)
+--p----- a------- inet(hp2501)
+--p----- a------- inet(hp2505)
+--p----- a------- inet(hp5181)
+--p----- a------- inet(hp5185)
+--p----- a------- inet(hpxe3gc)
+--p----- a------- inet(hpxe3gf)
+--p----- a------- inet(hpxt1000)
+--p----- a------- inet(hpzt11xx)
+--p----- a------- inet(hpxe4xxx)
+--p----- a------- inet(hp500fa)
+--p----- a------- inet(hp5xx)
+--p----- a------- inet(honeywell_euroboard)
+--p----- a------- inet(rapidaccess)
+--p----- a------- inet(rapidaccess2)
+--p----- a------- inet(rapidaccess2a)
+--p----- a------- inet(thinkpad)
+--p----- a------- inet(thinkpad60)
+--p----- a------- inet(ibm_spacesaver)
+--p----- a------- inet(logitech_base)
+h-p----- a------- inet(logitech_set3)
+--p----- a------- inet(logiaccess)
+--p----- a------- inet(logicda)
+--p----- a------- inet(logicink)
+--p----- a------- inet(logiex110)
+--p----- a------- inet(logiinkse)
+--p----- a------- inet(logiinkseusb)
+--p----- a------- inet(logiitc)
+--p----- a------- inet(logiik)
+--p----- a------- inet(itouch)
+--p----- a------- inet(logiultraxc)
+--p----- a------- inet(logidinovo)
+--p----- a------- inet(logidinovoedge)
+--p----- a------- inet(mx1998)
+--p----- a------- inet(mx2500)
+--p----- a------- inet(mx2750)
+--p----- a------- inet(microsoft7000)
+--p----- a------- inet(microsoftinet)
+--p----- a------- inet(microsoftpro)
+--p----- a------- inet(microsoftprousb)
+--p----- a------- inet(microsoftprooem)
+--p----- a------- inet(microsoftprose)
+--p----- a------- inet(microsoftoffice)
+--p----- a------- inet(microsoftmult)
+--p----- a------- inet(oretec)
+--p----- a------- inet(propeller)
+--p----- a------- inet(qtronix)
+--p----- a------- inet(samsung4500)
+--p----- a------- inet(samsung4510)
+--p----- a------- inet(sk1300)
+--p----- a------- inet(sk2500)
+--p----- a------- inet(sk6200)
+--p----- a------- inet(sk7100)
+--p----- a------- inet(sven)
+--p----- a------- inet(sven303)
+--p----- a------- inet(symplon)
+--p----- a------- inet(toshiba_s3000)
+--p----- a------- inet(trust)
+--p----- a------- inet(trustda)
+--p----- a------- inet(yahoo)
+-------- -------- inet(sp_inet)
+--p----- -------- inet(apple)
+--p----- a------- inet(cymotionlinux)
+--p----- a------- inet(silvercrest)
+--p----- a------- inet(emachines)
+--p----- a------- inet(benqx)
+--p----- a------- inet(logitech_g15)
+--p----- a------- inet(classmate)
+-dp----- a------- ir(basic)
+h-p----- a------- ir(part_pro)
+h-p----- a------- ir(part_keypad)
+--p----- a------- ir(pro)
+--p----- a------- ir(keypad)
+--p----- a------- ir(pro_keypad)
+--p----- a------- ir(ku)
+--p----- a------- ir(ku_f)
+--p----- a------- ir(ku_alt)
+--p----- a------- ir(ku_ara)
+-dp----- a------- fr(basic)
+--p----- a------- fr(Sundeadkeys)
+--p----- a------- fr(sundeadkeys)
+--p----- a------- fr(nodeadkeys)
+--p----- a------- fr(oss)
+--p----- a------- fr(oss_latin9)
+--p----- a------- fr(oss_Sundeadkeys)
+--p----- a------- fr(oss_sundeadkeys)
+--p----- a------- fr(oss_nodeadkeys)
+--p----- a------- fr(latin9)
+--p----- a------- fr(latin9_Sundeadkeys)
+--p----- a------- fr(latin9_sundeadkeys)
+--p----- a------- fr(latin9_nodeadkeys)
+--p----- a------- fr(bepo)
+--p----- a------- fr(bepo_latin9)
+--p----- am------ fr(dvorak)
+--p----- a------- fr(mac)
+--p----- a------- fr(geo)
+--p----- -------- nbsp(none)
+--p----- -------- nbsp(level2)
+--p----- -------- nbsp(level3)
+--p----- -------- nbsp(level3s)
+--p----- -------- nbsp(level3n)
+--p----- -------- nbsp(level4)
+--p----- -------- nbsp(level4n)
+--p----- -------- nbsp(level4nl)
+-dp----- a------- nl(basic)
+--p----- a------- nl(std)
+--p----- a------- nl(Sundeadkeys)
+--p----- a------- nl(sundeadkeys)
+--p----- a------- nl(mac)
+-dp----- a------- cd(basic)
+-dp----- a------- se(basic)
+--p----- a------- se(se)
+--p----- a------- se(nodeadkeys)
+--p----- a------- se(dvorak)
+--p----- a------- se(rus)
+--p----- a------- se(rus_nodeadkeys)
+-------- -------- se(smi)
+--p----- a------- se(mac)
+--p----- a------- se(svdvorak)
+-dp----- am------ us(basic)
+--p----- a------- us(euro)
+--p----- a------- us(intl)
+--p----- a------- us(alt-intl)
+--p----- a------- us(dvorak)
+--p----- a------- us(dvorak-intl)
+--p----- a------- us(dvorak-l)
+--p----- a------- us(dvorak-r)
+--p----- a------- us(dvorak-classic)
+--p----- a------- us(dvp)
+--p----- a------- us(rus)
+--p----- a------- us(mac)
+--p----- a------- us(colemak)
+--p----- a------- us(altgr-intl)
+--p----- a------- us(classmate)
+--p----- a------- us(classmate-intl)
+--p----- a------- us(classmate-alt-intl)
+--p----- a------- us(classmate-altgr-intl)
+--p----- a------- us(olpc)
+--p----- a------- us(olpc2)
+--p----- am------ us(chr)
+-dp----- a------- la(basic)
+--p----- -m------ group(switch)
+--p----- -m------ group(lswitch)
+--p----- -m------ group(win_switch)
+--p----- -m------ group(lwin_switch)
+--p----- -m------ group(rwin_switch)
+--p----- -m------ group(rctrl_switch)
+--p----- -m------ group(toggle)
+--p----- -m------ group(shifts_toggle)
+--p----- -m------ group(ctrl_shift_toggle)
+--p----- -m------ group(lctrl_lshift_toggle)
+--p----- -m------ group(shift_caps_toggle)
+--p----- -m------ group(shift_caps_switch)
+--p----- -m------ group(ctrl_alt_toggle)
+--p----- -m------ group(alt_shift_toggle)
+--p----- -m------ group(menu_toggle)
+--p----- -m------ group(lwin_toggle)
+--p----- -m------ group(rwin_toggle)
+--p----- -m------ group(ctrls_toggle)
+--p----- -m------ group(alts_toggle)
+--p----- -m------ group(lshift_toggle)
+--p----- -m------ group(rshift_toggle)
+--p----- -m------ group(lalt_toggle)
+--p----- -m------ group(lctrl_toggle)
+--p----- -m------ group(rctrl_toggle)
+--p----- -m------ group(alt_caps_toggle)
+h-p----- -m------ group(olpc)
+-dp----- am------ za(basic)
+-dp----- a------- vn(basic)
+-dp----- a------- es(basic)
+--p----- a------- es(Sundeadkeys)
+--p----- a------- es(sundeadkeys)
+--p----- a------- es(nodeadkeys)
+--p----- a------- es(dvorak)
+--p----- a------- es(cat)
+--p----- a------- es(ast)
+--p----- a------- es(mac)
+--p----- a------- es(olpc)
+-dp----- a------- it(basic)
+--p----- a------- it(nodeadkeys)
+--p----- a------- it(mac)
+--p----- a------- it(geo)
+-------- -------- it(olpc)
+-dp----- a------- th(basic)
+--p----- a------- th(pat)
+--p----- a------- th(tis)
+--p----- a------- th(olpc)
+-dp----- a------- pk(urd)
+--p----- a------- pk(ara)
+--p----- a------- pk(olpc)
+-dp----- a------- is(basic)
+--p----- a------- is(Sundeadkeys)
+--p----- a------- is(nodeadkeys)
+--p----- a------- is(mac)
+--p----- a------- is(dvorak)
+-dp----- a------- np(basic)
+--p----- a------- np(olpc)
+-dp----- a------- kg(basic)
+-dp----- a------- ad(basic)
+-dp----- a------- mt(basic)
+--p----- a------- mt(us)
+-dp----- a------- ru(winkeys)
+h-p----- a------- ru(common)
+--p----- a------- ru(legacy)
+--p----- a------- ru(olpc)
+--p----- a------- ru(typewriter)
+--p----- a------- ru(phonetic)
+--p----- a------- ru(tt)
+--p----- a------- ru(os_legacy)
+--p----- a------- ru(os_winkeys)
+--p----- a------- ru(cv)
+--p----- a------- ru(udm)
+--p----- a------- ru(cv_latin)
+--p----- a------- ru(kom)
+--p----- a------- ru(sah)
+-d------ -------- digital_vndr/lk(common)
+-------- -------- digital_vndr/lk(lk401)
+-------- -------- digital_vndr/pc(pc)
+-------- -------- digital_vndr/pc(pc104)
+-------- -------- digital_vndr/vt(vt105)
+-------- -------- digital_vndr/vt(vt108)
+-------- -------- digital_vndr/us(us)
+-------- -------- digital_vndr/us(vt105-tw)
+-------- -------- digital_vndr/us(vt105-dp)
+-------- -------- digital_vndr/us(vt105)
+-------- -------- digital_vndr/us(vt108-tw)
+-------- -------- digital_vndr/us(vt108-dp)
+-------- -------- digital_vndr/us(vt108)
+-------- -------- digital_vndr/us(unix)
+-------- -------- digital_vndr/us(pcxalga)
+-------- -------- digital_vndr/us(pcxal)
+-------- -------- digital_vndr/us(pcxalaa)
+-------- -------- digital_vndr/us(pcxalfa)
+-------- -------- digital_vndr/us(pcxalka)
+-------- -------- digital_vndr/us(lk44x)
+-------- -------- digital_vndr/us(pc104)
+-dp----- a------- epo(basic)
+--p----- a------- epo(legacy)
+hdp----- -m------ capslock(capslock)
+h-p----- -m------ capslock(shiftlock)
+h-p----- -m------ capslock(grouplock)
+h-p----- -m------ capslock(swapescape)
+h-p----- -m------ capslock(groupshift)
+-dp----- a------- mk(basic)
+--p----- a------- mk(nodeadkeys)
+-dp----- a------- uz(cyrillic)
+--p----- a------- uz(latin)
+-dp----- a------- ee(basic)
+--p----- a------- ee(nodeadkeys)
+--p----- a------- ee(dvorak)
+--p----- a------- ee(us)
+-dp----- a------- gh(basic)
+--p----- a------- gh(akan)
+--p----- a------- gh(ga)
+--p----- a------- gh(ewe)
+--p----- a------- gh(fula)
+--p----- a------- gh(hausa)
+--p----- a------- gh(generic)
diff --git a/xorg-server/xkbdata.src/symbols/th b/xorg-server/xkbdata.src/symbols/th
new file mode 100644
index 000000000..050fb5278
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/th
@@ -0,0 +1,249 @@
+// $XKeyboardConfig$
+
+// based on a keyboard map from an 'xkb/symbols/th' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/th,v 1.3 2003/04/03 16:34:51 dawes Exp $
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+    name[Group1]= "Thailand";
+
+    // 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	]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "pat" {
+    name[Group1]= "Thailand - 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	] };
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "tis" {
+    name[Group1]= "Thailand - 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	]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+    name[Group1]= "Thailand";
+    // The OLPC thai layout
+    // walter@laptop.org
+
+    key <TLDE> { [ 0x1000E4F,  0x1000E5B ] };
+    key <AE01> { [ 0x1000E3F,  0x1000E45 ] };
+    key <AE02> { [     slash,  0x1000E51 ] };
+    key <AE03> { [     minus,  0x1000E52 ] };
+    key <AE04> { [ 0x1000E20,  0x1000E53 ] };
+    key <AE05> { [ 0x1000E16,  0x1000E54 ] };
+    key <AE06> { [ 0x1000E38,  0x1000E39 ] };
+    key <AE07> { [ 0x1000E36,  0x1000E4E ] };
+    key <AE08> { [ 0x1000E04,  0x1000E55 ] };
+    key <AE09> { [ 0x1000E15,  0x1000E56 ] };
+    key <AE10> { [ 0x1000E08,  0x1000E57 ] };
+    key <AE11> { [ 0x1000E02,  0x1000E58 ] };
+    key <AE12> { [ 0x1000E0A,  0x1000E59 ] };
+
+    key <AD01> { [ 0x1000E46,  0x1000E50 ] };
+    key <AD02> { [ 0x1000E44,   quotedbl ] };
+    key <AD03> { [ 0x1000E33,  0x1000E0E ] };
+    key <AD04> { [ 0x1000E1E,  0x1000E11 ] };
+    key <AD05> { [ 0x1000E30,  0x1000E18 ] };
+    key <AD06> { [ 0x1000E31,  0x1000E4D ] };
+    key <AD07> { [ 0x1000E35,  0x1000E4A ] };
+    key <AD08> { [ 0x1000E23,  0x1000E13 ] };
+    key <AD09> { [ 0x1000E19,  0x1000E2F ] };
+    key <AD10> { [ 0x1000E22,  0x1000E0D ] };
+    key <AD11> { [ 0x1000E1A,  0x1000E10 ] };
+    key <AD12> { [ 0x1000E25,      comma ] };
+
+    key <AC01> { [ 0x1000E1F,  0x1000E24 ] };
+    key <AC02> { [ 0x1000E2B,  0x1000E06 ] };
+    key <AC03> { [ 0x1000E01,  0x1000E0F ] };
+    key <AC04> { [ 0x1000E14,  0x1000E42 ] };
+    key <AC05> { [ 0x1000E40,  0x1000E0C ] };
+    key <AC06> { [ 0x1000E49,  0x1000E47 ] };
+    key <AC07> { [ 0x1000E48,  0x1000E4B ] };
+    key <AC08> { [ 0x1000E32,  0x1000E29 ] };
+    key <AC09> { [ 0x1000E2A,  0x1000E28 ] };
+    key <AC10> { [ 0x1000E27,  0x1000E0B ] };
+    key <AC11> { [ 0x1000E07,     period ] };
+    key <BKSL> { [ 0x1000E05,  0x1000E03 ] };
+
+    key <AB01> { [ 0x1000E1C,  parenleft ] };
+    key <AB02> { [ 0x1000E1B, parenright ] };
+    key <AB03> { [ 0x1000E41,  0x1000E09 ] };
+    key <AB04> { [ 0x1000E2D,  0x1000E2E ] };
+    key <AB05> { [ 0x1000E34,  0x1000E3A ] };
+    key <AB06> { [ 0x1000E37,  0x1000E4C ] };
+    key <AB07> { [ 0x1000E17,   question ] };
+    key <AB08> { [ 0x1000E21,  0x1000E12 ] };
+    key <AB09> { [ 0x1000E43,  0x1000E2C ] };
+    key <AB10> { [ 0x1000E1D,  0x1000E26 ] };
+
+    include "group(olpc)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/tj b/xorg-server/xkbdata.src/symbols/tj
new file mode 100644
index 000000000..f07b29001
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/tj
@@ -0,0 +1,78 @@
+// $XKeyboardConfig$
+
+// 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)
+//
+// 2008-06-22
+// Changed so that RightAlt allows to type the extra Tajik keys and that
+// SHCHA is back to normal again
+
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    name[Group1]= "Tajikistan";
+
+    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
+    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE,     0x010004b7,      0x010004b6	]	 };
+    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	]	};
+    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	]	};
+    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I,     0x010004e3,      0x010004e2	]	 };
+    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	]	};
+    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
+    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};
+    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
+    key	<AB10> {	[	    slash,	  question	]	};
+    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,     0x01000497,      0x01000496	]	 };
+    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	]	};
+    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
+    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
+    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U,     0x010004ef,      0x010004ee	]	 };
+    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA,     0x0100049b,      0x0100049a	]	 };
+    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	]	};
+    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	]	};
+    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE,     0x01000493,      0x01000492	]	 };
+    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA,     Cyrillic_shcha,  Cyrillic_SHCHA]	 };
+    key	<AD09> {	[    Cyrillic_shcha, Cyrillic_SHCHA	]	};
+    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};
+    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA,     0x010004b3,      0x010004b2	]	 };
+    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	]	};
+    key	<AE01> {	[		1,	    exclam 	]	};
+    key	<AE02> {	[		2,        quotedbl	]	};
+    key	<AE03> {	[		3,      apostrophe	]	};
+    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	<LSGT> {	[	      bar,	 brokenbar	]	};
+    key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	]	};
+
+    // End alphanumeric section
+
+};
diff --git a/xorg-server/xkbdata.src/symbols/tr b/xorg-server/xkbdata.src/symbols/tr
new file mode 100644
index 000000000..1fcf0cc56
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/tr
@@ -0,0 +1,286 @@
+// $XKeyboardConfig$
+
+// based on
+// Turkish keyboard symbols for PC and xkb
+// This file distributed without any expressed or implied warranty
+// Nilgün Belma Bugüner <nilgun@belgeler.org>, 2005
+//
+// $XFree86: xc/programs/xkbcomp/symbols/tr,v 1.5 2003/04/19 12:22:12 pascal Exp $
+
+//Default Layout (Turkish Q)
+default partial
+xkb_symbols "basic" {
+
+    include "latin"
+
+    name[Group1]="Turkey";
+
+    key <AE01>	{ [         1,    exclam,        greater,    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,           bar,    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>	{ type[group1] = "FOUR_LEVEL_ALPHABETIC",
+                  [  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>	{ type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", 
+                  [ i,  Iabovedot,   apostrophe,   dead_caron ]	};
+    key <TLDE>	{ [  quotedbl,     eacute,         less,       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 ] };
+
+    include "kpdl(comma)"
+    include "level3(ralt_switch)"
+};
+
+
+// Turkish F Layout
+partial
+xkb_symbols "f" {
+
+    include "latin"
+
+    name[Group1]="Turkey - (F)";
+
+    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,          bar,   VoidSymbol ]	};
+
+    key <AD01>	{ [         f,          F,           at,   VoidSymbol ]	};
+    key <AD02>	{ [         g,          G,   VoidSymbol,   VoidSymbol ]	};
+    key <AD03>	{ [    gbreve,     Gbreve,   VoidSymbol,   VoidSymbol ]	};
+    key <AD04>	{ type[group1] = "FOUR_LEVEL_SEMIALPHABETIC",
+                  [  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>	{ type[group1] = "FOUR_LEVEL_ALPHABETIC",
+                  [         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 <LSGT>	{ [     less,     greater,          bar,    brokenbar ]	};
+
+    include "kpdl(comma)"
+    include "level3(ralt_switch)"
+};
+
+// Turkish Alt-Q Layout
+partial
+xkb_symbols "alt" {
+
+    include "latin"
+
+    name[Group1]="Turkey - Alt-Q";
+
+    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 ] };
+
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    // For naming consistency
+    include "tr(basic)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+
+    // For naming consistency
+    include "tr(Sundeadkeys)"
+
+    name[Group1]="Turkey - Sun dead keys";
+};
+
+// Kurdish Q Layout
+// Erdal Ronahi <erdal.ronahi@gmail.com>, 2006
+// http://ferheng.org
+// http://www.pckurd.net
+
+partial
+xkb_symbols "ku" {
+
+   include "tr(basic)"
+
+   name[Group1]="Turkey - Kurdish, Latin Q";
+
+    key <AD08>	{ [          i,           I,     idotless,            I ] };
+    key <AD11>	{ [          x,           X,       gbreve,       Gbreve ] };
+    key <AD12>	{ [ucircumflex, Ucircumflex,   asciitilde,   dead_macron] };
+    key <AC11>	{ [icircumflex, Icircumflex,   apostrophe,   dead_caron ] };
+    key <AB08>	{ [ecircumflex, Ecircumflex,   odiaeresis,   Odiaeresis ] };
+};
+
+// Kurdish F Layout
+partial
+xkb_symbols "ku_f" {
+
+    include "tr(f)"
+
+    name[Group1]="Turkey - Kurdish, (F)";
+
+    key <AD03>	{ [         x,          X,       gbreve,        Gbreve]	};
+    key <AD04>	{ [         i,          I,    paragraph,   VoidSymbol ] };
+    key <AD05>	{ [         o,          O,  ocircumflex,  Ocircumflex ] };
+
+    key <AC01>	{ [ ucircumflex,  Ucircumflex, udiaeresis, Udiaeresis ] };
+    key <AC02>	{ [ icircumflex,  Icircumflex,          i,  Iabovedot ] };
+    key <AC05>	{ [         u,          U,   udiaeresis,   Udiaeresis ]	};
+    key <AB02>	{ [ecircumflex, Ecircumflex, odiaeresis,  Odiaeresis  ] };
+
+};
+
+// Kurdish Alt-Q Layout
+partial
+xkb_symbols "ku_alt" {
+
+    include "tr(alt)"
+
+    name[Group1]="Turkey - Kurdish, Latin Alt-Q";
+
+    key <AD03>  { [         e,           E,  ecircumflex,  Ecircumflex ] };
+    key <AD07>  { [         u,           U,  ucircumflex,  Ucircumflex ] };
+    key <AD08>  { [         i,           I,  icircumflex,  Icircumflex ] };
+    key <AD09>  { [         o,           O,   odiaeresis,   Odiaeresis ] };
+};
+
+// Turkish international Q Layout
+// Alexis Pellicier <alexis.pellicier@nds.k12.tr>, 2007
+partial
+xkb_symbols "intl" {
+    include "latin"
+
+    name[Group1]="Turkey - International (with dead keys)";
+
+    key <AE01>	{ type[group1] = "FOUR_LEVEL", [         1,    exclam,    onesuperior,    exclamdown ]	};
+    key <AE02>	{ type[group1] = "FOUR_LEVEL", [         2, apostrophe,   sterling,   twosuperior ]	};
+    key <AE03>	{ type[group1] = "FOUR_LEVEL", [         3, dead_circumflex,    numbersign, threesuperior ]  };
+    key <AE04>	{ type[group1] = "FOUR_LEVEL", [         4,       plus, dollar,    onequarter ]	};
+    key <AE06>	{ type[group1] = "FOUR_LEVEL", [         6,  ampersand, threequarters,    VoidSymbol ]	};
+    key <AE07>	{ type[group1] = "FOUR_LEVEL", [         7,      slash, braceleft,    VoidSymbol ]	};
+    key <AE08>	{ type[group1] = "FOUR_LEVEL", [         8,  parenleft, bracketleft,    VoidSymbol ]	};
+    key <AE09>	{ type[group1] = "FOUR_LEVEL", [         9, parenright, bracketright,     plusminus ]	};
+    key <AE10>	{ type[group1] = "FOUR_LEVEL", [         0,      equal, braceright,        degree ]	};
+    key <AE11>	{ type[group1] = "FOUR_LEVEL", [  asterisk,   question, backslash,  questiondown ]	};
+    key <AE12>	{ type[group1] = "FOUR_LEVEL", [     minus, underscore, division,    VoidSymbol ]	};
+    key <AD02>	{ [         w,          W,   VoidSymbol,   VoidSymbol ]	};
+    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
+    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,   dead_diaeresis           ] };
+    key <AD12>	{ [udiaeresis, Udiaeresis,   dead_tilde,  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,  dead_acute,   dead_acute ]	};
+    key <AC11>	{ [         i,  Iabovedot,   apostrophe,   dead_caron ]	};
+    key <TLDE>	{ type[group1] = "FOUR_LEVEL",[  quotedbl,  eacute,    plusminus,      degree ]	};
+    key <BKSL>	{ type[group1] = "FOUR_LEVEL",[     comma,  semicolon,   dead_grave, dead_grave ]	};
+    key <LSGT>	{ type[group1] = "FOUR_LEVEL",[     less,     greater,   bar,    brokenbar ]	};
+    key <AB08>	{ [odiaeresis, Odiaeresis,     multiply,   VoidSymbol ]	};
+    key <AB09>	{ [  ccedilla,   Ccedilla, periodcentered,     division ] 
+};
+    key <AB10>	{ type[group1] = "FOUR_LEVEL",[    period,      colon, dead_abovedot, dead_abovedot ] };
+
+    include "nbsp(level3)"
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+    name[Group1]= "Turkey";
+    include "tr(f)"
+
+    key <I219> { [  less,  greater, bar, brokenbar ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/ua b/xorg-server/xkbdata.src/symbols/ua
new file mode 100644
index 000000000..73439cafd
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/ua
@@ -0,0 +1,314 @@
+// $XKeyboardConfig$
+
+// based on
+// ukrainian standard keyboard 
+// AEN <aen@logic.ru> & Leon Kanter <leon@geon.donetsk.ua>
+// Last Changes 2007/10/03 by Andriy Rysin <arysin@yahoo.com>
+//
+// $XFree86: xc/programs/xkbcomp/symbols/ua,v 1.4 2003/05/15 11:29:47 pascal Exp $
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    name[Group1]= "Ukraine";
+
+    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 "ua(basic)"
+ 
+    name[Group1]= "Ukraine - Winkeys";
+
+    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      ]       };
+};
+
+
+// Unicode - 3d level added with some Unicode symbols (typographic quotes, m-dash, n-dash etc), 
+// some often used cyrillics from other slavic languages and some ASCII symbols used often (slash, brackets...)
+partial alphanumeric_keys
+xkb_symbols "unicode" {
+    include "ua(winkeys)"
+ 
+    name[Group1]= "Ukraine - Unicode";
+
+    key <TLDE> {    [           U2019, 	apostrophe,    U0301,   asciitilde     ]       };	// Apostrophe and Stress symbol
+    key <AE02> {    [               1,      exclam,  onesuperior               ]       };
+    key <AE02> {    [               2,    quotedbl,  twosuperior               ]       };
+    key <AE03> {    [               3,  numerosign,	   U00A7,    U20B4     ]       };	// Paragraph and Hryvnia sign
+    key <AE04> {    [               4,   semicolon,	  dollar,    EuroSign  ]       };
+    key <AE05> {    [               5,     percent,	  degree               ]       };
+    key <AE06> {    [               6,       colon,   less                             ]       };
+    key <AE07> {    [               7,    question,   greater                             ]       };
+    key <AE08> {    [               8,    asterisk, enfilledcircbullet         ]       };
+    key	<AE09> {    [		    9,	 parenleft,  bracketleft,    braceleft ]       };
+    key	<AE10> {    [		    0,	parenright, bracketright,    braceright]       };
+    key	<AE11> {    [	    	minus,	underscore,       emdash,    endash    ]       };
+    key	<AE12> {    [	    	equal,	      plus, 	notequal,    plusminus ]       };
+
+    key	<AD03> {    [      Cyrillic_u,	Cyrillic_U,  Byelorussian_shortu,  Byelorussian_SHORTU	]};
+    key	<AD04> {    [     Cyrillic_ka, Cyrillic_KA,	registered	       ]       };						// Registered tm
+    key	<AD05> {    [     Cyrillic_ie, Cyrillic_IE,     Cyrillic_io,     Cyrillic_IO	]	};
+    key	<AD12> {    [    Ukrainian_yi,Ukrainian_YI,	Cyrillic_hardsign,	Cyrillic_HARDSIGN	]	};
+    key	<AC02> {    [    Ukrainian_i,  Ukrainian_I, Cyrillic_yeru,   Cyrillic_YERU	]	};
+    key	<AC11> {    [    Ukrainian_ie,Ukrainian_IE,	Cyrillic_e,	Cyrillic_E	]	};
+
+    key	<BKSL> {    [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN, backslash,  bar	]	};
+
+    key	<AB03> {    [     Cyrillic_es,     Cyrillic_ES,	copyright              ]	};
+    key	<AB06> {    [     Cyrillic_te,     Cyrillic_TE,	trademark              ]	};
+    key	<AB08> {    [     Cyrillic_be,     Cyrillic_BE,	guillemotleft,	doublelowquotemark 	]	};
+    key	<AB09> {    [     Cyrillic_yu,     Cyrillic_YU,	guillemotright, leftdoublequotemark ]	};
+    key <AB10> {    [          period,           comma,	slash,          ellipsis        ]       };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "typewriter" {
+    include "ua(basic)"
+
+    name[Group1]= "Ukraine - Typewriter";
+
+    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 "ua(basic)"
+  
+  name[Group1]= "Ukraine - Phonetic";
+
+  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            ]    };
+};
+
+// ukrainian keyboard layout RSTU 2019-91 (Respublikanskij STandart Ukrajiny)
+// Andrew Porokhnyak <aop@porokhnyak.org>
+partial alphanumeric_keys
+xkb_symbols "rstu" {
+    include "ua(basic)"
+
+    name[Group1]= "Ukraine - Standard RSTU";
+
+    key	<TLDE> {	[      apostrophe,	  question	] 	};
+    key	<AE01> {	[	   exclam,		 1 	]	};
+    key	<AE02> {	[        quotedbl,		 2	]	};
+    key	<AE03> {	[      numbersign,		 3	]	};
+    key	<AE04> {	[	semicolon,		 4	]	};
+    key	<AE05> {	[	    colon,		 5	]	};
+    key	<AE06> {	[	    comma,		 6	]	};
+    key	<AE07> {	[	   period,		 7	]	};
+    key	<AE08> {	[        asterisk,		 8	]	};
+    key	<AE09> {	[	parenleft,		 9	]	};
+    key	<AE10> {	[      parenright,		 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> {	[	    slash,	   percent	]	};
+};
+
+// russian keyboard layout RSTU 2019-91 (Respublikanskij STandart Ukrajiny)
+// Andrew Porokhnyak <aop@porokhnyak.org>
+partial alphanumeric_keys
+xkb_symbols "rstu_ru" {
+    include "ru(common)"
+    name[Group1]= "Ukraine - Standard RSTU on Russian layout";
+
+    key <TLDE> {        [      apostrophe,        question      ]       };
+    key <AE01> {        [          exclam,               1      ]       };
+    key <AE02> {        [        quotedbl,               2      ]       };
+    key <AE03> {        [      numbersign,               3      ]       };
+    key <AE04> {        [       semicolon,               4      ]       };
+    key <AE05> {        [           colon,               5      ]       };
+    key <AE06> {        [           comma,               6      ]       };
+    key <AE07> {        [          period,               7      ]       };
+    key <AE08> {        [        asterisk,               8      ]       };
+    key <AE09> {        [       parenleft,               9      ]       };
+    key <AE10> {        [      parenright,               0      ]       };
+    key <BKSL> {        [           slash,         percent      ]       };
+
+key.type[group1]="ALPHABETIC";
+
+    key <AB10> {        [     Cyrillic_io,     Cyrillic_IO      ]       };
+};
+
+//Homophonic keyboard layout (Tomas Marko Miljenović)
+//Based on Ukrainian National Transliteration, commonly used phonetic layouts for Mac and Win.
+//Existing layout "phonetic" used as template.
+partial alphanumeric_keys
+xkb_symbols "homophonic" {
+  include "ua(basic)"
+  name[Group1]= "Ukraine - Homophonic";
+
+  key <TLDE> {	 [          grave,	underscore	]	};
+  key <AE01> {	 [		1,	    exclam 	]	};
+  key <AE02> {	 [		2,              at	]	};
+  key <AE03> {	 [		3,       semicolon	]	};
+  key <AE04> {	 [		4,           colon	]	};
+  key <AE05> {	 [		5,	   percent	]	};
+  key <AE06> {	 [		6,	apostrophe	]	};
+  key <AE07> {	 [		7,	  quotedbl	]	};
+  key <AE08> {	 [		8,	  asterisk	]	};
+  key <AE09> {	 [		9,	 parenleft	]	};
+  key <AE10> {	 [		0,	parenright	]	};
+  key <AE11> {	 [ Ukrainian_ie,      Ukrainian_IE	  ]    };
+  key <AE12> {	 [ Ukrainian_yi,      Ukrainian_YI        ]    };
+
+  key <LatQ> {   [ Cyrillic_ya,       Cyrillic_YA         ]    };
+  key <LatW> {   [ Cyrillic_sha,      Cyrillic_SHA        ]    };
+  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_yu,       Cyrillic_YU        ]    };
+  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> {   [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ]    };
+  key <LatH> {   [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
+  key <LatJ> {   [ Cyrillic_shorti,   Cyrillic_SHORTI     ]    };
+  key <LatK> {   [ Cyrillic_ka,       Cyrillic_KA         ]    };
+  key <LatL> {   [ Cyrillic_el,       Cyrillic_EL         ]    };
+  key <AC10> {   [ Cyrillic_che,      Cyrillic_CHE        ]    };
+  key <AC11> {   [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
+  key <BKSL> {   [ Cyrillic_softsign, Cyrillic_SOFTSIGN   ]    };
+
+  key <LatZ> {   [ Cyrillic_ze,       Cyrillic_ZE         ]    };
+  key <LatX> {   [ Cyrillic_ha,       Cyrillic_HA         ]    };
+  key <LatC> {   [ Cyrillic_tse,      Cyrillic_TSE        ]    };
+  key <LatV> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };
+  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            ]    };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/us b/xorg-server/xkbdata.src/symbols/us
new file mode 100644
index 000000000..fb39c7200
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/us
@@ -0,0 +1,1054 @@
+// $XKeyboardConfig$
+
+//
+// $XdotOrg: xc/programs/xkbcomp/symbols/us,v 1.1.4.3 2004/03/05 13:41:33 eich Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/us,v 1.6 2003/10/31 14:32:05 pascal Exp $
+
+default
+partial alphanumeric_keys modifier_keys 
+xkb_symbols "basic" {
+
+    name[Group1]= "USA";
+
+    // 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	]	};
+    key <CAPS> {	[ Caps_Lock	]	};
+    // End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "euro" {
+
+    name[Group1]= "USA - With EuroSign on 5";
+
+    include "us(basic)"
+
+    include "eurosign(5)"
+
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "intl" {
+
+    name[Group1]= "USA - International (with dead keys)";
+
+    include "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, leftdoublequotemark ] };
+    key <AD12> { [bracketright, braceright, guillemotright, rightdoublequotemark ] };
+
+    key <AC01> { [	   a,          A,        aacute,           Aacute ] };
+    key <AC02> { [	   s,          S,        ssharp,          section ] };
+    key <AC03> { [	   d,          D,           eth,              ETH ] };
+    key <AC08> { [	   k,          K,            oe,               OE ] };
+
+    key <AC09> { [	   l,          L,        oslash,         Ooblique ] };
+    key <AC10> { [ semicolon,      colon,     paragraph,           degree ] };
+    key <AC11> { [dead_acute, dead_diaeresis, apostrophe,        quotedbl ] };
+
+    key <AB01> { [	   z,          Z,            ae,               AE ] };
+    key <AB03> { [	   c,          C,     copyright,             cent ] };
+    key <AB06> { [	   n,          N,        ntilde,           Ntilde ] };
+    key <AB07> { [	   m,          M,            mu,               mu ] };
+    key <AB08> { [     comma,       less,      ccedilla,         Ccedilla ] };
+    key <AB09> { [    period,    greater, dead_abovedot,       dead_caron ] };
+    key <AB10> { [     slash,   question,  questiondown,        dead_hook ] };
+    key <BKSL> { [ backslash,        bar,       notsign,        brokenbar ] };
+
+    include "level3(ralt_switch)"
+};
+
+// Based on symbols/us_intl keyboard map:
+// Dead-keys definition for a very simple US/ASCII layout.
+// by Conectiva (http://www.conectiva.com.br)
+// modified by Ricardo Y. Igarashi (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 alphanumeric_keys
+xkb_symbols "alt-intl" {
+
+  name[Group1]= "USA - Alternative international (former us_intl)";
+
+  include "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, leftsinglequotemark,  dead_breve ] };
+  key <AE10> { [	  0, parenright, rightsinglequotemark, dead_abovering ] };
+  key <AE11> { [      minus, underscore,    dead_macron,      dead_belowdot ] };
+  key <AE12> { [      equal, plus,	    dead_doubleacute, dead_horn	    ] };
+
+  key <AD03> { [          e, E,		     EuroSign,         cent	    ] };
+
+  key <AC10> { [  semicolon, colon,	     dead_ogonek,   dead_diaeresis  ] };
+  key <AC11> { [ dead_acute, dead_diaeresis, apostrophe,    quotedbl	    ] };
+
+  key <AB08> { [      comma, less,	     dead_cedilla,  dead_caron	    ] };
+  key <AB09> { [     period, greater,	     dead_abovedot, dead_circumflex ] };
+  key <AB10> { [      slash, question,	     dead_hook,	    dead_hook	    ] };
+
+  include "level3(ralt_switch)"
+};
+
+// based on a keyboard map from an 'xkb/symbols/dk' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/dvorak,v 1.5 2004/01/03 16:35:07 herrb Exp $
+
+partial alphanumeric_keys
+xkb_symbols "dvorak" {
+
+    name[Group1]= "USA - Dvorak";
+
+    // Alphanumeric section
+
+    key <TLDE> { [       grave,	asciitilde, dead_grave, dead_tilde	] };
+
+    key <AE01> { [	    1,	exclam 		]	};
+    key <AE02> { [	    2,	at		]	};
+    key <AE03> { [	    3,	numbersign	]	};
+    key <AE04> { [	    4,	dollar		]	};
+    key <AE05> { [	    5,	percent		]	};
+    key <AE06> { [	    6,	asciicircum, dead_circumflex, dead_circumflex ]	};
+    key <AE07> { [	    7,	ampersand	]	};
+    key <AE08> { [	    8,	asterisk	]	};
+    key <AE09> { [	    9,	parenleft,  dead_grave]	};
+    key <AE10> { [	    0,	parenright	]	};
+    key <AE11> { [ bracketleft,	braceleft	]	};
+    key <AE12> { [ bracketright, braceright,  dead_tilde] };
+
+    key <AD01> { [  apostrophe,	quotedbl, dead_acute, dead_diaeresis	] };
+    key <AD02> { [	comma,	less,   dead_cedilla, dead_caron	] };
+    key <AD03> { [      period,	greater, dead_abovedot, periodcentered	] };
+    key <AD04> { [	    p,	P		]	};
+    key <AD05> { [	    y,	Y		]	};
+    key <AD06> { [	    f,	F		]	};
+    key <AD07> { [	    g,	G		]	};
+    key <AD08> { [	    c,	C		]	};
+    key <AD09> { [	    r,	R		]	};
+    key <AD10> { [	    l,	L		]	};
+    key <AD11> { [	slash,	question	]	};
+    key <AD12> { [	equal,	plus		]	};
+
+    key <AC01> { [	    a,	A 		]	};
+    key <AC02> { [	    o,	O		]	};
+    key <AC03> { [	    e,	E		]	};
+    key <AC04> { [	    u,	U		]	};
+    key <AC05> { [	    i,	I		]	};
+    key <AC06> { [	    d,	D		]	};
+    key <AC07> { [	    h,	H		]	};
+    key <AC08> { [	    t,	T		]	};
+    key <AC09> { [	    n,	N		]	};
+    key <AC10> { [	    s,	S		]	};
+    key <AC11> { [	minus,	underscore	]	};
+
+    key <AB01> { [   semicolon,	colon, dead_ogonek, dead_doubleacute ] };
+    key <AB02> { [	    q,	Q		]	};
+    key <AB03> { [	    j,	J		]	};
+    key <AB04> { [	    k,	K		]	};
+    key <AB05> { [	    x,	X		]	};
+    key <AB06> { [	    b,	B		]	};
+    key <AB07> { [	    m,	M		]	};
+    key <AB08> { [	    w,	W		]	};
+    key <AB09> { [	    v,	V		]	};
+    key <AB10> { [	    z,	Z		]	};
+
+    key <BKSL> { [  backslash,  bar             ]       };
+};
+
+// Dvorak international
+// Stephane Magnenat (stephane at magnenat dot net, http://stephane.magnenat.net)
+// Based on information from http://www.poupinou.org/dvorak/index.html
+//
+//  `   1   2   3   4   5   6   7   8   9   0   [   ]   \
+//                  €
+//
+//      '   ,   .   p   y   f   g   c   r   l   /   =
+//          ä   ê   ë   ü           ç
+//
+//      a   o   e   u   i   d   h   t   n   s   -
+//      à   ô   é   û   î                   ß
+//
+//      ;   q   j   k   x   b   m   w   v   z
+//      â   ö   è   ù   ï
+
+partial alphanumeric_keys
+xkb_symbols "dvorak-intl" {
+
+    name[Group1]= "USA - Dvorak international";
+
+    include "us(dvorak)"
+
+    key <AE04> { [         4,  dollar,    EuroSign ] };
+
+    key <AD02> { [     comma,    less,  adiaeresis,       dead_caron ] };
+    key <AD03> { [    period, greater, ecircumflex,   periodcentered	] };
+    key <AD04> { [         p,       P,  ediaeresis,     dead_cedilla ] };
+    key <AD05> { [         y,       Y,  udiaeresis ] };
+    key <AD08> { [         c,       C,    ccedilla,    dead_abovedot ] };
+
+    key <AC01> { [         a,       A,      agrave ] };
+    key <AC02> { [         o,       O, ocircumflex ] };
+    key <AC03> { [         e,       E,      eacute ] };
+    key <AC04> { [         u,       U, ucircumflex ] };
+    key <AC05> { [         i,       I, icircumflex ] };
+    key <AC10> { [         s,       S,      ssharp ] };
+
+    key <AB01> { [ semicolon,   colon, acircumflex ] };
+    key <AB02> { [         q,       Q,  odiaeresis,      dead_ogonek ] };
+    key <AB03> { [         j,       J,      egrave, dead_doubleacute ] };
+    key <AB04> { [         k,       K,      ugrave ] };
+    key <AB05> { [         x,       X,  idiaeresis ] };
+
+    include "level3(ralt_switch)"
+};
+
+// Left and right handed dvorak layouts
+// by sqweek <sqweek@gmail.com> 2006-01-30
+// Based on the corresponding layouts in the console-tools package.
+partial alphanumeric_keys
+xkb_symbols "dvorak-l" {
+
+    include "us(dvorak)"
+    name[Group1]= "USA - Left handed Dvorak";
+
+    key <AE01> {	[ bracketleft,	braceleft	]	};
+    key <AE02> {	[ bracketright,	braceright	]	};
+    key <AE03> {	[	slash,	question	]	};
+    key <AE04> {	[	    p,	P		]	};
+    key <AE05> {	[	    f,	F		]	};
+    key <AE06> {	[	    m,	M		]	};
+    key <AE07> {	[	    l,	L		]	};
+    key <AE08> {	[	    j,	J		]	};
+    key <AE09> {	[	    4,	dollar		]	};
+    key <AE10> {	[	    3,	numbersign	]	};
+    key <AE11> {	[	    2,	at		]	};
+    key <AE12> {	[	    1,	exclam 		]	};
+
+    key <AD01> {	[   semicolon,	colon 		]	};
+    key <AD02> {	[	    q,	Q		]	};
+    key <AD03> {	[	    b,	B		]	};
+    key <AD04> {	[	    y,	Y		]	};
+    key <AD05> {	[	    u,	U		]	};
+    key <AD06> {	[	    r,	R		]	};
+    key <AD07> {	[	    s,	S		]	};
+    key <AD08> {	[	    o,	O		]	};
+    key <AD09> {	[      period,	greater		]	};
+    key <AD10> {	[	    6,	asciicircum	]	};
+    key <AD11> {	[	    5,	percent		]	};
+    key <AD12> {	[	equal,	plus		]	};
+
+    key <AC01> {	[	minus,	underscore	]	};
+    key <AC02> {	[	    k,	K		]	};
+    key <AC03> {	[	    c,	C		]	};
+    key <AC04> {	[	    d,	D		]	};
+    key <AC05> {	[	    t,	T		]	};
+    key <AC06> {	[	    h,	H		]	};
+    key <AC07> {	[	    e,	E		]	};
+    key <AC08> {	[	    a,	A 		]	};
+    key <AC09> {	[	    z,	Z		]	};
+    key <AC10> {	[	    8,	asterisk	]	};
+    key <AC11> {	[	    7,	ampersand	]	};
+
+    key <AB01> {	[  apostrophe,	quotedbl	] 	};
+    key <AB02> {	[	    x,	X		]	};
+    key <AB03> {	[	    g,	G		]	};
+    key <AB04> {	[	    v,	V		]	};
+    key <AB05> {	[	    w,	W		]	};
+    key <AB06> {	[	    n,	N		]	};
+    key <AB07> {	[	    i,	I		]	};
+    key <AB08> {	[	comma,	less		]	};
+    key <AB09> {	[	    0,	parenright	]	};
+    key <AB10> {	[	    9,	parenleft	]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "dvorak-r" {
+    
+    include "us(dvorak)"
+    name[Group1]= "USA - Right handed Dvorak";
+
+    key <AE01> {	[	    1,	exclam 		]	};
+    key <AE02> {	[	    2,	at		]	};
+    key <AE03> {	[	    3,	numbersign	]	};
+    key <AE04> {	[	    4,	dollar		]	};
+    key <AE05> {	[	    j,	J		]	};
+    key <AE06> {	[	    l,	L		]	};
+    key <AE07> {	[	    m,	M		]	};
+    key <AE08> {	[	    f,	F		]	};
+    key <AE09> {	[	    p,	P		]	};
+    key <AE10> {	[	slash,	question	]	};
+    key <AE11> {	[ bracketleft,	braceleft	]	};
+    key <AE12> {	[ bracketright,	braceright	]	};
+
+    key <AD01> {	[	    5,	percent		]	};
+    key <AD02> {	[	    6,	asciicircum ]	};
+    key <AD03> {	[	    q,	Q		]	};
+    key <AD04> {	[      period,	greater		]	};
+    key <AD05> {	[	    o,	O		]	};
+    key <AD06> {	[	    r,	R		]	};
+    key <AD07> {	[	    s,	S		]	};
+    key <AD08> {	[	    u,	U		]	};
+    key <AD09> {	[	    y,	Y		]	};
+    key <AD10> {	[	    b,	B		]	};
+    key <AD11> {	[   semicolon,	colon 		]	};
+    key <AD12> {	[	equal,	plus		]	};
+
+    key <AC01> {	[	    7,	ampersand	]	};
+    key <AC02> {	[	    8,	asterisk	]	};
+    key <AC03> {	[	    z,	Z		]	};
+    key <AC04> {	[	    a,	A 		]	};
+    key <AC05> {	[	    e,	E		]	};
+    key <AC06> {	[	    h,	H		]	};
+    key <AC07> {	[	    t,	T		]	};
+    key <AC08> {	[	    d,	D		]	};
+    key <AC09> {	[	    c,	C		]	};
+    key <AC10> {	[	    k,	K		]	};
+    key <AC11> {	[	minus,	underscore	]	};
+
+    key <AB01> {	[	    9,	parenleft	]	};
+    key <AB02> {	[	    0,	parenright	]	};
+    key <AB03> {	[	    x,	X		]	};
+    key <AB04> {	[	comma,	less		]	};
+    key <AB05> {	[	    i,	I		]	};
+    key <AB06> {	[	    n,	N		]	};
+    key <AB07> {	[	    w,	W		]	};
+    key <AB08> {	[	    v,	V		]	};
+    key <AB09> {	[	    g,	G		]	};
+    key <AB10> {	[  apostrophe,	quotedbl	] 	};
+};
+
+// Classic dvorak layout
+// by Piter Punk <piterpk@terra.com.br> - 2006-07-06 
+// Based on dvorak layout and e-mail from Russel L. Harris rlharris@oplink.net 
+// on xorg list.
+partial alphanumeric_keys
+xkb_symbols "dvorak-classic" {
+
+    name[Group1]= "USA - Classic Dvorak";
+
+    // Alphanumeric section
+
+    key <TLDE> { [       grave,	asciitilde, dead_grave, dead_tilde	] };
+
+    key <AE01> { [ bracketleft,	braceleft	]	};
+    key <AE02> { [	    7,	ampersand	]	};
+    key <AE03> { [	    5,	percent		]	};
+    key <AE04> { [	    3,	numbersign	]	};
+    key <AE05> { [	    1,	exclam 		]	};
+    key <AE06> { [	    9,	parenleft,  dead_grave]	};
+    key <AE07> { [	    0,	parenright	]	};
+    key <AE08> { [	    2,	at		]	};
+    key <AE09> { [	    4,	dollar		]	};
+    key <AE10> { [	    6,	asciicircum, dead_circumflex, dead_circumflex ]	};
+    key <AE11> { [	    8,	asterisk	]	};
+    key <AE12> { [ bracketright, braceright,  dead_tilde] };
+
+    key <AD01> { [	slash,	question	]	};
+    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> { [  apostrophe,	quotedbl, dead_acute, dead_diaeresis	] };
+    key <AD12> { [	equal,	plus		]	};
+
+    key <AC01> { [	    a,	A 		]	};
+    key <AC02> { [	    o,	O		]	};
+    key <AC03> { [	    e,	E		]	};
+    key <AC04> { [	    u,	U		]	};
+    key <AC05> { [	    i,	I		]	};
+    key <AC06> { [	    d,	D		]	};
+    key <AC07> { [	    h,	H		]	};
+    key <AC08> { [	    t,	T		]	};
+    key <AC09> { [	    n,	N		]	};
+    key <AC10> { [	    s,	S		]	};
+    key <AC11> { [	minus,	underscore	]	};
+
+    key <AB01> { [   semicolon,	colon, dead_ogonek, dead_doubleacute ] };
+    key <AB02> { [	    q,	Q		]	};
+    key <AB03> { [	    j,	J		]	};
+    key <AB04> { [	    k,	K		]	};
+    key <AB05> { [	    x,	X		]	};
+    key <AB06> { [	    b,	B		]	};
+    key <AB07> { [	    m,	M		]	};
+    key <AB08> { [	    w,	W		]	};
+    key <AB09> { [	    v,	V		]	};
+    key <AB10> { [	    z,	Z		]	};
+    key <BKSL> { [  backslash,  bar             ]       };
+};
+
+// Programmer Dvorak, by Roland Kaufmann <rlndkfmn at gmail dot com>
+// License: BSD, available at <http://www.kaufmann.no/roland/dvorak/license.html>
+// Main features: Numbers are in shift position (like French), symbols have been
+// placed in locations that give good hand-alternation and finger rolling with
+// symbols that usually follows, accented characters are possible for I18N.
+partial alphanumeric_keys
+xkb_symbols "dvp" {
+    include "us(dvorak)"
+
+    name[Group1] = "USA - Programmer Dvorak";
+
+    //             Unmodified       Shift           AltGr            Shift+AltGr
+    // symbols row, left side
+    key <TLDE> { [ dollar,          asciitilde,     dead_tilde                  ] };
+    key <AE01> { [ ampersand,       percent                                     ] };
+    key <AE02> { [ bracketleft,     7,              currency                    ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+    key <AE03> { [ braceleft,       5,              cent                        ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+    key <AE04> { [ braceright,      3,              yen                         ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+    key <AE05> { [ parenleft,       1,              EuroSign                    ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+    key <AE06> { [ equal,           9,              sterling                    ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+
+    // symbols row, right side
+    key <AE07> { [ asterisk,        0                                           ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+    key <AE08> { [ parenright,      2,              onehalf                     ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+    key <AE09> { [ plus,            4                                           ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+    key <AE10> { [ bracketright,    6                                           ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+    key <AE11> { [ exclam,          8,              exclamdown                  ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+    key <AE12> { [ numbersign,      grave,          dead_grave                  ] };
+    key <BKSP> { [ BackSpace                                                    ] };
+
+    // upper row, left side
+    key <AD01> { [ semicolon,       colon,          dead_diaeresis              ] };
+    key <AD02> { [ comma,           less,           guillemotleft               ] };
+    key <AD03> { [ period,          greater,        guillemotright              ] };
+    key <AD04> { [ p,               P,              paragraph,       section    ] };
+    key <AD05> { [ y,               Y,              udiaeresis,      Udiaeresis ] };
+
+    // upper row, right side
+    key <AD08> { [ c,               C,              ccedilla,        Ccedilla   ] };
+    key <AD09> { [ r,               R,              registered,      trademark  ] };
+    key <AD11> { [ slash,           question,       questiondown                ] };
+    key <AD12> { [ at,              asciicircum,    dead_circumflex, dead_caron ] };
+
+    // home row, left side
+    key <AC01> { [ a,               A,              aring,           Aring      ] };
+    key <AC02> { [ o,               O,              oslash,          Ooblique   ] };
+    key <AC03> { [ e,               E,              ae,              AE         ] };
+    key <AC04> { [ u,               U,              eacute,          Eacute     ] };
+
+    // home row, right side
+    key <AC06> { [ d,               D,              eth,             ETH        ] };
+    key <AC07> { [ h,               H,              dead_acute                  ] };
+    key <AC08> { [ t,               T,              thorn,           THORN      ] };
+    key <AC09> { [ n,               N,              ntilde,          Ntilde     ] };
+    key <AC10> { [ s,               S,              ssharp                      ] };
+    key <AC11> { [ minus,           underscore,     hyphen                      ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+    key <BKSL> { [ backslash,       bar                                         ] };
+
+    // lower row, left side
+    key <AB01> { [ apostrophe,      quotedbl,       dead_acute                  ] };
+};
+
+// phonetic layout for Russian letters on an US keyboard
+// by Ivan Popov <pin@konvalo.org> 2005-07-17
+
+// level3 modifier is a shortcut to the "us" meaning of the keys where
+// we place cyrillic letters, handy for accessing the corresponding
+// punctuation marks.
+// It is important to have access to punctuation marks, and the rest of
+// alphabetical keys are added for being consequent so that the users
+// can expect the level3 modifier to give what the key label shows.
+
+partial alphanumeric_keys
+xkb_symbols "rus" {
+
+    name[Group1]= "USA - Russian phonetic";
+
+    include "us(basic)"
+
+key.type[group1]="FOUR_LEVEL_ALPHABETIC";
+
+    key	<LatA> {	[ Cyrillic_a, Cyrillic_A ]	};
+    key	<LatB> {	[ Cyrillic_be, Cyrillic_BE ]	};
+    key	<LatW> {	[ Cyrillic_ve, Cyrillic_VE ]	};
+    key	<LatG> {	[ Cyrillic_ghe, Cyrillic_GHE ]	};
+    key	<LatD> {	[ Cyrillic_de, Cyrillic_DE ]	};
+    key	<LatE> {	[ Cyrillic_ie, Cyrillic_IE ]	};
+    key	<TLDE> {	[ Cyrillic_io, Cyrillic_IO, grave, asciitilde ] };
+    key	<LatV> {	[ Cyrillic_zhe, Cyrillic_ZHE ]	};
+    key	<LatZ> {	[ Cyrillic_ze, Cyrillic_ZE ]	};
+    key	<LatI> {	[ Cyrillic_i, Cyrillic_I ]	};
+    key	<LatJ> {	[ Cyrillic_shorti, Cyrillic_SHORTI ]	};
+    key	<LatK> {	[ Cyrillic_ka, Cyrillic_KA ]	};
+    key	<LatL> {	[ Cyrillic_el, Cyrillic_EL ]	};
+    key	<LatM> {	[ Cyrillic_em, Cyrillic_EM ]	};
+    key	<LatN> {	[ Cyrillic_en, Cyrillic_EN ]	};
+    key	<LatO> {	[ Cyrillic_o, Cyrillic_O ]	};
+    key	<LatP> {	[ Cyrillic_pe, Cyrillic_PE ]	};
+    key	<LatR> {	[ Cyrillic_er, Cyrillic_ER ]	};
+    key	<LatS> {	[ Cyrillic_es, Cyrillic_ES ]	};
+    key	<LatT> {	[ Cyrillic_te, Cyrillic_TE ]	};
+    key	<LatU> {	[ Cyrillic_u, Cyrillic_U ]	};
+    key	<LatF> {	[ Cyrillic_ef, Cyrillic_EF ]	};
+    key	<LatH> {	[ Cyrillic_ha, Cyrillic_HA ]	};
+    key	<LatC> {	[ Cyrillic_tse, Cyrillic_TSE ]	};
+    key <AC10> {        [ Cyrillic_che, Cyrillic_CHE, semicolon, colon ] };
+    key	<AD11> {	[ Cyrillic_sha, Cyrillic_SHA, bracketleft, braceleft] };
+    key	<AD12> {	[ Cyrillic_shcha, Cyrillic_SHCHA, bracketright, braceright ]	};
+    key <AE12> {        [ Cyrillic_hardsign, Cyrillic_HARDSIGN, equal, plus ] };
+    key	<LatY> {	[ Cyrillic_yeru, Cyrillic_YERU ]	};
+    key	<LatX> {	[ Cyrillic_softsign, Cyrillic_SOFTSIGN ]	};
+    key	<BKSL> {	[ Cyrillic_e, Cyrillic_E, backslash, bar ]	};
+    key <AC11> {        [ Cyrillic_yu, Cyrillic_YU, apostrophe, quotedbl ] };
+    key	<LatQ> {	[ Cyrillic_ya, Cyrillic_YA ]	};
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "mac" {
+
+    include "us(basic)"
+    name[Group1]= "USA - Macintosh";
+    key.type[group1]="FOUR_LEVEL";
+
+    // Slightly improvised from http://homepage.mac.com/thgewecke/kblayout.jpg
+    key <LSGT> { [   section,  plusminus,       section,        plusminus ] };
+    key <TLDE> { [     grave, asciitilde,    dead_grave,        dead_horn ] };
+    key <AE01> { [	   1,     exclam,    exclamdown,            U2044 ] };
+    key <AE02> { [	   2,         at,     trademark,         EuroSign ] };
+    key <AE03> { [	   3, numbersign,      sterling,            U2039 ] };
+    key <AE04> { [	   4,     dollar,          cent,            U203A ] };
+    key <AE05> { [	   5,    percent,      infinity,            UFB01 ] };
+    key <AE06> { [         6,asciicircum,       section,            UFB02 ] };
+    key <AE07> { [	   7,  ampersand,     paragraph,     doubledagger ] };
+    key <AE08> { [	   8,   asterisk, enfilledcircbullet,      degree ] };
+    key <AE09> { [	   9,  parenleft,   ordfeminine,   periodcentered ] };
+    key <AE10> { [	   0, parenright,     masculine,singlelowquotemark] };
+    key <AE11> { [     minus, underscore,        endash,           emdash ] };
+    key <AE12> { [     equal,       plus,      notequal,        plusminus ] };
+
+    key <AD01> { [	   q,          Q,            oe,               OE ] };
+    key <AD02> { [	   w,          W,         U2211,doublelowquotemark] };
+    key <AD03> { [	   e,          E,    dead_acute,            acute ] };
+    key <AD04> { [	   r,          R,    registered,            U2030 ] };
+    key <AD05> { [	   t,          T,        dagger,       dead_caron ] };
+    key <AD06> { [	   y,          Y,           yen,       onequarter ] };
+    key <AD07> { [	   u,        U,  dead_diaeresis,        diaeresis ] };
+    key <AD08> { [	   i,        I, dead_circumflex,            U02C6 ] };
+    key <AD09> { [	   o,          O,        oslash,         Ooblique ] };
+    key <AD10> { [	   p,          P,      Greek_pi,            U220F ] };
+    key <AD11> { [ bracketleft,  braceleft, leftdoublequotemark, rightdoublequotemark ] };
+    key <AD12> { [bracketright, braceright, leftsinglequotemark, rightsinglequotemark ] };
+    key <BKSL> { [ backslash,        bar, guillemotleft,   guillemotright ] };
+
+    key <AC01> { [	   a,          A,         aring,            Aring ] };
+    key <AC02> { [	   s,          S,        ssharp,      dead_stroke ] };
+    key <AC03> { [	   d,          D, partialderivative,          eth ] };
+    key <AC04> { [	   f,          F,      function,        dead_hook ] };
+    key <AC05> { [	   g,          G,     copyright, dead_doubleacute ] };
+    key <AC06> { [	   h,          H, dead_abovedot,    dead_belowdot ] };
+    key <AC07> { [	   j,          J,         U2206,          onehalf ] };
+    key <AC08> { [	   k,          K,dead_abovering,            UF8FF ] };
+
+    key <AC09> { [	   l,          L,       notsign,            THORN ] };
+    key <AC10> { [ semicolon,      colon,         U2026,            thorn ] };
+    key <AC11> { [apostrophe,   quotedbl,            ae,               AE ] };
+
+    key <AB01> { [	   z,          Z,   Greek_OMEGA,     dead_cedilla ] };
+    key <AB02> { [	   x,          X,         U2248,      dead_ogonek ] };
+				// unclear whether "approxeq" is 2248 or 2245
+    key <AB03> { [	   c,          C,      ccedilla,         Ccedilla ] };
+    key <AB04> { [	   v,          V,    squareroot,            U25CA ] };
+    key <AB05> { [	   b,          B,      integral,         idotless ] };
+    key <AB06> { [	   n,          N,    dead_tilde,            U02DC ] };
+    key <AB07> { [	   m,          M,            mu,    threequarters ] };
+    key <AB08> { [     comma,       less, lessthanequal,      dead_macron ] };
+    key <AB09> { [    period,    greater, greaterthanequal,    dead_breve ] };
+    key <AB10> { [     slash,   question,      division,     questiondown ] };
+
+    include "level3(ralt_switch)"
+};
+ 
+// Colemak symbols for xkb on X.Org Server 7.x
+// 2006-01-01 Shai Coleman, http://colemak.com/ . Public domain.
+
+partial alphanumeric_keys
+xkb_symbols "colemak" {
+    include "us"
+    name[Group1]= "USA - Colemak";
+
+    // Alphanumeric section
+    key <TLDE> { [        grave,   asciitilde,      dead_tilde,       asciitilde ] };
+    key <AE01> { [            1,       exclam,      exclamdown,      onesuperior ] };
+    key <AE02> { [            2,           at,       masculine,      twosuperior ] };
+    key <AE03> { [            3,   numbersign,     ordfeminine,    threesuperior ] };
+    key <AE04> { [            4,       dollar,            cent,         sterling ] };
+    key <AE05> { [            5,      percent,        EuroSign,              yen ] };
+    key <AE06> { [            6,  asciicircum,         hstroke,          Hstroke ] };
+    key <AE07> { [            7,    ampersand,             eth,              ETH ] };
+    key <AE08> { [            8,     asterisk,           thorn,            THORN ] };
+    key <AE09> { [            9,    parenleft,  leftsinglequotemark,  leftdoublequotemark ] };
+    key <AE10> { [            0,   parenright, rightsinglequotemark,  rightdoublequotemark ] };
+    key <AE11> { [        minus,   underscore,          endash,           emdash ] };
+    key <AE12> { [        equal,         plus,        multiply,         division ] };
+
+    key <AD01> { [            q,            Q,      adiaeresis,       Adiaeresis ] };
+    key <AD02> { [            w,            W,           aring,            Aring ] };
+    key <AD03> { [            f,            F,          atilde,           Atilde ] };
+    key <AD04> { [            p,            P,          oslash,         Ooblique ] };
+    key <AD05> { [            g,            G,     dead_ogonek,       asciitilde ] };
+    key <AD06> { [            j,            J,         dstroke,          Dstroke ] };
+    key <AD07> { [            l,            L,         lstroke,          Lstroke ] };
+    key <AD08> { [            u,            U,          uacute,           Uacute ] };
+    key <AD09> { [            y,            Y,      udiaeresis,       Udiaeresis ] };
+    key <AD10> { [    semicolon,        colon,      odiaeresis,       Odiaeresis ] };
+    key <AD11> { [  bracketleft,    braceleft,   guillemotleft,        0x1002039 ] };
+    key <AD12> { [ bracketright,   braceright,  guillemotright,        0x100203a ] };
+    key <BKSL> { [    backslash,          bar,      asciitilde,       asciitilde ] };
+
+    key <AC01> { [            a,            A,          aacute,           Aacute ] };
+    key <AC02> { [            r,            R,      dead_grave,       asciitilde ] };
+    key <AC03> { [            s,            S,          ssharp,       asciitilde ] };
+    key <AC04> { [            t,            T,      dead_acute, dead_doubleacute ] };
+    key <AC05> { [            d,            D,  dead_diaeresis,       asciitilde ] };
+    key <AC06> { [            h,            H,      dead_caron,       asciitilde ] };
+    key <AC07> { [            n,            N,          ntilde,           Ntilde ] };
+    key <AC08> { [            e,            E,          eacute,           Eacute ] };
+    key <AC09> { [            i,            I,          iacute,           Iacute ] };
+    key <AC10> { [            o,            O,          oacute,           Oacute ] };
+    key <AC11> { [   apostrophe,     quotedbl,          otilde,           Otilde ] };
+
+    key <AB01> { [            z,            Z,              ae,               AE ] };
+    key <AB02> { [            x,            X, dead_circumflex,       asciitilde ] };
+    key <AB03> { [            c,            C,        ccedilla,         Ccedilla ] };
+    key <AB04> { [            v,            V,              oe,               OE ] };
+    key <AB05> { [            b,            B,      dead_breve,       asciitilde ] };
+    key <AB06> { [            k,            K,  dead_abovering,       asciitilde ] };
+    key <AB07> { [            m,            M,     dead_macron,       asciitilde ] };
+    key <AB08> { [        comma,         less,    dead_cedilla,       asciitilde ] };
+    key <AB09> { [       period,      greater,   dead_abovedot,       asciitilde ] };
+    key <AB10> { [        slash,     question,    questiondown,       asciitilde ] };
+
+    key <CAPS> { [    BackSpace,    BackSpace,       BackSpace,        BackSpace ] };
+    key <LSGT> { [        minus,   underscore,          endash,           emdash ] };
+    key <SPCE> { [        space,        space,           space,     nobreakspace ] };
+
+    include "level3(ralt_switch)"
+};
+
+// I do NOT like dead-keys - the International keyboard as defined by Microsoft
+// doesn't fit my needs. Why use two keystrokes for all simple characters (eg '
+// and <space> generates a single ') just to have an é (eacute) in two strokes
+// as well? I type ' more often than é (eacute).
+//
+// This file works just like a regular keyboard, BUT has all dead-keys
+// accessible at level3 (through AltGr). An ë (ediaeresis) is now: AltGr+"
+// followed by an e. In other words, this keyboard is not international as long
+// as you leave the right Alt key alone.
+//
+// The original MS International keyboard was intended for Latin1 (iso8859-1).
+// With the introduction of iso8859-15, the (important) ligature oe (and OE)
+// became available. I added them next to ae. Because I write ediaeresis more
+// often than registered, I moved registered to be next to copyright and added
+// ediaeresis and idiaeresis. - Adriaan
+
+partial alphanumeric_keys
+xkb_symbols "altgr-intl" {
+
+   name[Group1]= "USA - International (AltGr dead keys)";
+
+   include "us(intl)"
+
+// five dead keys moved into level3:
+
+   key <TLDE> { [    grave, asciitilde,  dead_grave,   dead_tilde      ] };
+   key <AC11> { [apostrophe,quotedbl,    dead_acute,   dead_diaeresis  ] };
+
+// diversions from the MS Intl keyboard:
+
+   key <AE01> { [        1, exclam,      onesuperior,  exclamdown      ] };
+   key <AD04> { [        r, R,           ediaeresis,   Ediaeresis      ] };
+   key <AC07> { [        j, J,           idiaeresis,   Idiaeresis      ] };
+   key <AB02> { [        x, X,           oe,           OE              ] };
+   key <AB04> { [        v, V,           registered,   registered      ] };
+
+// onequarter etc (not in iso8859-15) deleted to get three unshifted deadkeys:
+
+   key <AE06> { [        6, asciicircum,       dead_circumflex         ] };
+   key <AE07> { [        7, ampersand,         dead_horn               ] };
+   key <AE08> { [        8, asterisk,          dead_ogonek             ] };
+
+   include "level3(ralt_switch)"
+};
+
+// Intel ClassmatePC Keyboard Layout
+// by Piter PUNK <piterpk@terra.com.br>
+//
+// The keyboard layouts below maps the us(basic), us(intl) and us(alt-intl)
+// to ClassmatePC keyboard. All layouts uses RCTL as level3(switch) since
+// the keyboard doesn't have AltGr key. The EuroSign is engraved at 5 key.
+
+// classmate - us(basic)
+partial alphanumeric_keys
+xkb_symbols "classmate" {
+    include "us(basic)"
+    name[Group1]= "USA - ClassmatePC";
+
+    key <LSGT> { [ backslash,	bar,		backslash,	bar ] };
+
+    include "eurosign(5)"
+    include "level3(switch)"
+};
+
+// classmate-intl - us(intl)
+// RCTL is generated by Fn+Alt, because that, when trying to access
+// the level3 symbols at 7,8,9,0,u,i,o,p,j,k,l,;,m,. and / we got
+// the keypad keycodes. The keypad is changed to make Fn+Alt+<KP_key>
+// generate the same symbol as the original key.
+partial alphanumeric_keys
+xkb_symbols "classmate-intl" {
+    include "us(intl)"
+    name[Group1]= "USA - ClassmatePC (International)";
+    key.type[Group1]="FOUR_LEVEL";
+
+    key <LSGT> { [ backslash,	bar,		backslash,	bar ] };
+
+    key <KP7>  { [	KP_Home,		KP_7,	
+			onehalf,		dead_horn	] };
+    key <KP8>  { [	KP_Up,			KP_8,
+			threequarters,		dead_ogonek	] };
+    key <KP9>  { [	KP_Prior,		KP_9,
+			leftsinglequotemark,	dead_breve	] };
+    key <KPMU> { [ 	KP_Multiply,		KP_Multiply,
+			rightsinglequotemark,	dead_abovering	] };
+
+    key <KP4>  { [	KP_Left,		KP_4,
+			uacute,			Uacute		] };
+    key <KP5>  { [	KP_Begin,		KP_5,
+			iacute,			Iacute		] };
+    key <KP6>  { [	KP_Right,		KP_6,
+			oacute,			Oacute		] };
+    key <KPSU> { [	KP_Subtract,		KP_Subtract,
+			odiaeresis,		Odiaeresis	] };
+
+    key <KP2>  { [	KP_Down,		KP_2,
+			oe,			OE		] };
+    key <KP3>  { [	KP_Next,		KP_3,
+			oslash,			Ooblique	] };
+    key <KPAD> { [ 	KP_Add,     		KP_Add,
+			paragraph,		degree          ] };
+   
+    key <KP0>  { [	KP_Insert,		KP_0,
+			mu,			mu	] };
+    key <KPDL> { [	KP_Delete,		KP_Decimal,
+			dead_abovedot,		dead_caron	] }; 
+    key <KPDV> { [ 	KP_Divide,   		KP_Divide,
+			questiondown,		dead_hook       ] };
+
+    include "level3(switch)"
+};
+
+// classmate-alt-intl - us(alt-intl)
+// RCTL is generated by Fn+Alt, because that, when trying to access
+// the level3 symbols at 7,8,9,0,u,i,o,p,j,k,l,;,m,. and / we got
+// the keypad keycodes. The keypad is changed to make Fn+Alt+<KP_key>
+// generate the same symbol as the original key.
+partial alphanumeric_keys
+xkb_symbols "classmate-alt-intl" {
+    include "us(alt-intl)"
+    name[Group1]= "USA - ClassmatePC (Alternative international)";
+    key.type[Group1]="FOUR_LEVEL";
+
+    key <LSGT> { [ backslash,	bar,		backslash,	bar ] };
+
+    key <KPSU> { [	KP_Subtract,		KP_Subtract	] };
+
+    key <KP9>  { [	KP_Prior,		KP_9,
+			leftsinglequotemark,	dead_breve	] };
+    key <KPMU> { [ 	KP_Multiply,		KP_Multiply,
+			rightsinglequotemark,	dead_abovering	] };
+
+    key <KPAD> { [ 	KP_Add,     		KP_Add,
+			dead_ogonek,		dead_diaeresis   ] };
+    
+    key <KPDL> { [	KP_Delete,		KP_Decimal,
+			dead_abovedot,		dead_circumflex	] }; 
+    key <KPDV> { [ 	KP_Divide,   		KP_Divide,
+			dead_hook,		dead_hook       ] };
+
+    include "level3(switch)"
+};
+
+// classmate-altgr-intl - us(altgr-intl)
+// RCTL is generated by Fn+Alt, because that, when trying to access
+// the level3 symbols at 7,8,9,0,u,i,o,p,j,k,l,;,m,. and / we got
+// the keypad keycodes. The keypad is changed to make Fn+Alt+<KP_key>
+// generate the same symbol as the original key.
+partial alphanumeric_keys
+xkb_symbols "classmate-altgr-intl" {
+    include "us(altgr-intl)"
+    name[Group1]= "USA - ClassmatePC (International Fn+Alt dead-keys)";
+    key.type[Group1]="FOUR_LEVEL";
+
+    key <LSGT> { [ backslash,	bar,		backslash,	bar ] };
+
+    key <KP7>  { [	KP_Home,		KP_7,	
+			dead_horn,		dead_horn	] };
+    key <KP8>  { [	KP_Up,			KP_8,
+			dead_ogonek,		dead_ogonek	] };
+    key <KP9>  { [	KP_Prior,		KP_9,
+			leftsinglequotemark,	dead_breve	] };
+    key <KPMU> { [ 	KP_Multiply,		KP_Multiply,
+			rightsinglequotemark,	dead_abovering	] };
+
+    key <KP4>  { [	KP_Left,		KP_4,
+			uacute,			Uacute		] };
+    key <KP5>  { [	KP_Begin,		KP_5,
+			iacute,			Iacute		] };
+    key <KP6>  { [	KP_Right,		KP_6,
+			oacute,			Oacute		] };
+    key <KPSU> { [	KP_Subtract,		KP_Subtract,
+			odiaeresis,		Odiaeresis	] };
+
+    key <KP1>  { [	KP_End,			KP_1,
+			idiaeresis,		Idiaeresis	] };
+    key <KP2>  { [	KP_Down,		KP_2,
+			oe,			OE		] };
+    key <KP3>  { [	KP_Next,		KP_3,
+			oslash,			Ooblique	] };
+    key <KPAD> { [ 	KP_Add,     		KP_Add,
+			paragraph,		degree          ] };
+   
+    key <KP0>  { [	KP_Insert,		KP_0,
+			mu,			mu	] };
+    key <KPDL> { [	KP_Delete,		KP_Decimal,
+			dead_abovedot,		dead_caron	] }; 
+    key <KPDV> { [ 	KP_Divide,   		KP_Divide,
+			questiondown,		dead_hook       ] };
+
+    include "level3(switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+   include "us(basic)"
+   name[Group1]= "USA";
+
+   // OLPC international US English keyboard layout.
+   // It's a little different from the usual international layout.
+   // See: http://wiki.laptop.org/go/Image:Keyboard_english.png
+
+   key <TLDE> { [     grave, asciitilde,    dead_grave, dead_tilde ] };
+   key <AE01> { [         1,     exclam,    exclamdown, exclamdown ] };
+   key <AE02> { [         2,         at,       notsign,    notsign ] };
+   key <AE03> { [         3, numbersign,     0x1000300,  0x1000300 ] }; // combining grave
+   key <AE04> { [         4,     dollar,     0x1000301,  0x1000301 ] }; // combining acute
+   key <AE05> { [         5,    percent,     0x1000306,  0x1000306 ] }; // combining breve above
+   key <AE06> { [         6,asciicircum,     0x100030A,  0x100030A ] }; // combining ring above
+   key <AE07> { [         7,  ampersand,     0x1000302,  0x1000302 ] }; // combining circumflex above
+   key <AE08> { [         8,   asterisk,     0x100030C,  0x100030C ] }; // combining caron above
+   key <AE09> { [         9,  parenleft,     0x1000307,  0x1000307 ] }; // combining dot above
+   key <AE10> { [         0, parenright,     0x1000308,  0x1000308 ] }; // combining diaeresis above
+   key <AE11> { [     minus, underscore,     0x1000304,  0x1000304 ] }; // combining macron above
+   key <AE12> { [     equal,       plus,     0x1000303,  0x1000303 ] }; // combining tilde above
+
+   key <AD01> { [         q,          Q,  Greek_omega, Greek_OMEGA ] };
+   key <AD02> { [         w,          W,       oslash,      Oslash ] };
+   key <AD03> { [         e,          E,           oe,          OE ] };
+   key <AD04> { [         r,          R,    0x1000327,   0x1000327 ] }; // combining cedilla
+   key <AD05> { [         t,          T,    0x100032E,   0x100032E ] }; // combining breve below
+   key <AD06> { [         y,          Y,    0x1000325,   0x1000325 ] }; // combining ring below
+   key <AD07> { [         u,          U,    0x100032D,   0x100032D ] }; // combining circumflex below
+   key <AD08> { [         i,          I,    0x100032C,   0x100032C ] }; // combining caron below
+   key <AD09> { [         o,          O,    0x1000323,   0x1000323 ] }; // combining dot below
+   key <AD10> { [         p,          P,    0x1000324,   0x1000324 ] }; // combining diaeresis below
+   key <AD11> { [ bracketleft,  braceleft,  0x1000331,   0x1000331 ] }; // combining macron below
+   key <AD12> { [bracketright, braceright,  0x1000330,   0x1000330 ] }; // combining tilde below
+
+   key <AC01>  { [         a,          A,          ae,               AE ] };
+   key <AC02>  { [         s,          S,      ssharp,        0x1001E9C ] }; // uppercase S sharp
+   key <AC03>  { [         d,          D,         eth,              ETH ] };
+   key <AC04>  { [         f,          F,       thorn,            THORN ] };
+   key <AC06>  { [         h,          H,    sterling,         sterling ] };
+   key <AC07>  { [         j,          J,    EuroSign,         EuroSign ] };
+   key <AC10>  { [ semicolon,      colon,   masculine,      ordfeminine ] };
+   key <AC11>  { [ apostrophe,  quotedbl,    currency,         currency ] };
+   key <BKSL>  { [ backslash,        bar,      section,         section ] };
+
+   key <AB03>  { [         c,          C,    ccedilla,         Ccedilla ] };
+   key <AB06>  { [         n,          N,      ntilde,           Ntilde ] };
+   key <AB07>  { [         m,          M,          mu,               mu ] };
+   key <AB08>  { [     comma,     less,  guillemotleft,   guillemotleft ] };
+   key <AB09>  { [    period,  greater, guillemotright,  guillemotright ] };
+   key <AB10>  { [     slash,   question, questiondown,    questiondown ] };
+
+   key <I219>  { [  multiply,   division, ISO_Next_Group, ISO_Prev_Group ] };
+
+   include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc2" {
+   include "us(olpc)"
+   name[Group1]= "USA - Group toggle on multiply/divide key";
+   include "group(olpc)"
+};
+
+// Based on Cherokee Nation Official Layout
+// http://www.cherokee.org/extras/downloads/font/Keyboard.htm
+
+partial alphanumeric_keys modifier_keys
+xkb_symbols "chr" {
+
+    name[Group1]= "USA - Cherokee";
+    key.type[group1]="ALPHABETIC";
+
+    // Alphanumeric section
+    key <TLDE> { [      grave,      U13CA ] };
+    key <AE01> { [          1,      U13B1 ] };
+    key <AE02> { [          2,      U13C7 ] };
+    key <AE03> { [          3,      U13E7 ] };
+    key <AE04> { [      U13D9,      U13B0 ] };
+    key <AE05> { [      U13E6,      U13B9 ] };
+    key <AE06> { [      U13DC,      U13DD ] };
+    key <AE07> { [      U13CB,      U13E1 ] };
+    key <AE08> { [      U13D6,      U13BA ] };
+    key <AE09> { [      U13D2,  parenleft ] };
+    key <AE10> { [      U13C4, parenright ] };
+    key <AE11> { [      U13BF,      U13BC ] };
+    key <AE12> { [      U13F3,      U13BD ] };
+
+    key <AD01> { [      U13AA,      U13C6 ] };
+    key <AD02> { [      U13B3,      U13EB ] };
+    key <AD03> { [      U13A1,      U13E3 ] };
+    key <AD04> { [      U13DB,      U13CF ] };
+    key <AD05> { [      U13D4,      U13D8 ] };
+    key <AD06> { [      U13EF,      U13F2 ] };
+    key <AD07> { [      U13A4,      U13AD ] };
+    key <AD08> { [      U13A2,      U13F1 ] };
+    key <AD09> { [      U13A3,      U13EC ] };
+    key <AD10> { [      U13C1,      U13EA ] };
+    key <AD11> { [      U13D5,      U13D1 ] };
+    key <AD12> { [      U13B6,      U13E4 ] };
+    key <BKSL> { [      U13E9,      U13EE ] };
+
+    key <AC01> { [      U13A0,      U13CC ] };
+    key <AC02> { [      U13CD,      U13CE ] };
+    key <AC03> { [      U13D7,      U13D0 ] };
+    key <AC04> { [      U13A9,      U13C8 ] };
+    key <AC05> { [      U13A6,      U13E5 ] };
+    key <AC06> { [      U13AF,      U13B2 ] };
+    key <AC07> { [      U13DA,      U13AB ] };
+    key <AC08> { [      U13B8,      U13A7 ] };
+    key <AC09> { [      U13B5,      U13AE ] };
+    key <AC10> { [      U13E8,      U13E0 ] };
+    key <AC11> { [ apostrophe,   quotedbl ] };
+
+    key <AB01> { [      U13AC,      U13C3 ] };
+    key <AB02> { [      U13F4,      U13ED ] };
+    key <AB03> { [      U13D3,      U13DF ] };
+    key <AB04> { [      U13A5,      U13DE ] };
+    key <AB05> { [      U13A8,      U13F0 ] };
+    key <AB06> { [      U13BE,      U13BB ] };
+    key <AB07> { [      U13C5,      U13B7 ] };
+    key <AB08> { [      comma,      U13E2 ] };
+    key <AB09> { [     period,      U13B4 ] };
+    key <AB10> { [      U13C2,      U13C9 ] };
+
+    // End alphanumeric section
+};
diff --git a/xorg-server/xkbdata.src/symbols/uz b/xorg-server/xkbdata.src/symbols/uz
new file mode 100644
index 000000000..c651ff0d5
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/uz
@@ -0,0 +1,101 @@
+// $XKeyboardConfig$
+// 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 Byelorussian_shortu (U045e),
+// equal (key <AE12>) with Cyrillic_ka_descender (U049b)
+// Cyrillic_ha (key <AD11>) with Cyrillic_ghe_bar (U0493)
+// Cyrillic_hardsign (key <AD12>) with Cyrillic_ha_descender (U04b3)
+// 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'). 
+//
+// Feb 25, 2007. Mashrab Kuvatov <kmashrab@uni-bremen.de>
+//
+// Made cyrillic and latin variants. Default is cyrillic.
+// Cyrillic variant is standard compliant. The standard
+// was accepted by the official body of Uzbekistan. See
+// http://www.uznet.net/index.php?option=com_content&task=view&id=288&Itemid=58
+//
+// Latin variant is somewhat experimental, since there is no
+// official standard for it. It is a copy of "us" layout, where
+// apostrophe is replaced with U02BB.
+// 
+// $XFree86: xc/programs/xkbcomp/symbols/uz,v 1.2 2003/06/21 13:01:59 pascal Exp $
+
+partial default alphanumeric_keys 
+xkb_symbols "cyrillic" {
+
+    name[Group1]= "Uzbekistan";
+
+    key	<AE01> {	[		1,	    exclam 	]	};
+    key	<AE02> {	[		2,        quotedbl	]	};
+    key	<AE03> {	[		3,      numerosign	]	};
+    key	<AE04> {	[		4,       semicolon 	]	};
+    key	<AE05> {	[		5,	   percent 	]	};
+    key	<AE06> {	[		6,	     colon	]	};
+    key	<AE07> {	[		7,	  question	]	};
+    key	<AE08> {	[		8,	  asterisk	]	};
+    key	<AE09> {	[		9,	 parenleft	]	};
+    key	<AE10> {	[		0,	parenright	]	};
+    key	<BKSL> {	[	backslash,             bar	]	};
+    key	<AB10> {	[	   period,	     comma	]	};
+    key <LSGT> {        [           slash,             bar      ]       };
+
+key.type[group1]="ALPHABETIC";
+
+    key	<AE11> {	[Cyrillic_ghe_bar, Cyrillic_GHE_bar     ]	};
+    key	<AE12> {	[Cyrillic_ha_descender, Cyrillic_HA_descender ]	};
+    key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	]	};
+    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
+    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
+    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> {	[ Byelorussian_shortu, Byelorussian_SHORTU ]	};
+    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE      ]	};
+    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA      ]	};
+    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN ]	};
+    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
+    key	<AC02> {	[Cyrillic_ka_descender, Cyrillic_KA_descender ]	};
+    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
+};
+
+partial alphanumeric_keys
+xkb_symbols "latin" {
+    include "us"
+    name[Group1]= "Uzbekistan - Latin";
+    key <AC11>  { [0x010002BB, quotedbl] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/vn b/xorg-server/xkbdata.src/symbols/vn
new file mode 100644
index 000000000..37d81408a
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/vn
@@ -0,0 +1,39 @@
+// $XKeyboardConfig$
+
+// based on:
+// vn,  TCVN 5712:1993
+// Le Hong Boi <le.hong.boi@bigfoot.com>
+// August 1999
+// Further modified by Ashley Clark <aclark@debian.org>
+// July 2000 for X 4.0
+
+
+partial default alphanumeric_keys  
+xkb_symbols "basic" {
+
+    include "us"
+
+    name[Group1]= "Vietnam";
+
+    // Alphanumeric section
+    key <TLDE> { [ quoteleft, asciitilde  ]	};
+    key <AE01> { [	   abreve,	Abreve		] };
+    key <AE02> { [	   acircumflex,  Acircumflex	] };
+    key <AE03> { [	   ecircumflex,	Ecircumflex	] };
+    key <AE04> { [	   ocircumflex,	Ocircumflex	] };
+    key <AE05> { [	   dead_grave,	percent		] };
+    key <AE06> { [	   dead_hook,	asciicircum	] };
+    key <AE07> { [	   dead_tilde,	ampersand	] };
+    key <AE08> { [	   dead_acute,	asterisk	] };
+    key <AE09> { [	   dead_belowdot,parenleft	] };
+    key <AE10> { [	   dstroke,	Dstroke		] };
+    key <AE11> { [     minus, underscore  ]	};
+    key <AE12> { [     DongSign, plus ]	};
+
+    key <AD11> { [ uhorn,	Uhorn	] };
+    key <AD12> { [ ohorn,	Ohorn	] };
+
+    // End alphanumeric section
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.am
new file mode 100644
index 000000000..50be49bb4
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.am
@@ -0,0 +1,4 @@
+symbolsdir = $(xkb_base)/symbols/xfree68_vndr
+
+dist_symbols_DATA = \
+amiga ataritt
diff --git a/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in
new file mode 100644
index 000000000..57e8c8866
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in
@@ -0,0 +1,367 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = symbols/xfree68_vndr
+DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(symbolsdir)"
+dist_symbolsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_symbols_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+symbolsdir = $(xkb_base)/symbols/xfree68_vndr
+dist_symbols_DATA = \
+amiga ataritt
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/xfree68_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  symbols/xfree68_vndr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_symbolsDATA: $(dist_symbols_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_symbolsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  $(dist_symbolsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+
+uninstall-dist_symbolsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_symbols_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(symbolsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(symbolsdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(symbolsdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_symbolsDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_symbolsDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_symbolsDATA uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/symbols/xfree68_vndr/amiga b/xorg-server/xkbdata.src/symbols/xfree68_vndr/amiga
new file mode 100644
index 000000000..dcc143bb0
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/xfree68_vndr/ataritt b/xorg-server/xkbdata.src/symbols/xfree68_vndr/ataritt
new file mode 100644
index 000000000..c06431fb8
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/za b/xorg-server/xkbdata.src/symbols/za
new file mode 100644
index 000000000..0d53b1c1a
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/za
@@ -0,0 +1,44 @@
+// $XKeyboardConfig$
+//
+// based on the Latvian and GB keyboard maps
+
+partial default alphanumeric_keys modifier_keys
+xkb_symbols "basic" {
+
+    // Describes the differences between an en_US 
+    // keyboard and a South African layout with 
+    // dead keys. By Dwayne Bailey (dwayne@translate.org.za) 
+
+    include "latin"
+
+    name[Group1]="South Africa";
+
+    key <TLDE>  { [     grave,  asciitilde,  dead_grave ] };
+    key <AE02>	{ [         2,         at,      yen ]	};
+    key <AE03>	{ [         3,  numbersign,     sterling ]	};
+    key <AE04>	{ [         4,     dollar,        dollar ]	};
+    key <AE05>	{ [         5,     percent,     EuroSign ]	};
+    key <AE06>  { [         6, asciicircum, dead_circumflex ] };
+
+    key <AD03>	{ [         e,          E,  ediaeresis,  Ediaeresis ]	};
+    key <AD04>	{ [         r,          R,  ecircumflex,  Ecircumflex ]	};
+    key <AD05>	{ [         t,          T,  U1e71,  U1e70 ]	};
+    key <AD06>	{ [         y,          Y,  ucircumflex,  Ucircumflex ]	};
+    key <AD07>	{ [         u,          U,  udiaeresis,  Udiaeresis ]	};
+    key <AD08>	{ [         i,          I,   idiaeresis,   Idiaeresis ]	};
+    key <AD09>	{ [         o,          O,  odiaeresis,  Odiaeresis ]	};
+    key <AD10>	{ [         p,          P,  ocircumflex,  Ocircumflex ]	};
+
+    key <AC01>	{ [         a,          A,  adiaeresis, Adiaeresis ]	};
+    key <AC02>	{ [         s,          S,       scaron,       Scaron ]	};
+    key <AC03>	{ [         d,          D,  U1e13,  U1e12 ]	};
+    key <AC09>	{ [         l,          L,  U1e3d,  U1e3c ]	};
+    key <AC10>  { [ semicolon,      colon,  dead_diaeresis ] };
+    key <AC11>  { [apostrophe,   quotedbl,  dead_acute ] };
+
+    key <AB06>	{ [         n,          N,  U1e4b,  U1e4a ]	};
+    key <AB07>	{ [         m,          M,  U1e45,  U1e44 ]	};
+    key <AB09>  { [    period,    greater, dead_abovedot ] };
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkbdata.src/types/Makefile.am b/xorg-server/xkbdata.src/types/Makefile.am
new file mode 100644
index 000000000..43bd2c6b6
--- /dev/null
+++ b/xorg-server/xkbdata.src/types/Makefile.am
@@ -0,0 +1,11 @@
+typesdir = $(xkb_base)/types
+
+dist_types_DATA = \
+basic cancel caps \
+complete default extra \
+iso9995 level5 mousekeys numpad \
+pc README
+
+dir_data = $(dist_types_DATA)
+
+include $(top_srcdir)/xkbrules.am
diff --git a/xorg-server/xkbdata.src/types/Makefile.in b/xorg-server/xkbdata.src/types/Makefile.in
new file mode 100644
index 000000000..1f2c42fdf
--- /dev/null
+++ b/xorg-server/xkbdata.src/types/Makefile.in
@@ -0,0 +1,405 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Common rules for building *.dir files in all xkb subdirectories
+# Replaces Imake's MakeXkbDir() rule
+# svu: taken from xkbdata
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+DIST_COMMON = README $(dist_dir_DATA) $(dist_types_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/xkbrules.am
+subdir = types
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(typesdir)"
+dist_dirDATA_INSTALL = $(INSTALL_DATA)
+dist_typesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_dir_DATA) $(dist_types_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+typesdir = $(xkb_base)/types
+dist_types_DATA = \
+basic cancel caps \
+complete default extra \
+iso9995 level5 mousekeys numpad \
+pc README
+
+dir_data = $(dist_types_DATA)
+dist_dir_DATA = $(subdir).dir
+dirdir = $(xkb_base)
+CLEANFILES = $(subdir).dir
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xkbrules.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  types/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  types/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+install-dist_dirDATA: $(dist_dir_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)"
+	@list='$(dist_dir_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_dirDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dirdir)/$$f'"; \
+	  $(dist_dirDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dirdir)/$$f"; \
+	done
+
+uninstall-dist_dirDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_dir_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(dirdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(dirdir)/$$f"; \
+	done
+install-dist_typesDATA: $(dist_types_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(typesdir)" || $(mkdir_p) "$(DESTDIR)$(typesdir)"
+	@list='$(dist_types_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_typesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(typesdir)/$$f'"; \
+	  $(dist_typesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(typesdir)/$$f"; \
+	done
+
+uninstall-dist_typesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_types_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(typesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(typesdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/..
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(typesdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_dirDATA install-dist_typesDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_dirDATA uninstall-dist_typesDATA \
+	uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_dirDATA install-dist_typesDATA install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_dirDATA uninstall-dist_typesDATA \
+	uninstall-info-am
+
+
+$(subdir).dir: $(dir_data)
+	-rm -f $@
+	here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*'
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/types/README b/xorg-server/xkbdata.src/types/README
new file mode 100644
index 000000000..1a1e2c01e
--- /dev/null
+++ b/xorg-server/xkbdata.src/types/README
@@ -0,0 +1,4 @@
+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.
diff --git a/xorg-server/xkbdata.src/types/basic b/xorg-server/xkbdata.src/types/basic
new file mode 100644
index 000000000..cf1ee648b
--- /dev/null
+++ b/xorg-server/xkbdata.src/types/basic
@@ -0,0 +1,31 @@
+// $Xorg: basic,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
+
+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";
+    };
+
+};
diff --git a/xorg-server/xkbdata.src/types/cancel b/xorg-server/xkbdata.src/types/cancel
new file mode 100644
index 000000000..478c99c4b
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/types/caps b/xorg-server/xkbdata.src/types/caps
new file mode 100644
index 000000000..7936df12f
--- /dev/null
+++ b/xorg-server/xkbdata.src/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 "pauses" 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 "pauses" 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/xorg-server/xkbdata.src/types/complete b/xorg-server/xkbdata.src/types/complete
new file mode 100644
index 000000000..96d4fd572
--- /dev/null
+++ b/xorg-server/xkbdata.src/types/complete
@@ -0,0 +1,17 @@
+// $XKeyboardConfig$
+// $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 "level5"
+    include "extra"
+    include "numpad"
+};
diff --git a/xorg-server/xkbdata.src/types/default b/xorg-server/xkbdata.src/types/default
new file mode 100644
index 000000000..18859b742
--- /dev/null
+++ b/xorg-server/xkbdata.src/types/default
@@ -0,0 +1,12 @@
+// $XKeyboardConfig$
+// $Xorg: default,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
+
+default xkb_types "default" {
+    include "basic"
+    include "pc"
+    include "iso9995"
+    include "extra"
+    include "numpad"
+    include "level5"
+    include "mousekeys"
+};
diff --git a/xorg-server/xkbdata.src/types/extra b/xorg-server/xkbdata.src/types/extra
new file mode 100644
index 000000000..a82fd10d2
--- /dev/null
+++ b/xorg-server/xkbdata.src/types/extra
@@ -0,0 +1,185 @@
+// $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[Lock+Shift+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";
+    };
+
+    // Another four level keypad variant
+    // First two levels are controled by NumLock (with active Shift-ing like
+    // in KEYPAD). LevelThree overrides this mode, with two additional
+    // Shift-ed levels
+    // NumLock state is intentionnaly ignored when LevelThree is active
+    type "FOUR_LEVEL_MIXED_KEYPAD" {
+        modifiers = Shift+NumLock+LevelThree;
+        map[None] = Level1;
+        map[Shift+NumLock] = Level1;
+        map[NumLock] = Level2;
+        map[Shift] = Level2;
+        map[LevelThree] = Level3;
+	map[NumLock+LevelThree] = Level3;
+        map[Shift+LevelThree] = Level4;
+	map[Shift+NumLock+LevelThree] = Level4;
+        level_name[Level1] = "Base";
+        level_name[Level2] = "Number";
+        level_name[Level3] = "Alt Base";
+        level_name[Level4] = "Shift Alt";
+    };
+
+    // Base level, two Shift-ed LevelThree levels, one Ctrl+Alt command level
+    type "FOUR_LEVEL_X" {
+        modifiers = Shift+LevelThree+Control+Alt;
+        map[None] = Level1;
+        map[LevelThree] = Level2;
+	map[Shift+LevelThree] = Level3;
+	map[Control+Alt] = Level4;
+        level_name[Level1] = "Base";
+        level_name[Level2] = "Alt Base";
+        level_name[Level3] = "Shift Alt";
+	level_name[Level4] = "Ctrl+Alt";
+    };
+
+// 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)
+
+    type "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC" {
+        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";
+    };
+
+// type for e.g. german ssharp which is capitalized SS.
+// CHARACTERISTICS:
+// It is FOUR_LEVEL with the exception that the fifth level
+// is mapped to the Lock modifier.
+// If other modifiers are used, the Lock state is ignored.
+// DETAILS ABOUT GERMAN:
+// The capital form of ssharp (called sharp s) only exists for
+// completely capitalized Text, not at the beginning of sentences
+// or nouns (nouns have a captial letter at the beginning in german).
+// The ssharp key, to the right of the zero key, takes this into
+// account and has a questionmark mapped on shift-ssharp since
+// normally no capital version is needed.
+// When typing with active capsLock, this key type is needed to
+// output two capital letters S because this is the only german key
+// whose capital letter is not the same as the one typed with shift.
+
+    type "FOUR_LEVEL_PLUS_LOCK" {
+        modifiers = Shift+Lock+LevelThree;
+        map[None] = Level1;
+        map[Shift] = Level2;
+        map[LevelThree] = Level3;
+        map[Shift+LevelThree] = Level4;
+        map[Lock]  = Level5;
+        map[Lock+Shift] = Level2;
+        map[Lock+LevelThree] = Level3;
+        map[Lock+Shift+LevelThree] = Level4;
+        level_name[Level1] = "Base";
+        level_name[Level2] = "Shift";
+        level_name[Level3] = "Alt Base";
+        level_name[Level4] = "Shift Alt";
+        level_name[Level5] = "Lock";
+    };
+};
+
+// This enables the four level shifting also for the keypad.
+partial xkb_types "keypad" {
+    virtual_modifiers LevelThree;
+
+    type "FOUR_LEVEL_KEYPAD" {
+	modifiers = Shift+NumLock+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[NumLock] = Level2;
+	map[Shift+NumLock] = Level1;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[NumLock+LevelThree] = Level4;
+	map[Shift+NumLock+LevelThree] = Level3;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Number";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Alt Number";
+    };       
+};
+
+// This enables the four level shifting also for the keypad,
+// but levels 1 and 2, and 3 and 4 are swapped on Mac keypads.
+partial xkb_types "mac_keypad" {
+    virtual_modifiers LevelThree;
+
+    type "FOUR_LEVEL_KEYPAD" {
+	modifiers = Shift+NumLock+LevelThree;
+	map[None] = Level2;
+	map[Shift] = Level1;
+	map[NumLock] = Level1;
+	map[Shift+NumLock] = Level2;
+	map[LevelThree] = Level4;
+	map[Shift+LevelThree] = Level3;
+	map[NumLock+LevelThree] = Level3;
+	map[Shift+NumLock+LevelThree] = Level4;
+	level_name[Level2] = "Base";
+	level_name[Level1] = "Number";
+	level_name[Level4] = "Alt Base";
+	level_name[Level3] = "Alt Number";
+    };       
+};
diff --git a/xorg-server/xkbdata.src/types/iso9995 b/xorg-server/xkbdata.src/types/iso9995
new file mode 100644
index 000000000..80f3ee5cf
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/types/level5 b/xorg-server/xkbdata.src/types/level5
new file mode 100644
index 000000000..c8d6f3d9f
--- /dev/null
+++ b/xorg-server/xkbdata.src/types/level5
@@ -0,0 +1,95 @@
+// $XKeyboardConfig$
+// $XFree86: xc/programs/xkbcomp/types/extra,v 1.3 2002/11/26 02:14:02 dawes Exp $
+
+partial default xkb_types "default" {
+    // Definition for a key type used for the czech keymap, for instance.
+    // Defines style a with four level shift. It is similar to three_level
+    // type used for iso9995 but it lets the shift key behave "normally".
+
+    virtual_modifiers LevelThree,ScrollLock,LevelFive;
+
+    type "EIGHT_LEVEL" {
+        modifiers = Shift+LevelThree+LevelFive;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[LevelFive] = Level5;
+	map[Shift+LevelFive] = Level6;
+	map[LevelThree+LevelFive] = Level7;
+	map[Shift+LevelThree+LevelFive] = Level8;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";  
+	level_name[Level4] = "Shift Alt";  
+	level_name[Level5] = "X";
+	level_name[Level6] = "X Shift";
+	level_name[Level7] = "X Alt Base";
+	level_name[Level8] = "X Shift Alt";
+    };
+
+    type "EIGHT_LEVEL_ALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree+LevelFive;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[Lock]  = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level4;
+        map[Lock+Shift+LevelThree] = Level3;
+
+	map[LevelFive] = Level5;
+	map[Shift+LevelFive] = Level6;
+	map[Lock+LevelFive]  = Level6;
+	map[LevelThree+LevelFive] = Level7;
+	map[Shift+LevelThree+LevelFive] = Level8;
+	map[Lock+LevelThree+LevelFive] =  Level8;
+        map[Lock+Shift+LevelThree+LevelFive] = Level7;
+
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+	level_name[Level5] = "X";
+	level_name[Level6] = "X Shift";
+	level_name[Level7] = "X Alt Base";
+	level_name[Level8] = "X Shift Alt";
+    };
+
+    type "EIGHT_LEVEL_SEMIALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree+LevelFive;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[Lock]  = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level3;
+        map[Lock+Shift+LevelThree] = Level4;
+
+	map[LevelFive] = Level5;
+	map[Shift+LevelFive] = Level6;
+	map[Lock+LevelFive]  = Level6;
+	map[LevelThree+LevelFive] = Level7;
+	map[Shift+LevelThree+LevelFive] = Level8;
+	map[Lock+LevelThree+LevelFive] =  Level7;
+        map[Lock+Shift+LevelThree+LevelFive] = Level8;
+
+	preserve[Lock+LevelThree] = Lock;
+	preserve[Lock+Shift+LevelThree] = Lock;
+	preserve[Lock+LevelFive] = Lock;
+	preserve[Lock+Shift+LevelFive] = Lock;
+	preserve[Lock+LevelThree+LevelFive] = Lock;
+	preserve[Lock+Shift+LevelThree+LevelFive] = Lock;
+
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+	level_name[Level5] = "X";
+	level_name[Level6] = "X Shift";
+	level_name[Level7] = "X Alt Base";
+	level_name[Level8] = "X Shift Alt";
+    };
+
+};
+
diff --git a/xorg-server/xkbdata.src/types/mousekeys b/xorg-server/xkbdata.src/types/mousekeys
new file mode 100644
index 000000000..85440ca7f
--- /dev/null
+++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/types/numpad b/xorg-server/xkbdata.src/types/numpad
new file mode 100644
index 000000000..335e20bb1
--- /dev/null
+++ b/xorg-server/xkbdata.src/types/numpad
@@ -0,0 +1,40 @@
+
+partial default xkb_types "pc" {
+    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";
+    };
+    include "extra(keypad)"
+};
+
+// On Mac keypads, level 1 and 2 are swapped
+partial xkb_types "mac" {
+    type "KEYPAD" {
+	modifiers = Shift+NumLock;
+	map[None] = Level2;
+	map[Shift] = Level1;
+	map[NumLock] = Level1;
+	map[Shift+NumLock] = Level2;
+	level_name[Level2] = "Base";
+	level_name[Level1] = "Number";
+    };
+    include "extra(mac_keypad)"
+};
+
+partial 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";
+    };
+    include "extra(keypad)"
+};
+
diff --git a/xorg-server/xkbdata.src/types/pc b/xorg-server/xkbdata.src/types/pc
new file mode 100644
index 000000000..3c1986aa3
--- /dev/null
+++ b/xorg-server/xkbdata.src/types/pc
@@ -0,0 +1,111 @@
+// $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;
+    virtual_modifiers LevelThree;
+    virtual_modifiers LAlt;
+    virtual_modifiers RAlt;
+    virtual_modifiers RControl;
+    virtual_modifiers LControl;
+
+    type "PC_CONTROL_LEVEL2" {
+	modifiers = Control;
+	map[None] = Level1;
+	map[Control] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Control";
+    };
+
+    type "PC_LCONTROL_LEVEL2" {
+	modifiers = LControl;
+	map[None] = Level1;
+	map[LControl] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "LControl";
+    };
+
+    type "PC_RCONTROL_LEVEL2" {
+	modifiers = RControl;
+	map[None] = Level1;
+	map[RControl] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "RControl";
+    };
+
+    type "PC_ALT_LEVEL2" {
+	modifiers = Alt;
+	map[None] = Level1;
+	map[Alt] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Alt";
+    };
+
+    type "PC_LALT_LEVEL2" {
+	modifiers = LAlt;
+	map[None] = Level1;
+	map[LAlt] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "LAlt";
+    };
+
+    type "PC_RALT_LEVEL2" {
+	modifiers = RAlt;
+	map[None] = Level1;
+	map[RAlt] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "RAlt";
+    };
+
+    type "CTRL+ALT" {
+	modifiers = Control+Alt;
+	map[Control+Alt] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Ctrl+Alt";
+    };
+
+   // Local eight level
+   // Needed when you want part of your layout eight-level but can not use
+   // LevelFive as modifier, as this will take over right ctrl by default
+   // for all the layout and is too invasive for your average four-level user
+   // Needed to fix bug #9529
+   // FIXME Should really use RControl but it's seems not to be enabled by
+   // default and touching this requires a lot of testing
+   type "LOCAL_EIGHT_LEVEL" {
+	modifiers = Shift+Lock+LevelThree+Control;
+
+	map[None]       = Level1;
+	map[Lock+Shift] = Level1;
+	map[Shift] = Level2;
+	map[Lock]  = Level2;
+
+	map[LevelThree]            = Level3;
+	map[Lock+Shift+LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree]  = Level4;
+
+	map[Control]            = Level5;
+	map[Lock+Shift+Control] = Level5;
+	map[Shift+Control] = Level6;
+	map[Lock+Control]  = Level6;
+
+	map[LevelThree+Control]            = Level7;
+	map[Lock+Shift+LevelThree+Control] = Level7;
+	map[Shift+LevelThree+Control] = Level8;
+	map[Lock+LevelThree+Control]  = Level8;
+
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Level3";
+	level_name[Level4] = "Shift Level3";
+	level_name[Level5] = "Ctrl";
+	level_name[Level6] = "Shift Ctrl";
+	level_name[Level7] = "Level3 Ctrl";
+	level_name[Level8] = "Shift Level3 Ctrl";
+    };
+
+};
diff --git a/xorg-server/xkbdata.src/types/types.dir b/xorg-server/xkbdata.src/types/types.dir
new file mode 100644
index 000000000..a9fec034f
--- /dev/null
+++ b/xorg-server/xkbdata.src/types/types.dir
@@ -0,0 +1,18 @@
+-dp----- -------- mousekeys(default)
+--p----- -------- caps(internal)
+--p----- -------- caps(internal_nocancel)
+--p----- -------- caps(shift)
+--p----- -------- caps(shift_nocancel)
+-d------ -------- default(default)
+-d------ -------- complete(complete)
+-dp----- -------- iso9995(default)
+-d------ -------- basic(basic)
+-dp----- -------- level5(default)
+-dp----- -------- pc(default)
+-dp----- -------- extra(default)
+--p----- -------- extra(keypad)
+--p----- -------- extra(mac_keypad)
+-dp----- -------- cancel(Shift_Cancels_Caps)
+-dp----- -------- numpad(pc)
+--p----- -------- numpad(mac)
+--p----- -------- numpad(microsoft)
diff --git a/xorg-server/xkbdata.src/xkbrules.am b/xorg-server/xkbdata.src/xkbrules.am
new file mode 100644
index 000000000..6fde169f9
--- /dev/null
+++ b/xorg-server/xkbdata.src/xkbrules.am
@@ -0,0 +1,14 @@
+# Common rules for building *.dir files in all xkb subdirectories
+# Replaces Imake's MakeXkbDir() rule
+# svu: taken from xkbdata
+
+dist_dir_DATA = $(subdir).dir
+
+dirdir = $(xkb_base)
+
+$(subdir).dir: $(dir_data)
+	-rm -f $@
+	here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*'
+
+CLEANFILES = $(subdir).dir
+
diff --git a/xorg-server/xkbdata.src/xkeyboard-config.spec b/xorg-server/xkbdata.src/xkeyboard-config.spec
new file mode 100644
index 000000000..96c0b5afe
--- /dev/null
+++ b/xorg-server/xkbdata.src/xkeyboard-config.spec
@@ -0,0 +1,45 @@
+Name:		xkeyboard-config
+Summary:	XML-based XKB configuration registry
+Version:	1.4
+Release:	1
+License:	X11/MIT
+Group:		User Interface/X
+
+Url: http://gswitchit.sourceforge.net/
+
+Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.gz
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildArch:      noarch
+
+%description
+Just XML stuff. Later hopefully will be part of XFree86
+
+%prep
+%setup -q
+
+%build
+
+if [ ! -f configure ]; then
+    CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh
+fi
+
+CFLAGS="$RPM_OPT_FLAGS" ./configure 
+
+make 
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make prefix=$RPM_BUILD_ROOT%{_prefix} install 
+rm -rf $RPM_BUILD_ROOT%{_prefix}/share/locale
+
+%clean
+rm -rf %{buildroot}
+rm -rf $RPM_BUILD_DIR/%{name}-%{version}
+
+%files
+%defattr(-, root, root)
+
+%doc AUTHORS CREDITS ChangeLog NEWS README COPYING docs/README.config docs/README.enhancing docs/README.symbols docs/HOWTO.transition docs/HOWTO.testing
+%{_prefix}/lib/X11/xkb/*
diff --git a/xorg-server/xkbdata.src/xkeyboard-config.spec.in b/xorg-server/xkbdata.src/xkeyboard-config.spec.in
new file mode 100644
index 000000000..0b2082af7
--- /dev/null
+++ b/xorg-server/xkbdata.src/xkeyboard-config.spec.in
@@ -0,0 +1,45 @@
+Name:		xkeyboard-config
+Summary:	XML-based XKB configuration registry
+Version:	@VERSION@
+Release:	1
+License:	X11/MIT
+Group:		User Interface/X
+
+Url: http://gswitchit.sourceforge.net/
+
+Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.gz
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildArch:      noarch
+
+%description
+Just XML stuff. Later hopefully will be part of XFree86
+
+%prep
+%setup -q
+
+%build
+
+if [ ! -f configure ]; then
+    CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh
+fi
+
+CFLAGS="$RPM_OPT_FLAGS" ./configure 
+
+make 
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make prefix=$RPM_BUILD_ROOT%{_prefix} install 
+rm -rf $RPM_BUILD_ROOT%{_prefix}/share/locale
+
+%clean
+rm -rf %{buildroot}
+rm -rf $RPM_BUILD_DIR/%{name}-%{version}
+
+%files
+%defattr(-, root, root)
+
+%doc AUTHORS CREDITS ChangeLog NEWS README COPYING docs/README.config docs/README.enhancing docs/README.symbols docs/HOWTO.transition docs/HOWTO.testing
+%{_prefix}/lib/X11/xkb/*