Updated to xkeyboard-config-1.8

125 files changed, 10026 insertions, 8956 deletions

diff --git a/packages.txt b/packages.txt
index dbfb87eaa..0ff907904 100644
--- a/packages.txt
+++ b/packages.txt
@@ -78,7 +78,7 @@ xcmiscproto-1.2.0
 xextproto-7.1.1

 xineramaproto-1.2

 xkbcomp-1.1.1

-xkeyboard-config-1.7

+xkeyboard-config-1.8

 xorg-server-1.7.99.2

 xproto-7.0.16

 xtrans-1.2.5

diff --git a/xorg-server/xkbdata.src/COPYING b/xorg-server/xkbdata.src/COPYING
index e63aa3d31..4efb62906 100644
--- a/xorg-server/xkbdata.src/COPYING
+++ b/xorg-server/xkbdata.src/COPYING
@@ -78,29 +78,23 @@ from The Open Group.
 Copyright 2004-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.
+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 (including the next
+paragraph) 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.
 
 
 Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
diff --git a/xorg-server/xkbdata.src/ChangeLog b/xorg-server/xkbdata.src/ChangeLog
index 5fe30413e..40e24271b 100644
--- a/xorg-server/xkbdata.src/ChangeLog
+++ b/xorg-server/xkbdata.src/ChangeLog
@@ -1,3 +1,65 @@
+2009-12-21 Sergey Udaltsov
+
+	* symbols/ru: Added ru(typewriter-legacy),
+	https://bugs.freedesktop.org/show_bug.cgi?id=25726
+	* rules/base.o_s.part, rules/base.xml.in, symbols/group: added
+	grp(lctrl_rctrl_switch),
+	https://bugs.freedesktop.org/show_bug.cgi?id=25727
+
+2009-11-27 Sergey Udaltsov
+
+	* symbols/se: Reintroduced the broken bar in the Swedish symbol
+	layout. http://bugs.freedesktop.org/show_bug.cgi?id=8491
+
+2009-11-25 Sergey Udaltsov
+
+	* rules/base.m_s.part, symbols/inet: a bit of optimization, K6C to map
+	to Eject, always in media section
+
+2009-11-24 Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/lt: removed unneeded lt(balticplus),
+	http://bugs.freedesktop.org/show_bug.cgi?id=25263
+
+2009-11-21 Sergey Udaltsov
+
+	* ../rules/base.xml.in, ../symbols/pl: added pl(dvp),
+	http://bugs.freedesktop.org/show_bug.cgi?id=25200
+
+2009-11-18 Sergey Udaltsov
+
+	* symbols/tm: small fix for tm layout, related to Ctrl+? shortcuts
+	https://bugs.freedesktop.org/show_bug.cgi?id=25074
+
+2009-11-15 Octavio Alvarez
+
+	* rules/base.xml.in: Removed thinkpadintl from base.xml.in.
+
+2009-10-20 Sergey Udaltsov
+
+	* symbols/sun_vndr/us: added backspace mapping,
+	https://bugs.freedesktop.org/show_bug.cgi?id=24554
+
+2009-10-13 Sergey Udaltsov
+
+	* rules/base.lists.part, symbols/macintosh_vndr/Makefile.am,
+	symbols/macintosh_vndr/es: Spanish mac layout just included the
+	general one
+	* rules/base.xml.in, symbols/ch: fixed Swiss default layout, added
+	legacy variant, http://bugs.freedesktop.org/show_bug.cgi?id=24490
+
+2009-10-12 Sergey Udaltsov
+
+	* rules/base.xml.in: USA Russian Phonetic keyboard layout not found in
+	search by Languages - Russian,
+	http://bugs.freedesktop.org/show_bug.cgi?id=24485
+
+2009-09-30 Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/group: added
+	grp:rctrl_rshift_toggle option,
+	http://bugs.freedesktop.org/show_bug.cgi?id=24234
+
 2009-09-29 Sergey Udaltsov
 
 	* configure.in, NEWS, po/*.po: preparing 1.7
diff --git a/xorg-server/xkbdata.src/Makefile.in b/xorg-server/xkbdata.src/Makefile.in
index 155003418..f6edc8f9e 100644
--- a/xorg-server/xkbdata.src/Makefile.in
+++ b/xorg-server/xkbdata.src/Makefile.in
@@ -122,6 +122,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
diff --git a/xorg-server/xkbdata.src/NEWS b/xorg-server/xkbdata.src/NEWS
index f01db566b..3655f9041 100644
--- a/xorg-server/xkbdata.src/NEWS
+++ b/xorg-server/xkbdata.src/NEWS
@@ -1,3 +1,4 @@
+1.8	Bugfixes (10). Updated/new translations. Some new layouts and models. 
 1.7	Bugfixes (30). Updated/new translations. Some new layouts and models. 
 1.6	Bugfixes (36). Updated/new translations. Some new layouts and models. 
 	Added terminate:* group
diff --git a/xorg-server/xkbdata.src/README b/xorg-server/xkbdata.src/README
index c95d3fd83..d91eda6e6 100644
--- a/xorg-server/xkbdata.src/README
+++ b/xorg-server/xkbdata.src/README
@@ -23,3 +23,6 @@ file.
 
 For information how to replace existing XKB configuration database with 
 XKeyboardConfig see 'docs/HOWTO.transition' file.
+
+Contribution guidelines are described at
+http://www.freedesktop.org/wiki/Software/XKeyboardConfig/Rules
diff --git a/xorg-server/xkbdata.src/aclocal.m4 b/xorg-server/xkbdata.src/aclocal.m4
index 51ad140c6..ddf4d3936 100644
--- a/xorg-server/xkbdata.src/aclocal.m4
+++ b/xorg-server/xkbdata.src/aclocal.m4
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
+[m4_warning([this file was generated for autoconf 2.64.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/xorg-server/xkbdata.src/compat/Makefile.in b/xorg-server/xkbdata.src/compat/Makefile.in
index d037ba232..e58f93c79 100644
--- a/xorg-server/xkbdata.src/compat/Makefile.in
+++ b/xorg-server/xkbdata.src/compat/Makefile.in
@@ -112,6 +112,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -195,9 +196,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  compat/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  compat/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  compat/Makefile
+	  $(AUTOMAKE) --foreign  compat/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/compat/compat.dir b/xorg-server/xkbdata.src/compat/compat.dir
index c99d7fbaf..04a9667d9 100644
--- a/xorg-server/xkbdata.src/compat/compat.dir
+++ b/xorg-server/xkbdata.src/compat/compat.dir
@@ -1,29 +1,29 @@
--d------ -------- pc98(basic)
--d------ -------- xtest(xtest)
 -dp----- -------- misc(misc)
+-dp----- -------- lednum(num_lock)
+--p----- -------- lednum(group_lock)
+--p----- -------- lednum(shift_lock)
+-dp----- -------- pc(pc)
 -dp----- -------- mousekeys(mousekeys)
--dp----- -------- norepeat(norepeat)
--dp----- -------- ledcaps(caps_lock)
---p----- -------- ledcaps(group_lock)
---p----- -------- ledcaps(shift_lock)
+-d------ -------- xtest(xtest)
+-d------ -------- pc98(basic)
 -dp----- -------- japan(japan)
 --p----- -------- japan(kana_lock)
--d------ -------- default(default)
--d------ -------- complete(complete)
--dp----- -------- iso9995(default)
+-dp----- -------- norepeat(norepeat)
 h-p----- -------- keypad(overlay)
 h-p----- -------- keypad(overlay1)
 h-p----- -------- keypad(overlay2)
--d------ -------- basic(basic)
+-d------ -------- default(default)
+-dp----- -------- xfree86(basic)
+-dp----- -------- iso9995(default)
+-d------ -------- complete(complete)
+-d------ -------- olpc(olpc)
 -dp----- -------- level5(default)
--dp----- -------- lednum(num_lock)
---p----- -------- lednum(group_lock)
---p----- -------- lednum(shift_lock)
+-dp----- -------- ledcaps(caps_lock)
+--p----- -------- ledcaps(group_lock)
+--p----- -------- ledcaps(shift_lock)
+-d------ -------- basic(basic)
 -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/configure b/xorg-server/xkbdata.src/configure
index adf3161e4..57d27e722 100644
--- a/xorg-server/xkbdata.src/configure
+++ b/xorg-server/xkbdata.src/configure
@@ -1,18 +1,20 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for xkeyboard-config 1.7.
+# Generated by GNU Autoconf 2.64 for xkeyboard-config 1.8.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.  ##
-## --------------------- ##
+## -------------------- ##
+## 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
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -20,23 +22,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  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
-
 as_nl='
 '
 export as_nl
@@ -44,7 +38,13 @@ export as_nl
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -55,7 +55,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -78,13 +78,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 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
@@ -94,15 +87,15 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+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
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -114,12 +107,16 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); 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
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -131,330 +128,299 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
-# 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 ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 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
-}
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_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
-  :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_have_required=no
 fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-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
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
 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
+  as_found=:
+  case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
 	   done;;
        esac
+  as_found=false
 done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
 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=:
-  # Pre-4.2 versions of Zsh do 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=:
-  # Pre-4.2 versions of Zsh do 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
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	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; }
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
 fi
-
-
 fi
-
 fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
 
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
 
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
 
-(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
-}
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
 
-exitcode=0
-if as_func_success; then
-  :
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_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 ||
+$as_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" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
 else
-  exitcode=1
-  echo as_func_success failed.
-fi
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
 
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
 
-if as_func_ret_success; then
-  :
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
 else
-  exitcode=1
-  echo as_func_ret_success failed.
+  as_expr=false
 fi
 
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
 fi
 
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_dirname=false
 fi
 
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf@gnu.org about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
-}
-
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# 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
 
-  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.  :-)
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -471,8 +437,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_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
@@ -482,29 +447,18 @@ test \$exitcode = 0") || {
   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
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   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
@@ -534,7 +488,7 @@ 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=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -553,10 +507,10 @@ else
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -570,7 +524,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-
 exec 7<&0 </dev/null 6>&1
 
 # Name of the host.
@@ -589,14 +542,14 @@ 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.7'
-PACKAGE_STRING='xkeyboard-config 1.7'
+PACKAGE_VERSION='1.8'
+PACKAGE_STRING='xkeyboard-config 1.8'
 PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
 
 ac_unique_file="rules/base.xml.in"
 # Factoring default headers for most tests.
@@ -763,6 +716,7 @@ bindir
 program_transform_name
 prefix
 exec_prefix
+PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
@@ -898,8 +852,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -925,8 +878,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1130,8 +1082,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1147,8 +1098,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1178,17 +1128,17 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
     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 &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+    esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
@@ -1205,15 +1155,13 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1236,8 +1184,7 @@ do
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1267,11 +1214,9 @@ 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 .` ||
-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1310,13 +1255,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1342,7 +1285,7 @@ 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.7 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 1.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1409,7 +1352,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xkeyboard-config 1.7:";;
+     short | recursive ) echo "Configuration of xkeyboard-config 1.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1444,6 +1387,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
+Report bugs to the package provider.
 _ACEOF
 ac_status=$?
 fi
@@ -1506,22 +1450,373 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xkeyboard-config configure 1.7
-generated by GNU Autoconf 2.63
+xkeyboard-config configure 1.8
+generated by GNU Autoconf 2.64
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 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
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); 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 $2
+
+/* 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 $2 ();
+/* 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_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
 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.7, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+It was created by xkeyboard-config $as_me 1.8, which was
+generated by GNU Autoconf 2.64.  Invocation command line was
 
   $ $0 $@
 
@@ -1557,8 +1852,8 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  $as_echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
 IFS=$as_save_IFS
 
 } >&5
@@ -1595,9 +1890,9 @@ do
       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -1613,13 +1908,13 @@ do
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      as_fn_append 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; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -1644,13 +1939,13 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -1722,39 +2017,41 @@ _ASBOX
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_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
 
+$as_echo "/* confdefs.h */" > 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
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
@@ -1773,7 +2070,7 @@ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
@@ -1784,7 +2081,7 @@ 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
-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -1792,7 +2089,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1807,11 +2104,11 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
@@ -1821,17 +2118,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
 $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
@@ -1843,43 +2140,20 @@ $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -1893,24 +2167,16 @@ am__api_version='1.10'
 
 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
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1936,10 +2202,10 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
+if test "${ac_cv_path_install+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -1947,11 +2213,11 @@ 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/* | \
+    # 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\\/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -1988,7 +2254,7 @@ case $as_dir/ in
     ;;
 esac
 
-done
+  done
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
@@ -2004,7 +2270,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
 $as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2015,7 +2281,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
@@ -2039,11 +2305,8 @@ if (
       # 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".
-      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-$as_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; }; }
+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
    fi
 
    test "$2" = conftest.file
@@ -2052,13 +2315,10 @@ then
    # Ok.
    :
 else
-   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
 fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
@@ -2079,14 +2339,14 @@ if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
+  if test "${ac_cv_path_mkdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2094,7 +2354,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
+    for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
 	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
@@ -2106,7 +2366,7 @@ do
 	   esac
 	 done
        done
-done
+  done
 IFS=$as_save_IFS
 
 fi
@@ -2122,7 +2382,7 @@ fi
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
@@ -2135,9 +2395,9 @@ 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
+if test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2148,24 +2408,24 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2173,11 +2433,11 @@ fi
   test -n "$AWK" && break
 done
 
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_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
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2195,11 +2455,11 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2219,9 +2479,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2237,7 +2495,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xkeyboard-config'
- VERSION='1.7'
+ VERSION='1.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2275,9 +2533,9 @@ 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
+if test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -2288,24 +2546,24 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 $as_echo "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2315,9 +2573,9 @@ 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2328,24 +2586,24 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
 $as_echo "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2354,7 +2612,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2379,16 +2637,16 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
+if test "${enable_maintainer_mode+set}" = set; then :
   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
 else
   USE_MAINTAINER_MODE=no
 fi
 
-  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
 $as_echo "$USE_MAINTAINER_MODE" >&6; }
    if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
@@ -2406,9 +2664,9 @@ fi
 
 # Extract the first word of "xkbcomp", so it can be a program name with args.
 set dummy xkbcomp; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XKBCOMP+set}" = set; then
+if test "${ac_cv_path_XKBCOMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $XKBCOMP in
@@ -2421,14 +2679,14 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_XKBCOMP" && ac_cv_path_XKBCOMP="not_found"
@@ -2437,23 +2695,21 @@ esac
 fi
 XKBCOMP=$ac_cv_path_XKBCOMP
 if test -n "$XKBCOMP"; then
-  { $as_echo "$as_me:$LINENO: result: $XKBCOMP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XKBCOMP" >&5
 $as_echo "$XKBCOMP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 if test x$XKBCOMP = xnot_found ; then
-        { { $as_echo "$as_me:$LINENO: error: xkbcomp is required to install the xkb data files" >&5
-$as_echo "$as_me: error: xkbcomp is required to install the xkb data files" >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "xkbcomp is required to install the xkb data files" "$LINENO" 5
 fi
 
 
 # Check whether --with-xkb_base was given.
-if test "${with_xkb_base+set}" = set; then
+if test "${with_xkb_base+set}" = set; then :
   withval=$with_xkb_base; xkb_base="$withval"
 else
   xkb_base="\$(datadir)/X11/xkb"
@@ -2462,13 +2718,13 @@ fi
 
 
 # Check whether --with-xkb_rules_symlink was given.
-if test "${with_xkb_rules_symlink+set}" = set; then
+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
+if test "${enable_xkbcomp_symlink+set}" = set; then :
   enableval=$enable_xkbcomp_symlink; enable_xkbcomp_symlink="$enableval"
 else
   enable_xkbcomp_symlink="yes"
@@ -2476,7 +2732,7 @@ fi
 
 
 # Check whether --enable-compat_rules was given.
-if test "${enable_compat_rules+set}" = set; then
+if test "${enable_compat_rules+set}" = set; then :
   enableval=$enable_compat_rules; enable_compat_rules="$enableval"
 else
   enable_compat_rules="yes"
@@ -2514,16 +2770,16 @@ fi
 # i18n
 # ****
 
-  { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then
+if test "${enable_nls+set}" = set; then :
   enableval=$enable_nls; USE_NLS=$enableval
 else
   USE_NLS=yes
 fi
 
-  { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
 $as_echo "$USE_NLS" >&6; }
 
 
@@ -2539,7 +2795,7 @@ am__doit:
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
 $as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
@@ -2567,12 +2823,12 @@ if test "$am__include" = "#"; then
 fi
 
 
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
 $as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
+if test "${enable_dependency_tracking+set}" = set; then :
   enableval=$enable_dependency_tracking;
 fi
 
@@ -2597,9 +2853,9 @@ 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2610,24 +2866,24 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2637,9 +2893,9 @@ 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2650,24 +2906,24 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2676,7 +2932,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2690,9 +2946,9 @@ 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2703,24 +2959,24 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2730,9 +2986,9 @@ 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2744,18 +3000,18 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
@@ -2774,10 +3030,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2789,9 +3045,9 @@ if test -z "$CC"; then
   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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2802,24 +3058,24 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2833,9 +3089,9 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2846,24 +3102,24 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2876,7 +3132,7 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2887,73 +3143,55 @@ fi
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    rm -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
+#include <stdio.h>
 int
 main ()
 {
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.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.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 $as_echo_n "checking for C compiler default output file name... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
@@ -2970,17 +3208,17 @@ do
 done
 rm -f $ac_rmfiles
 
-if { (ac_try="$ac_link_default"
+if { { ac_try="$ac_link_default"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; 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,
@@ -2997,7 +3235,7 @@ do
 	# certainly right.
 	break;;
     *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -3016,84 +3254,75 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
 else
   ac_file=''
 fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
 $as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
+if test -z "$ac_file"; then :
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
 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.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 $as_echo_n "checking whether the C compiler works... " >&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
+  { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_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
-$as_echo "$as_me: error: cannot run C compiled programs.
+as_fn_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; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
     fi
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.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.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 $as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
 $as_echo "$cross_compiling" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
+if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; 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
@@ -3108,32 +3337,24 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
 fi
-
 rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
+if test "${ac_cv_objext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3145,17 +3366,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -3168,31 +3389,23 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
 fi
-
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3206,37 +3419,16 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
@@ -3245,20 +3437,16 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
+if test "${ac_cv_prog_cc_g+set}" = set; then :
   $as_echo_n "(cached) " >&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
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3269,35 +3457,11 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
-  $as_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
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3308,36 +3472,12 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  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
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3348,42 +3488,17 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else
-  $as_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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 $as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -3400,18 +3515,14 @@ else
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&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
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -3468,32 +3579,9 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_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
@@ -3504,17 +3592,19 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3524,9 +3614,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 depcc="$CC"   am_compiler_list=
 
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -3615,7 +3705,7 @@ else
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
@@ -3635,35 +3725,31 @@ fi
 
 case "$am__api_version" in
     1.01234)
-	{ { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
-   { (exit 1); exit 1; }; }
+	as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
     ;;
     *)
     ;;
 esac
 
 if test -n "0.30"; then
-    { $as_echo "$as_me:$LINENO: checking for intltool >= 0.30" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.30" >&5
 $as_echo_n "checking for intltool >= 0.30... " >&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; }'`
 
-    { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	{ { $as_echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool 0.30 or later." >&5
-$as_echo "$as_me: error: Your intltool is too old.  You need intltool 0.30 or later." >&2;}
-   { (exit 1); exit 1; }; }
+	as_fn_error "Your intltool is too old.  You need intltool 0.30 or later." "$LINENO" 5
 fi
 
 # Extract the first word of "intltool-update", so it can be a program name with args.
 set dummy intltool-update; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_UPDATE in
@@ -3676,14 +3762,14 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -3691,19 +3777,19 @@ esac
 fi
 INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
 if test -n "$INTLTOOL_UPDATE"; then
-  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
 $as_echo "$INTLTOOL_UPDATE" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_MERGE in
@@ -3716,14 +3802,14 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -3731,19 +3817,19 @@ esac
 fi
 INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
 if test -n "$INTLTOOL_MERGE"; then
-  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
 $as_echo "$INTLTOOL_MERGE" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_EXTRACT in
@@ -3756,14 +3842,14 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -3771,18 +3857,16 @@ esac
 fi
 INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
 if test -n "$INTLTOOL_EXTRACT"; then
-  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
 $as_echo "$INTLTOOL_EXTRACT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
 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 $< $@'
@@ -3904,9 +3988,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar
 # 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $XGETTEXT in
@@ -3919,14 +4003,14 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -3934,19 +4018,19 @@ esac
 fi
 XGETTEXT=$ac_cv_path_XGETTEXT
 if test -n "$XGETTEXT"; then
-  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
 $as_echo "$XGETTEXT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGMERGE in
@@ -3959,14 +4043,14 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -3974,19 +4058,19 @@ esac
 fi
 MSGMERGE=$ac_cv_path_MSGMERGE
 if test -n "$MSGMERGE"; then
-  { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
 $as_echo "$MSGMERGE" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGFMT in
@@ -3999,14 +4083,14 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -4014,19 +4098,19 @@ esac
 fi
 MSGFMT=$ac_cv_path_MSGFMT
 if test -n "$MSGFMT"; then
-  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
 $as_echo "$MSGFMT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -4039,14 +4123,14 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
@@ -4055,33 +4139,29 @@ esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
 $as_echo "$GMSGFMT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
 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
-    { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
 fi
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_PERL in
@@ -4094,14 +4174,14 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -4109,41 +4189,35 @@ esac
 fi
 INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
 if test -n "$INTLTOOL_PERL"; then
-  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
 $as_echo "$INTLTOOL_PERL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 if test -z "$INTLTOOL_PERL"; then
-   { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
-$as_echo "$as_me: error: perl not found" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error "perl not found" "$LINENO" 5
 fi
-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
 $as_echo_n "checking for perl >= 5.8.1... " >&6; }
 $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
 if test $? -ne 0; then
-   { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
 else
    IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-   { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
 $as_echo "$IT_PERL_VERSION" >&6; }
 fi
 if test "x" != "xno-xml"; then
-   { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
 $as_echo_n "checking for XML::Parser... " >&6; }
    if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       { $as_echo "$as_me:$LINENO: result: ok" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
    else
-       { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-   { (exit 1); exit 1; }; }
+       as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
    fi
 fi
 
@@ -4153,11 +4227,7 @@ fi
 # 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
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4169,120 +4239,13 @@ extern int _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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 && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   DATADIRNAME=share
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	case $host in
+  case $host in
     *-*-solaris*)
-                        { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-  $as_echo_n "(cached) " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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 && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_bind_textdomain_codeset=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_bind_textdomain_codeset=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
+                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
   DATADIRNAME=share
 else
   DATADIRNAME=lib
@@ -4294,10 +4257,8 @@ fi
     ;;
     esac
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
 
 
@@ -4318,14 +4279,14 @@ 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
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 $as_echo_n "checking how to run the C preprocessor... " >&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
+  if test "${ac_cv_prog_CPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -4340,11 +4301,7 @@ do
   # <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
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -4353,78 +4310,34 @@ cat >>conftest.$ac_ext <<_ACEOF
 #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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # 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
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_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
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -4436,7 +4349,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
 $as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -4447,11 +4360,7 @@ do
   # <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
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -4460,87 +4369,40 @@ cat >>conftest.$ac_ext <<_ACEOF
 #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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # 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
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_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
-  :
+if $ac_preproc_ok; then :
+
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -4550,9 +4412,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
+if test "${ac_cv_path_GREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -4563,7 +4425,7 @@ 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_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
@@ -4583,7 +4445,7 @@ case `"$ac_path_GREP" --version 2>&1` in
     $as_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`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     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"
@@ -4598,26 +4460,24 @@ esac
       $ac_path_GREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
 $as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
+if test "${ac_cv_path_EGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4631,7 +4491,7 @@ 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_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
@@ -4651,7 +4511,7 @@ case `"$ac_path_EGREP" --version 2>&1` in
     $as_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`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     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"
@@ -4666,12 +4526,10 @@ esac
       $ac_path_EGREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4679,21 +4537,17 @@ fi
 
    fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4708,48 +4562,23 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
+  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
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -4759,18 +4588,14 @@ 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
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -4780,14 +4605,10 @@ 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
+  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
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -4814,118 +4635,34 @@ main ()
   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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 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=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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
-  $as_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 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -4936,146 +4673,12 @@ done
 
 
 
-
-for ac_header in locale.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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
-  $as_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
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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
-  $as_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
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+   for ac_header in locale.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
+if test "x$ac_cv_header_locale_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_LOCALE_H 1
 _ACEOF
 
 fi
@@ -5083,16 +4686,12 @@ fi
 done
 
     if test $ac_cv_header_locale_h = yes; then
-    { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
 $as_echo_n "checking for LC_MESSAGES... " >&6; }
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <locale.h>
 int
@@ -5103,46 +4702,19 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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 && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_val_LC_MESSAGES=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	am_cv_val_LC_MESSAGES=no
+  am_cv_val_LC_MESSAGES=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
 $as_echo "$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
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
 
     fi
   fi
@@ -5155,150 +4727,20 @@ _ACEOF
     XGETTEXT=:
     INTLLIBS=
 
-    if test "${ac_cv_header_libintl_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
-$as_echo_n "checking for libintl.h... " >&6; }
-if test "${ac_cv_header_libintl_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-$as_echo "$ac_cv_header_libintl_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
-$as_echo_n "checking libintl.h usability... " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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
-  $as_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
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
-$as_echo_n "checking libintl.h presence... " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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
-  $as_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
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: libintl.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
-$as_echo_n "checking for libintl.h... " >&6; }
-if test "${ac_cv_header_libintl_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_libintl_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-$as_echo "$ac_cv_header_libintl_h" >&6; }
-
-fi
-if test "x$ac_cv_header_libintl_h" = x""yes; then
+    ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
   gt_cv_func_dgettext_libintl="no"
       libintl_extra_libs=""
 
       #
       # First check in libc
       #
-      { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
 $as_echo_n "checking for ngettext in libc... " >&6; }
-if test "${gt_cv_func_ngettext_libc+set}" = set; then
+if test "${gt_cv_func_ngettext_libc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <libintl.h>
@@ -5311,54 +4753,25 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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 && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   gt_cv_func_ngettext_libc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_func_ngettext_libc=no
+  gt_cv_func_ngettext_libc=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
 $as_echo "$gt_cv_func_ngettext_libc" >&6; }
 
       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-	      { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
+	      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
 $as_echo_n "checking for dgettext in libc... " >&6; }
-if test "${gt_cv_func_dgettext_libc+set}" = set; then
+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <libintl.h>
@@ -5371,141 +4784,26 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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 && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   gt_cv_func_dgettext_libc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_func_dgettext_libc=no
+  gt_cv_func_dgettext_libc=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
 $as_echo "$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=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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 && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+        for ac_func in bind_textdomain_codeset
+do :
+  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
 
 fi
@@ -5520,18 +4818,14 @@ done
 	 || test "$gt_cv_func_ngettext_libc" != "yes" \
          || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
 
-        { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
 $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
   $as_echo_n "(cached) " >&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
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5549,55 +4843,26 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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 && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_intl_bindtextdomain=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_intl_bindtextdomain=no
+  ac_cv_lib_intl_bindtextdomain=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
-  { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
 $as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
   $as_echo_n "(cached) " >&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
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5615,55 +4880,26 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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 && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_intl_ngettext=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_intl_ngettext=no
+  ac_cv_lib_intl_ngettext=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
 $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
-  { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
 $as_echo_n "checking for dgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
   $as_echo_n "(cached) " >&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
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5681,43 +4917,18 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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 && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_intl_dgettext=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_intl_dgettext=no
+  ac_cv_lib_intl_dgettext=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
 $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
   gt_cv_func_dgettext_libintl=yes
 fi
 
@@ -5727,22 +4938,18 @@ fi
 
 
 	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
 $as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
-	  { $as_echo "$as_me:$LINENO: result: " >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
-  	  { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+  	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
 $as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
   $as_echo_n "(cached) " >&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
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5760,55 +4967,26 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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 && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_intl_ngettext=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_intl_ngettext=no
+  ac_cv_lib_intl_ngettext=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
 $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
-  { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
 $as_echo_n "checking for dcgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
   $as_echo_n "(cached) " >&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
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5826,43 +5004,18 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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 && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_intl_dcgettext=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_intl_dcgettext=no
+  ac_cv_lib_intl_dcgettext=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
 $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
   gt_cv_func_dgettext_libintl=yes
 			libintl_extra_libs=-liconv
 else
@@ -5884,102 +5037,12 @@ fi
           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=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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 && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+          for ac_func in bind_textdomain_codeset
+do :
+  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
 
 fi
@@ -6009,15 +5072,13 @@ done
 
       if test "$gt_cv_have_gettext" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETTEXT 1
-_ACEOF
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
 
 	# Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
@@ -6042,118 +5103,28 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != "no"; then
-  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
 $as_echo "$MSGFMT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 	if test "$MSGFMT" != "no"; then
           glib_save_LIBS="$LIBS"
           LIBS="$LIBS $INTLLIBS"
-
-for ac_func in dcgettext
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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 && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+	  for ac_func in dcgettext
+do :
+  ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
+if test "x$ac_cv_func_dcgettext" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_DCGETTEXT 1
 _ACEOF
 
 fi
 done
 
 	  MSGFMT_OPTS=
-	  { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
 $as_echo_n "checking if msgfmt accepts -c... " >&6; }
 	  cat >conftest.foo <<_ACEOF
 
@@ -6168,14 +5139,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 _ACEOF
-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
   ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-else { $as_echo "$as_me:$LINENO: result: no" >&5
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 echo "$as_me: failed input was:" >&5
 sed 's/^/| /' conftest.foo >&5
@@ -6183,9 +5154,9 @@ fi
 
 	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -6198,14 +5169,14 @@ 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
+    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"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
@@ -6214,19 +5185,19 @@ esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
 $as_echo "$GMSGFMT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 	  # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
@@ -6251,18 +5222,14 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
 $as_echo "$XGETTEXT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-	  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -6274,121 +5241,14 @@ extern int _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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 && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   CATOBJEXT=.gmo
              DATADIRNAME=share
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	case $host in
+  case $host in
 	    *-*-solaris*)
-	    	                	    	                { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-  $as_echo_n "(cached) " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_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 && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_bind_textdomain_codeset=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_bind_textdomain_codeset=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
+	    	                	    	                ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
   CATOBJEXT=.gmo
                DATADIRNAME=share
 else
@@ -6403,10 +5263,8 @@ fi
 	    ;;
 	    esac
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
           LIBS="$glib_save_LIBS"
 	  INSTOBJEXT=.mo
 	else
@@ -6420,9 +5278,7 @@ fi
 
     if test "$gt_cv_have_gettext" = "yes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_NLS 1
-_ACEOF
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
 
     fi
 
@@ -6430,7 +5286,7 @@ _ACEOF
                   if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
         : ;
       else
-        { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
 $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
         XGETTEXT=":"
       fi
@@ -6463,7 +5319,7 @@ $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
 $as_echo_n "checking for catalogs to be installed... " >&6; }
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
@@ -6488,7 +5344,7 @@ $as_echo_n "checking for catalogs to be installed... " >&6; }
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
 $as_echo "$LINGUAS" >&6; }
      fi
 
@@ -6526,7 +5382,7 @@ ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr hu id it ka ko ky lt
 
 
 
-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/bin/Makefile rules/compat/Makefile rules/extras/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 symbols/extras/Makefile types/Makefile xkeyboard-config.spec docs/Makefile"
+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/bin/Makefile rules/compat/Makefile rules/extras/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile symbols/hp_vndr/Makefile symbols/macintosh_vndr/Makefile symbols/nec_vndr/Makefile symbols/nokia_vndr/Makefile symbols/sgi_vndr/Makefile symbols/sony_vndr/Makefile symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile symbols/extras/Makefile types/Makefile xkeyboard-config.spec docs/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -6555,13 +5411,13 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -6569,8 +5425,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
   (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 \).
+      # `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"
@@ -6593,11 +5449,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -6653,8 +5509,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   ac_i=`$as_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'
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -6662,46 +5518,28 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${CREATE_RULES_SYMLINK_TRUE}" && test -z "${CREATE_RULES_SYMLINK_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"CREATE_RULES_SYMLINK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_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; }; }
+  as_fn_error "conditional \"CREATE_RULES_SYMLINK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${CREATE_XKBCOMP_SYMLINK_TRUE}" && test -z "${CREATE_XKBCOMP_SYMLINK_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"CREATE_XKBCOMP_SYMLINK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_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; }; }
+  as_fn_error "conditional \"CREATE_XKBCOMP_SYMLINK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_COMPAT_RULES_TRUE}" && test -z "${USE_COMPAT_RULES_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_COMPAT_RULES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_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; }; }
+  as_fn_error "conditional \"USE_COMPAT_RULES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
   ac_config_commands="$ac_config_commands po/stamp-it"
@@ -6712,9 +5550,10 @@ fi
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -6724,17 +5563,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## 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
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -6742,23 +5582,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  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
-
 as_nl='
 '
 export as_nl
@@ -6766,7 +5598,13 @@ export as_nl
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -6777,7 +5615,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -6800,13 +5638,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 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
@@ -6816,15 +5647,15 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+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
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -6836,12 +5667,16 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); 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
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -6853,7 +5688,89 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -6867,8 +5784,12 @@ else
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
@@ -6888,76 +5809,25 @@ $as_echo X/"$0" |
 	  }
 	  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" ||
-    { $as_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
+# 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
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   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
@@ -6986,8 +5856,56 @@ fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_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 ||
+$as_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" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -7006,10 +5924,10 @@ else
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -7024,13 +5942,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.7, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+This file was extended by xkeyboard-config $as_me 1.8, which was
+generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -7058,10 +5982,11 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
@@ -7078,16 +6003,16 @@ $config_files
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to the package provider."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-xkeyboard-config config.status 1.7
-configured by $0, generated by GNU Autoconf 2.63,
+xkeyboard-config config.status 1.8
+configured by $0, generated by GNU Autoconf 2.64,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -7130,7 +6055,7 @@ do
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h |  --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -7139,11 +6064,10 @@ do
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1"
+  *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
@@ -7221,6 +6145,7 @@ do
     "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/nokia_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/nokia_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" ;;
@@ -7231,9 +6156,7 @@ do
     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -7259,7 +6182,7 @@ $debug ||
   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
+  trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
@@ -7270,11 +6193,7 @@ $debug ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -7282,10 +6201,16 @@ $debug ||
 if test -n "$CONFIG_FILES"; then
 
 
-ac_cr='
'
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -7299,24 +6224,18 @@ _ACEOF
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -7405,9 +6324,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -7438,9 +6355,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -7468,12 +6383,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
+      as_fn_append ac_file_inputs " '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -7484,7 +6397,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
@@ -7497,9 +6410,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -7527,47 +6438,7 @@ $as_echo X"$ac_file" |
 	    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=`$as_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 ||
-$as_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" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
@@ -7624,7 +6495,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # 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=
-
 ac_sed_dataroot='
 /datarootdir/ {
   p
@@ -7634,12 +6504,11 @@ ac_sed_dataroot='
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p
-'
+/@mandir@/p'
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -7649,7 +6518,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
+  s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
@@ -7678,14 +6547,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 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"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
 $as_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;}
@@ -7695,13 +6562,11 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
 
 
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
@@ -7796,47 +6661,7 @@ $as_echo X"$file" |
 	    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=`$as_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 ||
-$as_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" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
       # echo "creating $dirpart/$file"
       echo '# dummy' > "$dirpart/$file"
     done
@@ -7848,9 +6673,7 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
       esac ;;
     "po/stamp-it":C)
     if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
-       { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
-   { (exit 1); exit 1; }; }
+       as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
     fi
     rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
     >"po/stamp-it.tmp"
@@ -7873,15 +6696,12 @@ $as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;
 done # for ac_tag
 
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -7902,10 +6722,10 @@ if test "$no_create" != yes; then
   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; }
+  $ac_cs_success || as_fn_exit $?
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff --git a/xorg-server/xkbdata.src/configure.in b/xorg-server/xkbdata.src/configure.in
index 74cd522dd..fef868b7f 100644
--- a/xorg-server/xkbdata.src/configure.in
+++ b/xorg-server/xkbdata.src/configure.in
@@ -1,6 +1,6 @@
-AC_INIT(xkeyboard-config, 1.7)
+AC_INIT(xkeyboard-config, 1.8)
 AC_CONFIG_SRCDIR(rules/base.xml.in)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
 AC_SUBST(VERSION)
@@ -75,6 +75,7 @@ symbols/fujitsu_vndr/Makefile
 symbols/hp_vndr/Makefile
 symbols/macintosh_vndr/Makefile
 symbols/nec_vndr/Makefile
+symbols/nokia_vndr/Makefile
 symbols/sgi_vndr/Makefile
 symbols/sony_vndr/Makefile
 symbols/sun_vndr/Makefile
diff --git a/xorg-server/xkbdata.src/docs/HOWTO.transition b/xorg-server/xkbdata.src/docs/HOWTO.transition
index f671af93d..24add85f5 100644
--- a/xorg-server/xkbdata.src/docs/HOWTO.transition
+++ b/xorg-server/xkbdata.src/docs/HOWTO.transition
@@ -1,6 +1,6 @@
 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.
+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 "multiple 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
 
diff --git a/xorg-server/xkbdata.src/docs/Makefile.in b/xorg-server/xkbdata.src/docs/Makefile.in
index 33b637891..2277560c9 100644
--- a/xorg-server/xkbdata.src/docs/Makefile.in
+++ b/xorg-server/xkbdata.src/docs/Makefile.in
@@ -95,6 +95,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -165,9 +166,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  docs/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/Makefile
+	  $(AUTOMAKE) --foreign  docs/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/geometry/Makefile.am b/xorg-server/xkbdata.src/geometry/Makefile.am
index ff1f8c758..84619fb96 100644
--- a/xorg-server/xkbdata.src/geometry/Makefile.am
+++ b/xorg-server/xkbdata.src/geometry/Makefile.am
@@ -6,7 +6,7 @@ dist_geom_DATA = \
 amiga ataritt chicony \
 dell everex fujitsu \
 hhk hp keytronic kinesis \
-macintosh microsoft nec \
+macintosh microsoft nec nokia \
 northgate pc sony thinkpad \
 sun typematrix winbook README
 
diff --git a/xorg-server/xkbdata.src/geometry/Makefile.in b/xorg-server/xkbdata.src/geometry/Makefile.in
index ac6a41475..fdd635186 100644
--- a/xorg-server/xkbdata.src/geometry/Makefile.in
+++ b/xorg-server/xkbdata.src/geometry/Makefile.in
@@ -124,6 +124,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -187,7 +188,7 @@ dist_geom_DATA = \
 amiga ataritt chicony \
 dell everex fujitsu \
 hhk hp keytronic kinesis \
-macintosh microsoft nec \
+macintosh microsoft nec nokia \
 northgate pc sony thinkpad \
 sun typematrix winbook README
 
@@ -207,9 +208,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  geometry/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  geometry/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  geometry/Makefile
+	  $(AUTOMAKE) --foreign  geometry/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.in
index 82b3b990b..6ab8a8ad6 100644
--- a/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  geometry/digital_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  geometry/digital_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  geometry/digital_vndr/Makefile
+	  $(AUTOMAKE) --foreign  geometry/digital_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/geometry/geometry.dir b/xorg-server/xkbdata.src/geometry/geometry.dir
index fb1c401a3..f2259ed8c 100644
--- a/xorg-server/xkbdata.src/geometry/geometry.dir
+++ b/xorg-server/xkbdata.src/geometry/geometry.dir
@@ -1,31 +1,8 @@
+-d------ -------- everex(STEPnote)
 -d------ -------- macintosh(macintosh)
 -------- -------- macintosh(applepro)
 -------- -------- macintosh(macbook78)
 -------- -------- macintosh(macbook79)
--d------ -------- winbook(XP5)
--d------ -------- kinesis(model100)
--------- -------- typematrix(tm2020)
--------- -------- typematrix(tm2030_shape)
--------- -------- typematrix(tm2030_MiscDiod_dvk)
--------- -------- typematrix(tm2030_MiscDiod_102)
--------- -------- typematrix(tm2030_MiscDiod_106)
--------- -------- typematrix(tm2030_MiscDiod_off)
--------- -------- typematrix(tm2030_MiscDiod_on)
--------- -------- typematrix(tm2030USB_func)
--------- -------- typematrix(tm2030USB_alpha)
--------- -------- typematrix(tm2030USB_ctrl)
--------- -------- typematrix(tm2030PS2)
--------- -------- typematrix(tm2030USB)
--------- -------- typematrix(tm2030USB-102)
--------- -------- typematrix(tm2030USB-106)
--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)
@@ -59,14 +36,8 @@
 -------- -------- 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------ -------- fujitsu(138)
+-------- -------- fujitsu(140)
 -d------ -------- pc(pc101)
 -------- -------- pc(pc102)
 -------- -------- pc(pc104)
@@ -77,7 +48,6 @@
 -------- -------- pc(kr106)
 -------- -------- pc(latitude)
 -------- -------- pc(pc104alt)
--d------ -------- chicony(us)
 -d------ -------- hhk(win1)
 -------- -------- hhk(win2)
 -------- -------- hhk(win3)
@@ -87,27 +57,39 @@
 -------- -------- hhk(jp3)
 -------- -------- hhk(jp4)
 h-p----- -------- hhk(basic)
+-d------ -------- kinesis(model100)
+-d------ -------- hp(pc101)
+-------- -------- hp(hil)
+-------- -------- hp(omnibook)
+-------- -------- hp(omnibook_intl)
+-------- -------- hp(mini110)
+-------- -------- hp(dv5)
+-d------ -------- microsoft(natural)
+-------- -------- microsoft(elite)
+-d------ -------- keytronic(FlexPro)
+-d------ -------- northgate(omnikey101)
+-d------ -------- sgi_vndr/indy(pc101)
+-------- -------- sgi_vndr/indy(pc102)
+-------- -------- sgi_vndr/indy(jp106)
 -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------ -------- sony(nwp5461)
+-d------ -------- winbook(XP5)
+-d------ -------- ataritt(us)
+-------- -------- ataritt(de)
+-------- -------- thinkpad(common)
+-------- -------- thinkpad(us)
+-------- -------- thinkpad(intl)
+-------- -------- thinkpad(60)
+-d------ -------- nokia(nokiarx51)
 -d------ -------- dell(dell101)
 -------- -------- dell(dell65)
 -------- -------- dell(dell65x)
 -------- -------- dell(dellm65)
 -------- -------- dell(latitude)
--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)
@@ -116,5 +98,26 @@ h-p----- -------- hhk(basic)
 -------- -------- digital_vndr/pc(pcxaj)
 -------- -------- digital_vndr/unix(unix)
 -------- -------- digital_vndr/unix(lk421jj)
--d------ -------- ataritt(us)
--------- -------- ataritt(de)
+-------- -------- digital_vndr/lk(lk201)
+-------- -------- digital_vndr/lk(lk401)
+-------- -------- digital_vndr/lk(lk450)
+-------- -------- digital_vndr/lk(lk401bj)
+-------- -------- digital_vndr/lk(lk401jj)
+-------- -------- typematrix(tm2020)
+-------- -------- typematrix(tm2030_shape)
+-------- -------- typematrix(tm2030_MiscDiod_dvk)
+-------- -------- typematrix(tm2030_MiscDiod_102)
+-------- -------- typematrix(tm2030_MiscDiod_106)
+-------- -------- typematrix(tm2030_MiscDiod_off)
+-------- -------- typematrix(tm2030_MiscDiod_on)
+-------- -------- typematrix(tm2030USB_func)
+-------- -------- typematrix(tm2030USB_alpha)
+-------- -------- typematrix(tm2030USB_ctrl)
+-------- -------- typematrix(tm2030PS2)
+-------- -------- typematrix(tm2030USB)
+-------- -------- typematrix(tm2030USB-102)
+-------- -------- typematrix(tm2030USB-106)
+-d------ -------- chicony(us)
+-d------ -------- nec(pc98)
+-d------ -------- amiga(usa1)
+-------- -------- amiga(de)
diff --git a/xorg-server/xkbdata.src/geometry/hp b/xorg-server/xkbdata.src/geometry/hp
index c93cb0cd1..62e4d8a18 100644
--- a/xorg-server/xkbdata.src/geometry/hp
+++ b/xorg-server/xkbdata.src/geometry/hp
@@ -454,3 +454,249 @@ xkb_geometry "omnibook_intl" {
 	};
     }; // End of "Alpha" section
 };
+
+xkb_geometry "mini110" {
+
+	description= "HP Mini 110";
+	width= 262;
+	height= 106;
+
+	shape.cornerRadius = 0;
+	shape "FN0"  { { [ 14, 10 ] } , { [ 14, 10 ] } };
+	shape "NORM" { { [ 16.7, 16 ] }   , { [ 16.7, 16 ] } };
+	shape "TLDE" { { [ 12, 16 ] } , { [ 12, 16 ] } };
+	shape "ONE"  { { [ 14, 16 ] }   , { [ 14, 16 ] } };
+	shape "BKSP" { { [ 31.3, 16 ] }   , { [ 31.3, 16 ] } };
+	shape "BKSL" { { [ 23.9, 16 ] } , { [ 23.9, 16 ] } };
+	shape "CAPS" { { [ 22, 16 ] }   , { [ 22, 16 ] } };
+	shape "RTRN" { { [ 36.3, 16 ] } , { [ 36.3, 16 ] } };
+	shape "LFSH" { { [ 31, 16 ] }   , { [ 31, 16 ] } };
+	shape "RTSH" { { [ 45, 16 ] } , { [ 45, 16 ] } };
+	shape "CTLS" { { [ 16.5, 19 ] }   , { [ 16.5, 19 ] } };
+	shape "SPCE" { { [ 78.4, 19 ] } , { [ 78.4, 19 ] } };
+	shape "ARRW" { { [ 16.7, 9 ] }  , { [ 16.7, 9 ] } };
+
+	key.gap=1;
+
+	section "Function" {
+		top=4;
+		left=3;
+		key.shape="FN0";
+		row {
+			keys {
+				<ESC>, <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
+				<FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>,
+				<FK12>, <PAUS>, <SCLK>, <INS>, <DELE>
+			};
+		};
+	};
+
+	section "Alphanum" {
+		top=15;
+		left=3;
+		key.shape="NORM";
+        row {
+            top= 0;
+            keys { { <TLDE>, "TLDE" } , { <AE01>, "ONE" }, <AE02>, <AE03>, <AE04>,
+                   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+                   <AE10>, <AE11>, <AE12>,
+                   { <BKSP>, "BKSP" }
+            };
+        };
+        row {
+            top= 17;
+            keys { <TAB>, <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+                   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
+                   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+            };
+        };
+        row {
+            top= 34;
+            keys { { <CAPS>, "CAPS" } ,
+                   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+                   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+                   <AC11>, { <RTRN>, "RTRN" }
+            };
+        };
+        row {
+            top= 51;
+            keys { { <LFSH>, "LFSH" },
+                    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
+                    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+                    { <RTSH>, "RTSH" }
+            };
+        };
+
+	};
+
+	section "Control" {
+		top=83;
+		left=3;
+		key.shape="CTLS";
+		row {
+			keys {
+				<LCTL>, <FN>, <LWIN>, <LALT>, { <SPCE>, "SPCE" }, <RALT>, <MENU>, <RCTL>
+			};
+		};
+	};
+
+	section "Arrows" {
+		top=83;
+		left=204.9;
+		key.shape="ARRW";
+		row {
+			left= 17.7;
+			keys {
+				<UP>
+			};
+		};
+		row {
+			top = 10;
+			keys {
+				<LEFT>, <DOWN>, <RGHT>
+			};
+		};
+	};
+
+};
+
+xkb_geometry "dv5" {
+
+	height=118.4;
+	width=310.6;
+
+    description = "HP Pavilion dv5";
+
+	shape.cornerRadius = 1;
+
+	shape "ESC"  { { [20.0, 12.5] }, { [2.2, 1], [17.8, 10.5] } };
+	shape "FN0"  { { [15.9, 12.5] }, { [2.2, 1], [13.7, 10.5] } };
+	shape "DELE" { { [19.4, 12.5] }, { [2.2, 1], [17.2, 10.5] } };
+
+	shape "NORM" { { [17.9, 18.3] }, { [2.2, 1], [15.7, 16.3] } };
+
+	shape "BKSP" { { [36.1, 18.3] }, { [2.4, 1], [33.7, 16.3] } };
+
+	shape "TABK" { { [26.8, 18.3] }, { [2.4, 1], [24.4, 16.3] } };
+	shape "BKSL" { { [27.1, 18.3] }, { [2.4, 1], [24.7, 16.3] } };
+
+	shape "CAPS" { { [31.6, 18.3] }, { [2.4, 1], [29.2, 16.3] } };
+	shape "RTRN" { { [41.2, 18.3] }, { [2.4, 1], [39.3, 16.3] } };
+
+	shape "LFSH" { { [41.5, 18.3] }, { [2.4, 1], [38.8, 16.3] } };
+	shape "RTSH" { { [31.5, 18.3] }, { [2.4, 1], [29.1, 16.3] } };
+
+	shape "LCTL" { { [22.4, 18.3] }, { [2.2, 1], [20.2, 16.3] } };
+	shape "RCTL" { { [22.6, 18.3] }, { [2.2, 1], [20.4, 16.3] } };
+	shape "CTLS" { { [17.9, 18.3] }, { [2.2, 1], [15.7, 16.3] } };
+	shape "SPCE" { { [94.3, 18.3] }, { [2.5, 1], [91.8, 16.3] } };
+
+	shape "ARRW" { { [17.9, 18.3] }, { [2.2, 1], [15.7, 16.3] } };
+
+	shape "EDIT" { { [16.6, 18.3] }, { [2.2, 1], [14.4, 16.3] } };
+
+	key.gap = 1.2;
+
+	section "Function" {
+		top=4.2;
+		left=3;
+		row {
+			key.shape = "FN0";
+			keys {
+				{<ESC>, "ESC"},
+				{2.9, <FK01>}, <FK02>, <FK03>, <FK04>,
+				{2.9, <FK05>}, <FK06>, <FK07>, <FK08>,
+				{2.9, <FK09>}, <FK10>, <FK11>, <FK12>,
+				{2.9, <NMLK>}, <PAUS>, <INS>, {<DELE>, "DELE"}
+			};
+		};
+	};
+
+    section "Alpha" {
+		top = 17.9;
+		key.shape = "NORM";
+	    left = 3;
+
+		row {
+		    top = 0;
+		    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+			   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+			   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+		    };
+		};
+		row {
+		    top = 19.5;
+		    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.5;
+		    keys { { <LFSH>, "LFSH" },
+			   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+			   { <RTSH>, "RTSH" }
+		    };
+		};
+    }; // End of "Alpha" section
+
+    section "Controls" {
+		top = 95.9;
+		key.shape = "CTLS";
+	    left = 3;
+
+		row {
+		    top = 0;
+		    keys { {<LCTL>, "LCTL"}, <FN>, <LWIN>, <LALT>, {<SPCE>, "SPCE"},
+			   <RALT>, <MENU>, {<RCTL>, "RCTL"}
+		    };
+		};
+    };
+
+	section "Edition" {
+		top = 16.5;
+	    left = 289.9;
+		key.shape = "EDIT";
+		key.gap = 1.4;
+		row {
+		    top = 0;
+			vertical = true;
+		    keys {
+				<HOME>, <PGUP>, <PGDN>, <END>
+		    };
+		};
+	};
+
+	section "Arrows" {
+		top = 76.4;
+		key.shape = "ARRW";
+		left = 249.3;
+		row {
+			top = 0;
+			left = 19.1;
+			keys {
+				<UP>
+			};
+		};
+		row {
+			top = 19.5;
+			left = 0;
+			keys {
+				<LEFT>, <DOWN>, <RGHT>
+			};
+		};
+	};
+};
+
+
+
diff --git a/xorg-server/xkbdata.src/geometry/nokia b/xorg-server/xkbdata.src/geometry/nokia
new file mode 100644
index 000000000..5132840ca
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/nokia
@@ -0,0 +1,53 @@
+// Zoomed 3x because of text size
+
+default xkb_geometry "nokiarx51" {
+
+    description= "Nokia RX-51";
+    width= 273; // 13x6mm + 2x1.5mm border + 2x5mm border
+    height= 54; // 3x5mm + 2x1.5mm border
+
+    shape.cornerRadius= 1.5;
+    shape "NORM"  { { [18,15] } };
+    shape "SPCE"  { { [36,15] } };
+    shape "FRAME" { cornerRadius= 2.5, { [243,54] } };
+
+    solid "FRAME" {
+	shape= "FRAME";
+	color= "white";
+	top= 0;
+	left= 15;
+    };
+
+    section.left= 15;
+    row.left= 4.5;
+    key.shape= "NORM";
+    key.gap= 0;
+    section "Keys" {
+	top= 0;
+	row {
+	    top= 4.5;
+	    keys { { <LCTL>, "NORM", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AB08>,
+		   { <BKSP>, "NORM", color="grey20" }
+	    };
+	};
+	row {
+	    top= 19.5;
+	    keys { { <RALT>, "NORM", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AB09>, <UP>,
+		   { <RTRN>, "NORM", color="grey20" }
+	    };
+	};
+	row {
+	    top= 34.5;
+	    keys { { <LFSH>, "NORM", color="grey20" },
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>,
+		   { <SPCE>, "SPCE", color="white" },
+		   <LEFT>, <DOWN>, <RGHT>
+	    };
+	};
+    }; // End of "Keys" section
+
+}; // End of "rx51" geometry
diff --git a/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.in
index d50ee7bcf..113281768 100644
--- a/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  geometry/sgi_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  geometry/sgi_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  geometry/sgi_vndr/Makefile
+	  $(AUTOMAKE) --foreign  geometry/sgi_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/geometry/sun b/xorg-server/xkbdata.src/geometry/sun
index 633077ac7..585eb2615 100644
--- a/xorg-server/xkbdata.src/geometry/sun
+++ b/xorg-server/xkbdata.src/geometry/sun
@@ -29,29 +29,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 // ---------------------------------------------------------------------------
 //
diff --git a/xorg-server/xkbdata.src/keycodes/Makefile.in b/xorg-server/xkbdata.src/keycodes/Makefile.in
index 7cf7b7745..5292ddd3b 100644
--- a/xorg-server/xkbdata.src/keycodes/Makefile.in
+++ b/xorg-server/xkbdata.src/keycodes/Makefile.in
@@ -124,6 +124,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -214,9 +215,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  keycodes/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  keycodes/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  keycodes/Makefile
+	  $(AUTOMAKE) --foreign  keycodes/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.in
index c4645694c..f3b04260a 100644
--- a/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  keycodes/digital_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  keycodes/digital_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  keycodes/digital_vndr/Makefile
+	  $(AUTOMAKE) --foreign  keycodes/digital_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/keycodes/keycodes.dir b/xorg-server/xkbdata.src/keycodes/keycodes.dir
index 82b39e37a..f1d572ad5 100644
--- a/xorg-server/xkbdata.src/keycodes/keycodes.dir
+++ b/xorg-server/xkbdata.src/keycodes/keycodes.dir
@@ -1,14 +1,6 @@
 -d------ -------- macintosh(macintosh)
 -------- -------- macintosh(old)
 -------- -------- macintosh(hhk)
--d------ -------- aliases(qwerty)
--------- -------- aliases(azerty)
--------- -------- aliases(qwertz)
--------- -------- sony(nwp5461)
--d------ -------- fujitsu(138)
--d------ -------- xfree98(pc98)
--d------ -------- evdev(evdev)
--------- -------- evdev(pc98)
 -d------ -------- sun(type4)
 -------- -------- sun(type5)
 -------- -------- sun(type4tuv)
@@ -34,12 +26,12 @@
 -------- -------- sun(type4__se)
 -------- -------- sun(type4_se)
 -------- -------- sun(type4_se_swapctl)
--d------ -------- amiga(usa1)
--------- -------- amiga(de)
+-d------ -------- xfree98(pc98)
+-d------ -------- fujitsu(138)
 -d------ -------- hp(hp-101)
 -------- -------- hp(hil)
--d------ -------- sgi_vndr/indigo(pc101)
--------- -------- sgi_vndr/indigo(pc102)
+-------- -------- ibm(rs6k-101)
+-------- -------- ibm(rs6k-102)
 -d------ -------- sgi_vndr/indy(universal)
 -------- -------- sgi_vndr/indy(pc101)
 -------- -------- sgi_vndr/indy(pc102)
@@ -48,9 +40,28 @@
 -------- -------- sgi_vndr/indy(jp106)
 h-p----- -------- sgi_vndr/indy(overlayKeypad)
 h-p----- -------- sgi_vndr/indy(shiftLock)
+-d------ -------- sgi_vndr/indigo(pc101)
+-------- -------- sgi_vndr/indigo(pc102)
 -d------ -------- sgi_vndr/iris(iris)
--------- -------- ibm(rs6k-101)
--------- -------- ibm(rs6k-102)
+-------- -------- sony(nwp5461)
+-d------ -------- evdev(evdev)
+-------- -------- evdev(pc98)
+-d------ -------- xfree86(xfree86)
+-------- -------- xfree86(basic)
+-------- -------- xfree86(102)
+-------- -------- xfree86(thinkpadz60)
+-d------ -------- ataritt(us)
+-------- -------- ataritt(de)
+-------- -------- 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)
 -------- -------- digital_vndr/lk(lk_common)
 -------- -------- digital_vndr/lk(lkx01)
 -------- -------- digital_vndr/lk(lk201)
@@ -63,19 +74,8 @@ h-p----- -------- sgi_vndr/indy(shiftLock)
 -------- -------- 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(thinkpadz60)
+-d------ -------- aliases(qwerty)
+-------- -------- aliases(azerty)
+-------- -------- aliases(qwertz)
+-d------ -------- amiga(usa1)
+-------- -------- amiga(de)
diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.in
index a064ed494..aac5d6ba8 100644
--- a/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  keycodes/sgi_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  keycodes/sgi_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  keycodes/sgi_vndr/Makefile
+	  $(AUTOMAKE) --foreign  keycodes/sgi_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/keycodes/sun b/xorg-server/xkbdata.src/keycodes/sun
index 89d7fe66e..a6ffdb39f 100644
--- a/xorg-server/xkbdata.src/keycodes/sun
+++ b/xorg-server/xkbdata.src/keycodes/sun
@@ -29,29 +29,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 // ---------------------------------------------------------------------------
 //
diff --git a/xorg-server/xkbdata.src/keymap/Makefile.in b/xorg-server/xkbdata.src/keymap/Makefile.in
index 36378f620..5093c0cf0 100644
--- a/xorg-server/xkbdata.src/keymap/Makefile.in
+++ b/xorg-server/xkbdata.src/keymap/Makefile.in
@@ -124,6 +124,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -204,9 +205,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  keymap/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  keymap/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  keymap/Makefile
+	  $(AUTOMAKE) --foreign  keymap/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/keymap/README b/xorg-server/xkbdata.src/keymap/README
index bec7ed4ba..318089e09 100644
--- a/xorg-server/xkbdata.src/keymap/README
+++ b/xorg-server/xkbdata.src/keymap/README
@@ -2,3 +2,5 @@ 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.
+
+The keymap files are in .xkm format and useful when using xkbcomp.  
diff --git a/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in
index 808af57f2..8d14c147c 100644
--- a/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  keymap/digital_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  keymap/digital_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  keymap/digital_vndr/Makefile
+	  $(AUTOMAKE) --foreign  keymap/digital_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/keymap/keymap.dir b/xorg-server/xkbdata.src/keymap/keymap.dir
index 6dbb8f1b7..7b8f07a92 100644
--- a/xorg-server/xkbdata.src/keymap/keymap.dir
+++ b/xorg-server/xkbdata.src/keymap/keymap.dir
@@ -1,11 +1,135 @@
 -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)
+-d------ -------- xfree98(jp)
+-d------ -------- sgi_vndr/fr(indy)
+-------- -------- sgi_vndr/fr(indy_nodeadkeys)
+-------- -------- sgi_vndr/fr(indigo)
+-------- -------- sgi_vndr/fr(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/dvorak(indy)
+-------- -------- sgi_vndr/dvorak(indigo)
+-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/pl(indy)
+-------- -------- sgi_vndr/pl(indy_nodeadkeys)
+-------- -------- sgi_vndr/pl(indigo)
+-------- -------- sgi_vndr/pl(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/th(indy)
+-------- -------- sgi_vndr/th(indigo)
+-d------ -------- sgi_vndr/no(indy)
+-------- -------- sgi_vndr/no(indy_nodeadkeys)
+-------- -------- sgi_vndr/no(indigo)
+-------- -------- sgi_vndr/no(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/es(indy)
+-------- -------- sgi_vndr/es(indy_nodeadkeys)
+-------- -------- sgi_vndr/es(indigo)
+-------- -------- sgi_vndr/es(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/cz(indy)
+-------- -------- sgi_vndr/cz(indigo)
+-------- -------- sgi_vndr/cz(indy_qwerty)
+-------- -------- sgi_vndr/cz(indigo_qwerty)
+-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/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/gb(indy)
+-------- -------- sgi_vndr/gb(indy_nodeadkeys)
+-------- -------- sgi_vndr/gb(indigo)
+-------- -------- sgi_vndr/gb(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/se(indy)
+-------- -------- sgi_vndr/se(indy_nodeadkeys)
+-------- -------- sgi_vndr/se(indigo)
+-------- -------- sgi_vndr/se(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/dk(indy)
+-------- -------- sgi_vndr/dk(indy_nodeadkeys)
+-------- -------- sgi_vndr/dk(indigo)
+-------- -------- sgi_vndr/dk(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/sk(indy)
+-------- -------- sgi_vndr/sk(indigo)
+-------- -------- sgi_vndr/sk(indy_qwerty)
+-------- -------- sgi_vndr/sk(indigo_qwerty)
+-d------ -------- sgi_vndr/pt(indy)
+-------- -------- sgi_vndr/pt(indy_nodeadkeys)
+-------- -------- sgi_vndr/pt(indigo)
+-------- -------- sgi_vndr/pt(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/ca(indy)
+-------- -------- sgi_vndr/ca(indy_nodeadkeys)
+-------- -------- sgi_vndr/ca(indigo)
+-------- -------- sgi_vndr/ca(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/de(indy)
+-------- -------- sgi_vndr/de(indy_nodeadkeys)
+-------- -------- sgi_vndr/de(indigo)
+-------- -------- sgi_vndr/de(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/it(indy)
+-------- -------- sgi_vndr/it(indy_nodeadkeys)
+-------- -------- sgi_vndr/it(indigo)
+-------- -------- sgi_vndr/it(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/bg(indy)
+-------- -------- sgi_vndr/bg(indigo)
+-d------ -------- sgi_vndr/be(indy)
+-------- -------- sgi_vndr/be(indy_nodeadkeys)
+-------- -------- sgi_vndr/be(indigo)
+-------- -------- sgi_vndr/be(indigo_nodeadkeys)
+-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)
+-d------ -------- sgi_vndr/fi(indy)
+-------- -------- sgi_vndr/fi(indy_nodeadkeys)
+-------- -------- sgi_vndr/fi(indigo)
+-------- -------- sgi_vndr/fi(indigo_nodeadkeys)
+-------- -------- sun_vndr/fr(type4_fr)
+-------- -------- sun_vndr/fr(type4_fr_openlook)
+-d------ -------- sun_vndr/fr(type5_fr)
+-------- -------- sun_vndr/fr(type5_fr_openlook)
+-------- -------- sun_vndr/pl(type4_pl)
+-------- -------- sun_vndr/pl(type4_pl_openlook)
+-d------ -------- sun_vndr/pl(type5_pl)
+-------- -------- sun_vndr/pl(type5_pl_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/es(type4_es)
+-------- -------- sun_vndr/es(type4_es_openlook)
+-d------ -------- sun_vndr/es(type5_es)
+-------- -------- sun_vndr/es(type5_es_openlook)
 -------- -------- sun_vndr/all(Belgian6)
 -------- -------- sun_vndr/all(Belgian6_usb)
 -------- -------- sun_vndr/all(Canada4)
@@ -140,22 +264,6 @@
 -------- -------- 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)
@@ -168,147 +276,21 @@
 -------- -------- 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/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/ru(type4_ru)
 -------- -------- sun_vndr/ru(type4_ru_openlook)
 -d------ -------- sun_vndr/ru(type5_ru)
 -------- -------- sun_vndr/ru(type5_ru_openlook)
+-------- -------- sun_vndr/fi(type4_fi)
+-------- -------- sun_vndr/fi(type4_fi_openlook)
+-d------ -------- sun_vndr/fi(type5_fi)
+-------- -------- sun_vndr/fi(type5_fi_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)
@@ -360,3 +342,21 @@
 -------- -------- xfree86(fr_CH)
 -------- -------- xfree86(mt_us)
 -------- -------- xfree86(sk_qwerty)
+-d------ -------- ataritt(us)
+-------- -------- ataritt(de)
+-------- -------- 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------ -------- amiga(usa1)
+-------- -------- amiga(de)
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in
index 9afff68fc..cf57eff11 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -187,9 +188,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  keymap/sgi_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  keymap/sgi_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  keymap/sgi_vndr/Makefile
+	  $(AUTOMAKE) --foreign  keymap/sgi_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in b/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in
index e728e0869..5700331a2 100644
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -182,9 +183,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  keymap/sun_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  keymap/sun_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  keymap/sun_vndr/Makefile
+	  $(AUTOMAKE) --foreign  keymap/sun_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/keymap/xfree86 b/xorg-server/xkbdata.src/keymap/xfree86
index e4255a633..8686f78d8 100644
--- a/xorg-server/xkbdata.src/keymap/xfree86
+++ b/xorg-server/xkbdata.src/keymap/xfree86
@@ -5,7 +5,7 @@ default xkb_keymap "us" {
     xkb_keycodes	{ include "xfree86"		};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "us(pc105)"		};
+    xkb_symbols		{ include "pc(pc105)"		};
     xkb_geometry	{ include "pc"			};
 };
 
@@ -14,21 +14,21 @@ xkb_keymap "ar" {
     xkb_keycodes	{ include "xfree86"		};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "en_US(pc105)+ar"	};
+    xkb_symbols		{ include "pc(pc105)+ara"	};
     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_symbols		{ include "pc(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_symbols		{ include "pc(pc105)+bg"	};
     xkb_geometry 	{ include "pc(pc102)"		};
 };
 // us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
@@ -36,7 +36,7 @@ xkb_keymap "br"	{
     xkb_keycodes	{ include "xfree86"	};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "us(pc101)+br"	};
+    xkb_symbols		{ include "pc(pc105)+br"	};
     xkb_geometry 	{ include "pc(abnt2)"		};
 };
 // cz and sk keymaps by Kamil Toman (ktoman@email.cz) 
@@ -46,98 +46,98 @@ xkb_keymap "cz" {
     xkb_keycodes	{ include "xfree86"		};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "en_US(pc105)+cz"	};
+    xkb_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(pc105)+us(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_symbols 	{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols         { include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(pc105)+it"	};
     xkb_geometry 	{ include "pc(pc102)"		};
 };
 xkb_keymap "jp106" {
@@ -151,56 +151,56 @@ xkb_keymap "lt"	{
     xkb_keycodes	{ include "xfree86"		};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "en_US(pc105)+lt"	};
+    xkb_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(pc105)+pt"	};
     xkb_geometry 	{ include "pc(pc102)"		};
 };
 // ro: additions by Cristian Gafton, <gafton@redhat.com>
@@ -208,49 +208,49 @@ xkb_keymap "ro" {
     xkb_keycodes	{ include "xfree86"			};
     xkb_types		{ include "default"			};
     xkb_compatibility	{ include "default"			};
-    xkb_symbols		{ include "en_US(pc101)+ro(pc101)"	};
+    xkb_symbols		{ include "pc(pc105)+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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(pc105)+si"	};
     xkb_geometry	{ include "pc(pc102)"		};
 };
 // cz and sk keymaps by Kamil Toman (ktoman@email.cz) 
@@ -260,7 +260,7 @@ xkb_keymap "sk" {
     xkb_keycodes	{ include "xfree86"		};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "en_US(pc105)+sk"	};
+    xkb_symbols		{ include "pc(pc105)+sk"	};
     xkb_geometry	{ include "pc"			};
 };
 // Additions by Emil Soleyman-Zomalan, <emil@nishra.com>
@@ -268,42 +268,42 @@ xkb_keymap "syr" {
     xkb_keycodes	{ include "xfree86"		};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default" 		};
-    xkb_symbols		{ include "en_US(pc105)+syr"	};
+    xkb_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(pc105)+uk)"	};
     xkb_geometry	{ include "pc(pc102)"		};
 };
 xkb_keymap "us_flexpro" {
@@ -335,7 +335,7 @@ xkb_keymap "uz" {
     xkb_keycodes	{ include "xfree86"		};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "en_US(pc105)+uz"	};
+    xkb_symbols		{ include "pc(pc105)+uz"	};
     xkb_geometry	{ include "pc(pc102)"		};
 };
 
@@ -344,34 +344,34 @@ 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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(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_symbols		{ include "pc(pc105)+sk(qwerty)"	};
     xkb_geometry	{ include "pc"			};
 };
diff --git a/xorg-server/xkbdata.src/po/Makefile.in.in b/xorg-server/xkbdata.src/po/Makefile.in.in
index c7e83022c..cc8a2227f 100644
--- a/xorg-server/xkbdata.src/po/Makefile.in.in
+++ b/xorg-server/xkbdata.src/po/Makefile.in.in
@@ -56,7 +56,7 @@ 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)
+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)
 
@@ -129,7 +129,7 @@ install-data-yes: all
 	done
 
 # Empty stubs to satisfy archaic automake needs
-dvi info tags TAGS ID:
+dvi info ctags tags CTAGS TAGS ID:
 
 # Define this as empty until I found a useful application.
 install-exec installcheck:
diff --git a/xorg-server/xkbdata.src/po/bg.po b/xorg-server/xkbdata.src/po/bg.po
index 351b69f66..9e149e6ac 100644
--- a/xorg-server/xkbdata.src/po/bg.po
+++ b/xorg-server/xkbdata.src/po/bg.po
@@ -1,15 +1,16 @@
 # Bulgarian translation of xkeyboard-config.
-# Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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, 2009.
+# Alexander Shopov <ash@kambanaria.org>, 2002, 2005, 2006, 2007, 2008, 2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-1.6.99\n"
+"Project-Id-Version: xkeyboard-config-1.8\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2009-09-15 23:31+0100\n"
-"PO-Revision-Date: 2009-09-19 11:42+0300\n"
-"Last-Translator: Alexander Shopov <ash@contact.bg>\n"
+"POT-Creation-Date: 2010-01-16 18:08+0000\n"
+"PO-Revision-Date: 2010-01-17 16:03+0200\n"
+"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -357,791 +358,791 @@ msgid "BTC 9116U Mini Wireless Internet and Gaming"
 msgstr "BTC 9116U Mini Wireless Internet and Gaming (безжична, за Интернет и игри)"
 
 #: ../rules/base.xml.in.h:86
-msgid "Baltic+"
-msgstr "Baltic+"
-
-#: ../rules/base.xml.in.h:87
 msgid "Ban"
 msgstr "Бан"
 
-#: ../rules/base.xml.in.h:88
+#: ../rules/base.xml.in.h:87
 msgid "Bangladesh"
 msgstr "бангладешска"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:88
 msgid "Bashkirian"
 msgstr "башкирска"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:89
 msgid "Bel"
 msgstr "Бел"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:90
 msgid "Belarus"
 msgstr "беларуска"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:91
 msgid "Belgium"
 msgstr "белгийска"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:92
 msgid "BenQ X-Touch"
 msgstr "BenQ X-Touch"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:93
 msgid "BenQ X-Touch 730"
 msgstr "BenQ X-Touch 730"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:94
 msgid "BenQ X-Touch 800"
 msgstr "BenQ X-Touch 800"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:95
 msgid "Bengali"
 msgstr "бенгалска"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:96
 msgid "Bengali Probhat"
 msgstr "бенгалска — пробхат"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:97
 msgid "Bepo, ergonomic, Dvorak way"
 msgstr "Bepo, ергономична, по Дворак"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:98
 msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
 msgstr "Bepo, ергономична, по Дворак, само латиница-9"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:99
 msgid "Bgr"
 msgstr "Бъл"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:100
 msgid "Bhu"
 msgstr "Бут"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:101
 msgid "Bhutan"
 msgstr "бутанска"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:102
 msgid "Biblical Hebrew (Tiro)"
 msgstr "библейски иврит (Тиро)"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:103
 msgid "Bih"
 msgstr "БиХ"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:104
 msgid "Blr"
 msgstr "Бел"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:105
 msgid "Bosnia and Herzegovina"
 msgstr "босненска"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Двата Alt-а заедно"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Двата Ctrl-а заедно"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Двата Shift-а заедно"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:109
 msgid "Bra"
 msgstr "Бра"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:110
 msgid "Braille"
 msgstr "брайл"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:111
 msgid "Brazil"
 msgstr "бразилска"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:112
 msgid "Breton"
 msgstr "бретонска"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:113
 msgid "Brl"
 msgstr "Брй"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:114
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet Keyboard (за Интернет)"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:115
 msgid "Buckwalter"
 msgstr "Buckwalter"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:116
 msgid "Bulgaria"
 msgstr "българска"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:117
 msgid "CRULP"
 msgstr "CRULP (урду)"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:118
 msgid "Cambodia"
 msgstr "камбоджанска"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:119
 msgid "Can"
 msgstr "Кан"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:120
 msgid "Canada"
 msgstr "канадска"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:121
 msgid "Caps Lock"
 msgstr "CapsLock"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:122
 msgid "CapsLock"
 msgstr "CapsLock"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:123
 msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
 msgstr "CapsLock (към първата подредба), Shift+CapsLock (към последната)"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:124
 msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
 msgstr "CapsLock (докато е натиснат), Alt+CapsLock замества CapsLock"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:125
 msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
 msgstr "CapsLock работи като Shift със заключване. Shift временно отменя CapsLock"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:126
 msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
 msgstr "CapsLock работи като Shift със заключване. Shift не влияе на CapsLock"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:127
 msgid "CapsLock is disabled"
 msgstr "CapsLock е изключен"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:128
 msgid "CapsLock key behavior"
 msgstr "Поведение на CapsLock"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:129
 msgid "CapsLock toggles Shift so all keys are affected"
 msgstr "CapsLock сменя състоянието Shift за всички клавиши"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:130
 msgid "CapsLock toggles normal capitalization of alphabetic characters"
 msgstr "CapsLock сменя състоянието Shift само на буквените клавиши"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:131
 msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
 msgstr "CapsLock използва вътрешна промяна на регистъра. Shift временно отменя CapsLock"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:132
 msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
 msgstr "CapsLock използва вътрешна промяна на регистъра. Shift не влияе на CapsLock"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:133
 msgid "Catalan variant with middle-dot L"
 msgstr "каталунски вариант с Ŀ (с точка в средата)"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:134
 msgid "Cedilla"
 msgstr "седий"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:135
 msgid "Che"
 msgstr "Чех"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:136
 msgid "Cherokee"
 msgstr "черокска"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:137
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:138
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:139
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (алтернативен вариант)"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:140
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:141
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:142
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:143
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:144
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet Keyboard (за Интернет)"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:145
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:146
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:147
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:148
 msgid "China"
 msgstr "Кит"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:149
 msgid "Chuvash"
 msgstr "чувашка"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:150
 msgid "Chuvash Latin"
 msgstr "чувашка, латиница"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:151
 msgid "Classic"
 msgstr "класическа"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:152
 msgid "Classic Dvorak"
 msgstr "класическа, Дворак"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:153
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:154
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:155
 msgid "Colemak"
 msgstr "коулмак"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:156
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access Keyboard (за лесен достъп)"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard (за Интернет, 13 допълнителни клавиша)"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (за Интернет, 18 допълнителни клавиша)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (за Интернет, 7 допълнителни клавиша)"
 
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:160
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq Keyboard"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:161
 msgid "Compose key position"
 msgstr "Положение на Compose"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:162
 msgid "Congo, Democratic Republic of the"
 msgstr "конгоанска (ДРК)"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Control+Alt+Backspace"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:164
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "И двата Alt-а са Control, Win е Alt"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:165
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "И двата Win-а са Control (както и клавишите Ctrl)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000 (безжична)"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Dobruca-1 Q)"
 msgstr "татарска (Крим) (Dobruca-1 Q)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Dobruca-2 Q)"
 msgstr "татарска (Крим) (Dobruca-2 Q)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "татарска (Крим) (турско Alt-Q)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:170
 msgid "Crimean Tatar (Turkish F)"
 msgstr "татарска (Крим) (турско F)"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:171
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "татарска (Крим) (турско Q)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:172
 msgid "Croatia"
 msgstr "хърватска"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:173
 msgid "Ctrl key position"
 msgstr "Положение на Ctrl"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:174
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:175
 msgid "Cyrillic"
 msgstr "кирилска"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:176
 msgid "Cyrillic with guillemets"
 msgstr "кирилска с френски кавички"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:177
 msgid "Cyrillic, Z and ZHE swapped"
 msgstr "кирилска с разменени „З“ и „Ж“"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:178
 msgid "Cze"
 msgstr "Чеч"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:179
 msgid "Czechia"
 msgstr "чеченска"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:180
 msgid "DOS"
 msgstr "DOS"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:181
 msgid "DRC"
 msgstr "Кнг"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:182
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:183
 msgid "Dan"
 msgstr "Дат"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:184
 msgid "Dead acute"
 msgstr "„мъртво“ ударение"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:185
 msgid "Dead grave acute"
 msgstr "„мъртво“ тежко ударение"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:186
 msgid "Default numeric keypad keys"
 msgstr "Стандартни клавиши на цифровата клавиатура"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:187
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:188
 msgid "Dell 101-key PC"
 msgstr "Клавиатура на Dell със 101 клавиша за PC"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:189
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx (за мобилен компютър)"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:190
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell Laptop/notebook Precision M series (за мобилен компютър)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:191
 msgid "Dell Latitude series laptop"
 msgstr "За преносим компютър Dell Latitude"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:192
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:193
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:194
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:195
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB Multimedia Keybard (за мултимедия)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:196
 msgid "Denmark"
 msgstr "датска"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:197
 msgid "Deu"
 msgstr "Нем"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:198
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop Keyboard (безжична)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:199
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801/9802 series"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:200
 msgid "Dvorak"
 msgstr "Дворак"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:201
 msgid "Dvorak (UK Punctuation)"
 msgstr "Дворак, (пунктуация на Обединеното кралство)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:202
 msgid "Dvorak international"
 msgstr "Дворак, международна"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:203
 msgid "Dvorak, Polish quotes on key 1"
 msgstr "Дворак, полски кавички на клавиша „1“"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:204
 msgid "Dvorak, Polish quotes on quotemark key"
 msgstr "Дворак, полски кавички на клавиша за кавички"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:205
 msgid "E"
 msgstr "E"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:206
 msgid "Eastern"
 msgstr "източна"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:207
 msgid "Eliminate dead keys"
 msgstr "без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:208
 msgid "Enable extra typographic characters"
 msgstr "Допълнителни типографски знаци"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:209
 msgid "English"
 msgstr "английска"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:210
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:211
 msgid "Enter on keypad"
 msgstr "Enter на цифровата клавиатура"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:212
 msgid "Epo"
 msgstr "Есп"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:213
 msgid "Ergonomic"
 msgstr "ергономична"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:214
 msgid "Esp"
 msgstr "Исп"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:215
 msgid "Esperanto"
 msgstr "есперантска"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:216
 msgid "Est"
 msgstr "Ест"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:217
 msgid "Estonia"
 msgstr "естонска"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:218
 msgid "Eth"
 msgstr "Ети"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:219
 msgid "Ethiopia"
 msgstr "етиопска"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:220
 msgid "Evdev-managed keyboard"
 msgstr "Клавиатура управлявана от Evdev"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:221
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:222
 msgid "Ewe"
 msgstr "еве"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:223
 msgid "Extended"
 msgstr "разширена"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:224
 msgid "Extended - Winkeys"
 msgstr "разширена — Winkeys"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:225
 msgid "Extended Backslash"
 msgstr "удължен Backslash"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:226
 msgid "F-letter (F) variant"
 msgstr "вариант с буква F (F)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:227
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:228
 msgid "Fao"
 msgstr "Фар"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:229
 msgid "Faroe Islands"
 msgstr "фарьорска"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:230
 msgid "Fin"
 msgstr "Фин"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:231
 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:235
+#: ../rules/base.xml.in.h:234
 msgid "Four-level key with abstract separators"
 msgstr "Клавиш на четири нива с абстрактни разделители"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:235
 msgid "Four-level key with comma"
 msgstr "Клавиш на четири нива с десетична запетая"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:236
 msgid "Four-level key with dot"
 msgstr "Клавиш на четири нива с десетична точка"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:237
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Клавиш на четири нива с десетична точка, само латиница-9"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:238
 msgid "Four-level key with momayyez"
 msgstr "Клавиш на четири нива с арабска десетична запетая"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:239
 msgid "Fra"
 msgstr "Фре"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:240
 msgid "France"
 msgstr "френска"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:241
 msgid "French"
 msgstr "френска"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:242
 msgid "French (Macintosh)"
 msgstr "френска (за Macintosh)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:243
 msgid "French (legacy)"
 msgstr "френска (остаряла)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:244
 msgid "French Dvorak"
 msgstr "френска Дворак"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:245
 msgid "French, Sun dead keys"
 msgstr "френска, с „мъртвите“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:246
 msgid "French, eliminate dead keys"
 msgstr "френска, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:247
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO laptop (за мобилен компютър)"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:248
 msgid "Fula"
 msgstr "фула"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:249
 msgid "GBr"
 msgstr "ВБр"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:250
 msgid "Ga"
 msgstr "га"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:251
 msgid "Generic 101-key PC"
 msgstr "Стандартна клавиатура за PC със 101 клавиша"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:252
 msgid "Generic 102-key (Intl) PC"
 msgstr "Стандартна клавиатура за PC със 102 клавиша (международна)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:253
 msgid "Generic 104-key PC"
 msgstr "Стандартна клавиатура за PC със 104 клавиша"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:254
 msgid "Generic 105-key (Intl) PC"
 msgstr "Стандартна клавиатура за PC със 105 клавиша (международна)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:255
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:256
 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:258
+#: ../rules/base.xml.in.h:257
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:258
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:259
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:260
 msgid "Geo"
 msgstr "Гру"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:261
 msgid "Georgia"
 msgstr "грузинска"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:262
 msgid "Georgian"
 msgstr "грузинска"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:263
 msgid "Georgian AZERTY Tskapo"
 msgstr "грузинска, цкапо azerty"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:264
 msgid "German (Macintosh)"
 msgstr "немска (за Macintosh)"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:265
 msgid "German, Sun dead keys"
 msgstr "немска, с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:266
 msgid "German, eliminate dead keys"
 msgstr "немска, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:267
 msgid "Germany"
 msgstr "немска"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:268
 msgid "Gha"
 msgstr "Ган"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:269
 msgid "Ghana"
 msgstr "ганийска"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:270
 msgid "Gre"
 msgstr "Гръ"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:271
 msgid "Greece"
 msgstr "гръцка"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:272
 msgid "Group toggle on multiply/divide key"
 msgstr "сменяне на състоянието при натискането на умножение/деление"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:273
 msgid "Gui"
 msgstr "гвй"
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:274
 msgid "Guinea"
 msgstr "гвинейска"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:275
 msgid "Gujarati"
 msgstr "гуджарати"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:276
 msgid "Gurmukhi"
 msgstr "гурмуки"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:277
 msgid "Gurmukhi Jhelum"
 msgstr "гурмуки джелум"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:278
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:279
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking Keyboard (за весело хакерстване)"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:280
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Happy Hacking Keyboard for Mac (за весело хакерстване)"
 
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:281
 msgid "Hausa"
 msgstr "хауска"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:282
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard (за Интернет)"
 
+#: ../rules/base.xml.in.h:283
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard Mini 110 Notebook (за мобилен компютър)"
+
 #: ../rules/base.xml.in.h:284
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
@@ -1239,293 +1240,293 @@ msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:308
-msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl (международна)"
-
-#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:310
 msgid "ISO Alternate"
 msgstr "ISO (алтернативна)"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:311
 msgid "Iceland"
 msgstr "исландска"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:312
 msgid "Igbo"
 msgstr "игбо"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:313
 msgid "Include dead tilde"
 msgstr "включване на „мъртва“ тилда"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:314
 msgid "Ind"
 msgstr "Инд"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:315
 msgid "India"
 msgstr "индийска"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:316
 msgid "International (AltGr dead keys)"
 msgstr "международна, с „мъртви“ клавиши чрез AltGr"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:317
 msgid "International (with dead keys)"
 msgstr "международна, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:318
 msgid "Inuktitut"
 msgstr "ескимоска"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:319
 msgid "Iran"
 msgstr "иранска"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:320
 msgid "Iraq"
 msgstr "иракска"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:321
 msgid "Ireland"
 msgstr "ирландска"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:322
 msgid "Irl"
 msgstr "Ирл"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:323
 msgid "Irn"
 msgstr "Ирн"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:324
 msgid "Irq"
 msgstr "Ирк"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:325
 msgid "Isl"
 msgstr "Исл"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:326
 msgid "Isr"
 msgstr "Изр"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:327
 msgid "Israel"
 msgstr "израелска"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:328
 msgid "Ita"
 msgstr "Ита"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:329
 msgid "Italy"
 msgstr "италианска"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:330
 msgid "Japan"
 msgstr "японска"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:331
 msgid "Japan (PC-98xx Series)"
 msgstr "японска, серии PC-98xx"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:332
 msgid "Japanese keyboard options"
 msgstr "Настройки за японска клавиатура"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:333
 msgid "Jpn"
 msgstr "Япо"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:334
 msgid "Kalmyk"
 msgstr "калмишка"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:335
 msgid "Kana"
 msgstr "японска сричкова (кана)"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:336
 msgid "Kana Lock key is locking"
 msgstr "Клавишът Lock на кана заключва"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:337
 msgid "Kannada"
 msgstr "канареска"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:338
 msgid "Kashubian"
 msgstr "кашубска"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:339
 msgid "Kaz"
 msgstr "Каз"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:340
 msgid "Kazakh with Russian"
 msgstr "казахска с руски букви"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:341
 msgid "Kazakhstan"
 msgstr "казахска"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:342
 msgid "Key sequence to kill the X server"
 msgstr "Клавишна комбинация за убиването на X сървъра"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:343
 msgid "Key to choose 3rd level"
 msgstr "Клавиш за избор третото ниво"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:344
 msgid "Key(s) to change layout"
 msgstr "Клавиш(и) за смяна на подредбата"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:345
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:346
 msgid "Kgz"
 msgstr "Крг"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:347
 msgid "Khm"
 msgstr "Кам"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:348
 msgid "Komi"
 msgstr "комска"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:349
 msgid "Kor"
 msgstr "Кор"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:350
 msgid "Korea, Republic of"
 msgstr "корейска (Република Корея)"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:351
 msgid "Ktunaxa"
 msgstr "ктунакса"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:352
 msgid "Kurdish, (F)"
 msgstr "кюрдска, (Ф)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:353
 msgid "Kurdish, Arabic-Latin"
 msgstr "кюрдска, арабски и латински букви"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:354
 msgid "Kurdish, Latin Alt-Q"
 msgstr "кюрдска, латинско Alt-Q"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:355
 msgid "Kurdish, Latin Q"
 msgstr "кюрдска, латинско Q"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:356
 msgid "Kyrgyzstan"
 msgstr "киргистанска"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:357
 msgid "LAm"
 msgstr "ЛАм"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:358
 msgid "LEKP"
 msgstr "LEKP"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:359
 msgid "LEKPa"
 msgstr "LEKPa"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:360
 msgid "Lao"
 msgstr "Лао"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:361
 msgid "Laos"
 msgstr "лаоска"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:362
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Laptop/notebook Compaq Laptop Keyboard (за мобилен компютър, напр. Armada)"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:363
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Laptop/notebook Compaq Internet Keyboard (за мобилен компютър, напр. Presario, и Интернет)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:364
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Laptop/notebook eMachines m68xx (за мобилен компютър)"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:365
 msgid "Latin"
 msgstr "латинска"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:366
 msgid "Latin American"
 msgstr "латиноамериканска"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:367
 msgid "Latin Unicode"
 msgstr "латинска за Уникод"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:368
 msgid "Latin Unicode qwerty"
 msgstr "латинска за Уникод (qwerty)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:369
 msgid "Latin qwerty"
 msgstr "латинска (qwerty)"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:370
 msgid "Latin unicode"
 msgstr "латинска за Уникод"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:371
 msgid "Latin unicode qwerty"
 msgstr "латинска за Уникод, qwerty"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:372
 msgid "Latin with guillemets"
 msgstr "латинска с френски кавички"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:373
 msgid "Latvia"
 msgstr "латвийска"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:374
 msgid "Lav"
 msgstr "Лат"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:375
 msgid "Left Alt"
 msgstr "Левият Alt"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:376
 msgid "Left Alt (while pressed)"
 msgstr "Левият Alt (докато е натиснат)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:377
 msgid "Left Alt is swapped with Left Win"
 msgstr "Левият Alt е разменен с левия Win"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:378
 msgid "Left Ctrl"
 msgstr "Левият Ctrl"
 
+#: ../rules/base.xml.in.h:379
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr "Левият Ctrl (към първата подредба), десният Ctrl (към последната)"
+
 #: ../rules/base.xml.in.h:380
 msgid "Left Ctrl+Left Shift"
 msgstr "Левият Ctrl+левият Shift"
@@ -2160,608 +2161,616 @@ msgid "Right Ctrl as Right Alt"
 msgstr "Десният Ctrl е десен Alt"
 
 #: ../rules/base.xml.in.h:539
+msgid "Right Ctrl+Right Shift"
+msgstr "Десният Ctrl+десният Shift"
+
+#: ../rules/base.xml.in.h:540
 msgid "Right Shift"
 msgstr "Десният Shift"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:541
 msgid "Right Win"
 msgstr "Десният Win"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:542
 msgid "Right Win (while pressed)"
 msgstr "Десният Win (докато е натиснат)"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:543
 msgid "Right hand"
 msgstr "за десничари"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:544
 msgid "Right handed Dvorak"
 msgstr "Дворак за десничари"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:545
 msgid "Romania"
 msgstr "румънска"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:546
 msgid "Romanian keyboard with German letters"
 msgstr "румънска клавиатура с немски букви"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:547
 msgid "Romanian keyboard with German letters, eliminate dead keys"
 msgstr "румънска клавиатура с немски букви, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:548
 msgid "Rou"
 msgstr "Рум"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:549
 msgid "Rus"
 msgstr "Рус"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:550
 msgid "Russia"
 msgstr "руска"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:551
 msgid "Russian"
 msgstr "руска"
 
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:552
 msgid "Russian phonetic"
 msgstr "руска фонетична"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:553
 msgid "Russian phonetic Dvorak"
 msgstr "руска фонетична, Дворак"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:554
 msgid "Russian phonetic, eliminate dead keys"
 msgstr "руска фонетична, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:555
 msgid "Russian with Kazakh"
 msgstr "руска с казахски букви"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:556
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard (безжична, за мултимедия)"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:557
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:558
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:559
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:560
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:560 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:7
 msgid "SRB"
 msgstr "Срб"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:562
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500 (ергономична)"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:563
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:564
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:565
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:566
 msgid "Scroll Lock"
 msgstr "ScrollLock"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:567
 msgid "ScrollLock"
 msgstr "ScrollLock"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:568
 msgid "Secwepemctsin"
 msgstr "шъкуъпмъктчин"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:569
 msgid "Semi-colon on third level"
 msgstr "Точка и запетая на третото ниво"
 
-#: ../rules/base.xml.in.h:569 ../rules/base.extras.xml.in.h:8
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:8
 msgid "Serbia"
 msgstr "сръбска"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:571
 msgid "Shift cancels CapsLock"
 msgstr "Shift отменя CapsLock"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:572
 msgid "Shift does not cancel NumLock, chooses 3d level instead"
 msgstr "Shift не отменя CapsLock, а избира третото ниво"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:573
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Shift за цифровата клавиатура както в MS Windows"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:574
 msgid "Shift+CapsLock"
 msgstr "Shift+CapsLock"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:575
 msgid "Simple"
 msgstr "Обикновена"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:576
 msgid "Slovakia"
 msgstr "словашка"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:577
 msgid "Slovenia"
 msgstr "словенска"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:578
 msgid "South Africa"
 msgstr "южноафриканска"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:579
 msgid "Southern Uzbek"
 msgstr "южно узбекска"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:580
 msgid "Spain"
 msgstr "испанска"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:581
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Специалните комбинации (Ctrl+Alt+&lt;клавиш&gt;) се обработват от сървъра"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:582
 msgid "SrL"
 msgstr "Шри"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:583
 msgid "Sri Lanka"
 msgstr "шриланкска"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:584
 msgid "Standard"
 msgstr "стандартна"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:585
 msgid "Standard (Cedilla)"
 msgstr "стандартна (седий)"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:587
 msgid "Standard RSTU"
 msgstr "стандартна украинска"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:589
 msgid "Standard RSTU on Russian layout"
 msgstr "стандартна украинска, руска подредба"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:590
 msgid "Sun Type 5/6"
 msgstr "На Sun, вид 5/6"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:591
 msgid "Sun dead keys"
 msgstr "Sun, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:592
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power Multimedia Keyboard (за мултимедия)"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:593
 msgid "Svdvorak"
 msgstr "Свдворак"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:594
 msgid "Svk"
 msgstr "Свш"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:595
 msgid "Svn"
 msgstr "Свн"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:596
 msgid "Swap Ctrl and CapsLock"
 msgstr "Размяна на Ctrl и CapsLock"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:597
 msgid "Swap ESC and CapsLock"
 msgstr "Размяна на Esc и CapsLock"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:598
 msgid "Swe"
 msgstr "Шве"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:599
 msgid "Sweden"
 msgstr "шведска"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:600
 msgid "Switzerland"
 msgstr "швейцарска"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:601
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (за таблет)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:602
 msgid "Syr"
 msgstr "Сир"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:603
 msgid "Syria"
 msgstr "сирийска"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:604
 msgid "Syriac"
 msgstr "сириакска (арамейска)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:605
 msgid "Syriac phonetic"
 msgstr "сириакска фонетична (арамейска)"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:606
 msgid "TIS-820.2538"
 msgstr "TIS-820.2538"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:607
 msgid "Tajikistan"
 msgstr "таджикска"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:608
 msgid "Tamil"
 msgstr "тамилска"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:609
 msgid "Tamil TAB Typewriter"
 msgstr "тамилска машинописна с табулация"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:610
 msgid "Tamil TSCII Typewriter"
 msgstr "тамилска машинописна — TSCII"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:611
 msgid "Tamil Unicode"
 msgstr "тамилска за Уникод"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:612
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:613
 msgid "Tatar"
 msgstr "татарска"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:614
 msgid "Telugu"
 msgstr "телугу"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:615
 msgid "Tha"
 msgstr "Тай"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:616
 msgid "Thailand"
 msgstr "тайландска"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:617
 msgid "Tibetan"
 msgstr "тибетска"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:618
 msgid "Tibetan (with ASCII numerals)"
 msgstr "тибетска (с цифри от ASCII)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:619
 msgid "Tifinagh"
 msgstr "тифинах"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:620
 msgid "Tifinagh Alternative"
 msgstr "алтернативна за тифинах"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:621
 msgid "Tifinagh Alternative Phonetic"
 msgstr "алтернативна, фонетична за тифинах"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:622
 msgid "Tifinagh Extended"
 msgstr "разширена за тифинах"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:623
 msgid "Tifinagh Extended Phonetic"
 msgstr "разширена фонетична за тифинах"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:624
 msgid "Tifinagh Phonetic"
 msgstr "фонетична за тифинах"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:625
 msgid "Tilde (~) variant"
 msgstr "вариант с тилда (~)"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:626
 msgid "Tjk"
 msgstr "Тдж"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:627
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "към съответния клавиш в Dvorak"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:628
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "към съответния клавиш Qwerty"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:629
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:630
 msgid "Traditional phonetic"
 msgstr "фонетична, традиционна"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:631
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:632
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:633
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic (безжична)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:634
 msgid "Tur"
 msgstr "Тур"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:635
 msgid "Turkey"
 msgstr "турска"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:636
 msgid "Turkmenistan"
 msgstr "туркменистанска"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:637
 msgid "Typewriter"
 msgstr "машинописна"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:638
+msgid "Typewriter, legacy"
+msgstr "машинописна (остаряла)"
+
+#: ../rules/base.xml.in.h:639
 msgid "UCW layout (accented letters only)"
 msgstr "Подредба UCW (само ударени букви)"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:640
 msgid "US keyboard with Bosnian digraphs"
 msgstr "американска с босненски диграфи"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:641
 msgid "US keyboard with Bosnian letters"
 msgstr "американска с босненски букви"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:642
 msgid "US keyboard with Croatian digraphs"
 msgstr "американска с хърватски диграфи"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:643
 msgid "US keyboard with Croatian letters"
 msgstr "американска с хърватски букви"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:644
 msgid "US keyboard with Estonian letters"
 msgstr "американска с естонски букви"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:645
 msgid "US keyboard with Italian letters"
 msgstr "американска с италиански букви"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:646
 msgid "US keyboard with Lithuanian letters"
 msgstr "американска с литовски букви"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:647
 msgid "US keyboard with Slovenian letters"
 msgstr "американска със словенски букви"
 
-#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:648 ../rules/base.extras.xml.in.h:9
 msgid "USA"
 msgstr "Аме"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:649
 msgid "Udmurt"
 msgstr "удмурт"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:650
 msgid "Ukr"
 msgstr "Укр"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:651
 msgid "Ukraine"
 msgstr "украинска"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:652
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Допълненията от Уникод (стрелки и математически операции)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:653
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Допълненията от Уникод (стрелки и математически операции). Операциите са на стандартното ниво"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:654
 msgid "UnicodeExpert"
 msgstr "експертна за Уникод"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:655
 msgid "United Kingdom"
 msgstr "британска"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:656
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:657
 msgid "Urdu, Alternative phonetic"
 msgstr "урду, фонетична, алтернативна"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:658
 msgid "Urdu, Phonetic"
 msgstr "урду, фонетична"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:659
 msgid "Urdu, Winkeys"
 msgstr "урду, клавиши Win"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:660
 msgid "Use Bosnian digraphs"
 msgstr "с босненски диграфи"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:661
 msgid "Use Croatian digraphs"
 msgstr "с хърватски диграфи"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:662
 msgid "Use guillemets for quotes"
 msgstr "със френски кавички"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:663
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Индикация чрез клавиатурен светодиод за смяна на подредбата"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:664
 msgid "Using space key to input non-breakable space character"
 msgstr "Генериране на интервал без разделяне с клавишa за интервал"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:665
 msgid "Usual space at any level"
 msgstr "Нормален интервал на всички нива"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:666
 msgid "Uzb"
 msgstr "Узб"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:667
 msgid "Uzbekistan"
 msgstr "узбекистанска"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:668
 msgid "Vietnam"
 msgstr "виетнамска"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:669
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 Internet Keyboard (за Интернет)"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:670
 msgid "Vnm"
 msgstr "Вие"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:671
 msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
 msgstr "Цифрова клавиатура — Wang 724, с допълненията от Уникод (стрелки и математически операции)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:672
 msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Цифрова клавиатура Wang 724, с допълненията от Уникод (стрелки и математически операции). Операциите са на стандартното ниво"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:673
 msgid "Wang model 724 azerty"
 msgstr "Wang model 724 azerty"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:674
 msgid "Western"
 msgstr "западна"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:675
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:676
 msgid "Winkeys"
 msgstr "клавиши Win"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:677
 msgid "With &lt;\\|&gt; key"
 msgstr "клавиш &lt;\\|&gt;"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:678
 msgid "With EuroSign on 5"
 msgstr "€ е при „5“"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:679
 msgid "With guillemets"
 msgstr "френски кавички"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:680
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard (за Интернет)"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:681
 msgid "Yakut"
 msgstr "якутска"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:682
 msgid "Yoruba"
 msgstr "йоруба"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:683
 msgid "Z and ZHE swapped"
 msgstr "разменени „З“ и „Ж“"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:684
 msgid "Zar"
 msgstr "ЮАф"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:685
 msgid "azerty"
 msgstr "azerty"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:686
 msgid "azerty/digits"
 msgstr "azerty/цифри"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:687
 msgid "digits"
 msgstr "цифри"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:688
 msgid "displaced semicolon and quote (obsolete)"
 msgstr "разменени точка и запетая и кавички (остаряла)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:689
 msgid "lyx"
 msgstr "lyx"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:690
 msgid "qwerty"
 msgstr "qwerty"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:691
 msgid "qwerty, extended Backslash"
 msgstr "qwerty с удължен Backslash"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:692
 msgid "qwerty/digits"
 msgstr "qwerty/цифри"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:693
 msgid "qwertz"
 msgstr "qwertz"
 
diff --git a/xorg-server/xkbdata.src/po/ca.po b/xorg-server/xkbdata.src/po/ca.po
index a293b5509..01b622fac 100644
--- a/xorg-server/xkbdata.src/po/ca.po
+++ b/xorg-server/xkbdata.src/po/ca.po
@@ -1,20 +1,20 @@
-# Translation of xkeyboard-config-1.6.99.po to Catalan
+# Translation of xkeyboard-config-1.8.po to Catalan
 # Copyright © 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the xkeyboard-config package.
 #
-# Josep Ma. Ferrer <txemaq@gmail.com>, 2007, 2008, 2009.
+# Josep Ma. Ferrer <txemaq@gmail.com>, 2007, 2008, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-1.6.99\n"
+"Project-Id-Version: xkeyboard-config-1.8\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2009-09-15 23:31+0100\n"
-"PO-Revision-Date: 2009-09-17 20:33+0200\n"
+"POT-Creation-Date: 2010-01-16 18:08+0000\n"
+"PO-Revision-Date: 2010-01-17 00:19+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.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"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../rules/base.xml.in.h:1
@@ -358,792 +358,792 @@ msgid "BTC 9116U Mini Wireless Internet and Gaming"
 msgstr "BTC 9116U Mini Wireless Internet and Gaming"
 
 #: ../rules/base.xml.in.h:86
-msgid "Baltic+"
-msgstr "Baltic+"
-
-#: ../rules/base.xml.in.h:87
 msgid "Ban"
 msgstr "Ban"
 
-#: ../rules/base.xml.in.h:88
+#: ../rules/base.xml.in.h:87
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:88
 msgid "Bashkirian"
 msgstr "Baixkir"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:89
 msgid "Bel"
 msgstr "Bel"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:90
 msgid "Belarus"
 msgstr "Bielorússia"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:91
 msgid "Belgium"
 msgstr "Bèlgica"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:92
 msgid "BenQ X-Touch"
 msgstr "BenQ X-Touch"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:93
 msgid "BenQ X-Touch 730"
 msgstr "BenQ X-Touch 730"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:94
 msgid "BenQ X-Touch 800"
 msgstr "BenQ X-Touch 800"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:95
 msgid "Bengali"
 msgstr "Bengalí"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:96
 msgid "Bengali Probhat"
 msgstr "Bengalí Probhat"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:97
 msgid "Bepo, ergonomic, Dvorak way"
 msgstr "Bepo, ergonòmic, tipus Dvorak"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:98
 msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
 msgstr "Bepo, ergonòmic, tipus Dvorak, només latin-9"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:99
 msgid "Bgr"
 msgstr "Bgr"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:100
 msgid "Bhu"
 msgstr "Bhu"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:101
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:102
 msgid "Biblical Hebrew (Tiro)"
 msgstr "Hebreu bíblic (Tiro)"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:103
 msgid "Bih"
 msgstr "Bih"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:104
 msgid "Blr"
 msgstr "Blr"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:105
 msgid "Bosnia and Herzegovina"
 msgstr "Bòsnia i Hercegovina"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Les dues tecles Alt juntes"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Les dues tecles Ctrl juntes"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Les dues tecles Maj juntes"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:109
 msgid "Bra"
 msgstr "Bra"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:110
 msgid "Braille"
 msgstr "Braille"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:111
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:112
 msgid "Breton"
 msgstr "Bretó"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:113
 msgid "Brl"
 msgstr "Brl"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:114
 msgid "Brother Internet Keyboard"
 msgstr "Teclat Brother Internet"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:115
 msgid "Buckwalter"
 msgstr "Buckwalter"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:116
 msgid "Bulgaria"
 msgstr "Bulgària"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:117
 msgid "CRULP"
 msgstr "CRULP"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:118
 msgid "Cambodia"
 msgstr "Cambodja"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:119
 msgid "Can"
 msgstr "Can"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:120
 msgid "Canada"
 msgstr "Canadà"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:121
 msgid "Caps Lock"
 msgstr "Bloq Majús"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:122
 msgid "CapsLock"
 msgstr "BloqMaj"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:123
 msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
 msgstr "BloqMaj (a la primera disposició), Maj+BloqMaj (a la darrera disposició)"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:124
 msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
 msgstr "BloqMaj (mentre està premuda), Alt+BloqMaj efectua l'acció de BloqMaj original"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:125
 msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
 msgstr "BloqMaj actua com a Maj amb bloqueig. Maj «pausa» BloqMaj"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:126
 msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
 msgstr "BloqMaj actua com a Maj amb bloqueig. Maj no afecta a BloqMaj"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:127
 msgid "CapsLock is disabled"
 msgstr "BloqMaj està deshabilitat"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:128
 msgid "CapsLock key behavior"
 msgstr "Comportament de la tecla BloqMaj"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:129
 msgid "CapsLock toggles Shift so all keys are affected"
 msgstr "BloqMaj commuta Maj, de manera que afecta totes les tecles"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:130
 msgid "CapsLock toggles normal capitalization of alphabetic characters"
 msgstr "BloqMaj commuta les majúscules normals dels caràcters alfabètics"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:131
 msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
 msgstr "BloqMaj usa internament les majúscules. Maj «pausa» BloqMaj"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:132
 msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
 msgstr "BloqMaj usa internament les majúscules. Maj no afecta BloqMaj"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:133
 msgid "Catalan variant with middle-dot L"
 msgstr "Variant catalana amb L amb punt volat"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:134
 msgid "Cedilla"
 msgstr "Trencat"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:135
 msgid "Che"
 msgstr "Che"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:136
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:137
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:138
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:139
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (opció alternativa)"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:140
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:141
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:142
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:143
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:144
 msgid "Chicony Internet Keyboard"
 msgstr "Teclat Chicony Internet"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:145
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:146
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:147
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:148
 msgid "China"
 msgstr "Xina"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:149
 msgid "Chuvash"
 msgstr "Chuvash"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:150
 msgid "Chuvash Latin"
 msgstr "Chuvash llatí"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:151
 msgid "Classic"
 msgstr "Clàssic"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:152
 msgid "Classic Dvorak"
 msgstr "Dvorak clàssic"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:153
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:154
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:155
 msgid "Colemak"
 msgstr "Colemak"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:156
 msgid "Compaq Easy Access Keyboard"
 msgstr "Teclat Compaq Easy Access"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Teclat Compaq Internet (13 tecles)"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Teclat Compaq Internet (18 tecles)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Teclat Compaq Internet (7 tecles)"
 
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:160
 msgid "Compaq iPaq Keyboard"
 msgstr "Teclat Compaq iPaq"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:161
 msgid "Compose key position"
 msgstr "Posició de la tecla Compose"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:162
 msgid "Congo, Democratic Republic of the"
 msgstr "Congo, República Democràtica del"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Retrocés"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:164
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "Control s'assigna a les tecles Alt, Alt s'assigna a les tecles Win"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:165
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "Control s'assigna a les tecles Win (i a les tecles Ctrl habituals)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Dobruca-1 Q)"
 msgstr "Tàtar de Crimea (Dobruca-1 Q)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Dobruca-2 Q)"
 msgstr "Tàtar de Crimea (Dobruca-2 Q)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Tàtar de Crimea (Turc Alt-Q)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:170
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Tàtar de Crimea (Turc F)"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:171
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Tàtar de Crimea (Turc Q)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:172
 msgid "Croatia"
 msgstr "Croàcia"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:173
 msgid "Ctrl key position"
 msgstr "Posició de la tecla Ctrl"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:174
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Maj"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:175
 msgid "Cyrillic"
 msgstr "Ciríl·lic"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:176
 msgid "Cyrillic with guillemets"
 msgstr "Ciríl·lic amb cometes angulars"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:177
 msgid "Cyrillic, Z and ZHE swapped"
 msgstr "Ciríl·lic, Z i ZHE intercanviades"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:178
 msgid "Cze"
 msgstr "Cze"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:179
 msgid "Czechia"
 msgstr "Txèquia"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:180
 msgid "DOS"
 msgstr "DOS"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:181
 msgid "DRC"
 msgstr "DRC"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:182
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:183
 msgid "Dan"
 msgstr "Dan"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:184
 msgid "Dead acute"
 msgstr "Accent mort"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:185
 msgid "Dead grave acute"
 msgstr "Accent greu mort"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:186
 msgid "Default numeric keypad keys"
 msgstr "Tecles predeterminades del teclat numèric"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:187
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:188
 msgid "Dell 101-key PC"
 msgstr "Dell PC 101 tecles"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:189
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Portàtil Dell Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:190
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Portàtil Dell sèrie Precision M"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:191
 msgid "Dell Latitude series laptop"
 msgstr "Portàtil Dell sèrie Latitude"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:192
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:193
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:194
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:195
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Teclat Dell USB Multimedia"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:196
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:197
 msgid "Deu"
 msgstr "Deu"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:198
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Teclat Dexxa Wireless Desktop"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:199
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond sèries 9801 / 9802"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:200
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:201
 msgid "Dvorak (UK Punctuation)"
 msgstr "Dvorak (Puntuació UK)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:202
 msgid "Dvorak international"
 msgstr "Dvorak internacional"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:203
 msgid "Dvorak, Polish quotes on key 1"
 msgstr "Dvorak, cometes poloneses a la tecla 1"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:204
 msgid "Dvorak, Polish quotes on quotemark key"
 msgstr "Dvorak, cometes poloneses a la tecla cometes"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:205
 msgid "E"
 msgstr "E"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:206
 msgid "Eastern"
 msgstr "Oriental"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:207
 msgid "Eliminate dead keys"
 msgstr "Elimina les tecles mortes"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:208
 msgid "Enable extra typographic characters"
 msgstr "Habilita els caràcters tipogràfics extres"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:209
 msgid "English"
 msgstr "Anglès"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:210
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:211
 msgid "Enter on keypad"
 msgstr "Retorn en el teclat numèric"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:212
 msgid "Epo"
 msgstr "Epo"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:213
 msgid "Ergonomic"
 msgstr "Ergonòmic"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:214
 msgid "Esp"
 msgstr "Esp"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:215
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:216
 msgid "Est"
 msgstr "Est"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:217
 msgid "Estonia"
 msgstr "Estònia"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:218
 msgid "Eth"
 msgstr "Eth"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:219
 msgid "Ethiopia"
 msgstr "Etiòpia"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:220
 msgid "Evdev-managed keyboard"
 msgstr "Teclat gestionat per «evdev»"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:221
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:222
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:223
 msgid "Extended"
-msgstr "Estés"
+msgstr "Ampliat"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:224
 msgid "Extended - Winkeys"
-msgstr "Estés - Tecles Win"
+msgstr "Ampliat - Tecles Win"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:225
 msgid "Extended Backslash"
 msgstr "Barra inversa estesa"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:226
 msgid "F-letter (F) variant"
 msgstr "Variant de lletra F (F)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:227
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:228
 msgid "Fao"
 msgstr "Fao"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:229
 msgid "Faroe Islands"
 msgstr "Illes Faroe"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:230
 msgid "Fin"
 msgstr "Fin"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:231
 msgid "Finland"
 msgstr "Finlàndia"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:234
 msgid "Four-level key with abstract separators"
 msgstr "Tecla de quatre nivells amb separadors abstractes"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:235
 msgid "Four-level key with comma"
 msgstr "Tecla de quatre nivells amb coma"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:236
 msgid "Four-level key with dot"
 msgstr "Tecla de quatre nivells amb punt"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:237
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Tecla de quatre nivells amb punt, restricció de latin-9"
 
 # Què collons és momayyez? jm
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:238
 msgid "Four-level key with momayyez"
 msgstr "Tecla de quatre nivells amb momayyez"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:239
 msgid "Fra"
 msgstr "Fra"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:240
 msgid "France"
 msgstr "França"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:241
 msgid "French"
 msgstr "Francès"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:242
 msgid "French (Macintosh)"
 msgstr "Francès (Macintosh)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:243
 msgid "French (legacy)"
 msgstr "Francès (llegat)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:244
 msgid "French Dvorak"
 msgstr "Francès Dvorak"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:245
 msgid "French, Sun dead keys"
 msgstr "Francès, tecles mortes de Sun"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:246
 msgid "French, eliminate dead keys"
 msgstr "Francès, sense tecles mortes"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:247
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO portàtil"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:248
 msgid "Fula"
 msgstr "Fula"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:249
 msgid "GBr"
 msgstr "GBr"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:250
 msgid "Ga"
 msgstr "Ga"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:251
 msgid "Generic 101-key PC"
 msgstr "PC genèric de 101 tecles"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:252
 msgid "Generic 102-key (Intl) PC"
 msgstr "PC genèric de 102 tecles (intl)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:253
 msgid "Generic 104-key PC"
 msgstr "PC genèric de 104 tecles"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:254
 msgid "Generic 105-key (Intl) PC"
 msgstr "PC genèric de 105 tecles (intl)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:255
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:256
 msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
 msgstr "Genius Comfy KB-16M / Teclat Genius MM KWD-910"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:257
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:258
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:259
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:260
 msgid "Geo"
 msgstr "Geo"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:261
 msgid "Georgia"
 msgstr "Geòrgia"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:262
 msgid "Georgian"
 msgstr "Georgià"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:263
 msgid "Georgian AZERTY Tskapo"
 msgstr "Georgià AZERTY Tskapo"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:264
 msgid "German (Macintosh)"
 msgstr "Alemany (Macintosh)"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:265
 msgid "German, Sun dead keys"
 msgstr "Alemany, tecles mortes de Sun"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:266
 msgid "German, eliminate dead keys"
 msgstr "Alemany, sense tecles mortes"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:267
 msgid "Germany"
 msgstr "Alemanya"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:268
 msgid "Gha"
 msgstr "Gha"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:269
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:270
 msgid "Gre"
 msgstr "Gre"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:271
 msgid "Greece"
 msgstr "Grècia"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:272
 msgid "Group toggle on multiply/divide key"
 msgstr "Commutació de grup en la tecla de multiplicació/divisió"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:273
 msgid "Gui"
 msgstr "Gui"
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:274
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:275
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:276
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:277
 msgid "Gurmukhi Jhelum"
 msgstr "Gurmukhi Jhelum"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:278
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:279
 msgid "Happy Hacking Keyboard"
 msgstr "Teclat Happy Hacking"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:280
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Teclat Happy Hacking per a Mac"
 
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:281
 msgid "Hausa"
 msgstr "Haussa"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:282
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Teclat Hewlett-Packard Internet"
 
+#: ../rules/base.xml.in.h:283
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard Mini 110 Notebook"
+
 #: ../rules/base.xml.in.h:284
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
@@ -1241,293 +1241,293 @@ msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:308
-msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-
-#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:310
 msgid "ISO Alternate"
 msgstr "Alternativa ISO"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:311
 msgid "Iceland"
 msgstr "Islàndia"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:312
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:313
 msgid "Include dead tilde"
 msgstr "Inclou la titlla morta"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:314
 msgid "Ind"
 msgstr "Ind"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:315
 msgid "India"
 msgstr "Índia"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:316
 msgid "International (AltGr dead keys)"
 msgstr "Internacional (tecles mortes AltGr)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:317
 msgid "International (with dead keys)"
 msgstr "Internacional (amb tecles mortes)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:318
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:319
 msgid "Iran"
 msgstr "Iran"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:320
 msgid "Iraq"
 msgstr "Iraq"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:321
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:322
 msgid "Irl"
 msgstr "Irl"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:323
 msgid "Irn"
 msgstr "Irn"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:324
 msgid "Irq"
 msgstr "Irq"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:325
 msgid "Isl"
 msgstr "Isl"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:326
 msgid "Isr"
 msgstr "Isr"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:327
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:328
 msgid "Ita"
 msgstr "Ita"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:329
 msgid "Italy"
 msgstr "Itàlia"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:330
 msgid "Japan"
 msgstr "Japó"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:331
 msgid "Japan (PC-98xx Series)"
 msgstr "Japó (sèries PC-98xx)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:332
 msgid "Japanese keyboard options"
 msgstr "Opcions del teclat japonès"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:333
 msgid "Jpn"
 msgstr "Jpn"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:334
 msgid "Kalmyk"
 msgstr "Calmuc"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:335
 msgid "Kana"
 msgstr "Kana"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:336
 msgid "Kana Lock key is locking"
 msgstr "La tecla de bloqueig Kana està blocant"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:337
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:338
 msgid "Kashubian"
 msgstr "Caixubi"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:339
 msgid "Kaz"
 msgstr "Kaz"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:340
 msgid "Kazakh with Russian"
 msgstr "Kazakh amb rus"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:341
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:342
 msgid "Key sequence to kill the X server"
 msgstr "Seqüència de tecles per a matar el servidor X"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:343
 msgid "Key to choose 3rd level"
 msgstr "Tecla per a seleccionar el 3r nivell"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:344
 msgid "Key(s) to change layout"
 msgstr "Tecla(es) per a canviar la disposició"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:345
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:346
 msgid "Kgz"
 msgstr "Kgz"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:347
 msgid "Khm"
 msgstr "Khm"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:348
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:349
 msgid "Kor"
 msgstr "Kor"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:350
 msgid "Korea, Republic of"
 msgstr "Corea, República de"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:351
 msgid "Ktunaxa"
 msgstr "Kutenai (Ktunaxa)"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:352
 msgid "Kurdish, (F)"
 msgstr "Kurd, (F)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:353
 msgid "Kurdish, Arabic-Latin"
 msgstr "Kurd, aràbic-llatí"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:354
 msgid "Kurdish, Latin Alt-Q"
 msgstr "Kurd, llatí Alt-Q"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:355
 msgid "Kurdish, Latin Q"
 msgstr "Kurd, llatí Q"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:356
 msgid "Kyrgyzstan"
 msgstr "Kirguizistan"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:357
 msgid "LAm"
 msgstr "LAm"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:358
 msgid "LEKP"
 msgstr "LEKP"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:359
 msgid "LEKPa"
 msgstr "LEKPa"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:360
 msgid "Lao"
 msgstr "Laosià"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:361
 msgid "Laos"
 msgstr "Laos"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:362
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Teclat de portàtil Compaq (p.ex. Armada)"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:363
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Teclat Internet de portàtil Compaq (p.ex. Presario)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:364
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Portàtil eMachines m68xx"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:365
 msgid "Latin"
 msgstr "Llatí"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:366
 msgid "Latin American"
 msgstr "Llatinoamericà"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:367
 msgid "Latin Unicode"
 msgstr "Llatí Unicode"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:368
 msgid "Latin Unicode qwerty"
 msgstr "Llatí Unicode qwerty"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:369
 msgid "Latin qwerty"
 msgstr "Llatí qwerty"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:370
 msgid "Latin unicode"
 msgstr "Llatí unicode"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:371
 msgid "Latin unicode qwerty"
 msgstr "Llatí unicode qwerty"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:372
 msgid "Latin with guillemets"
 msgstr "Llatí amb cometes angulars"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:373
 msgid "Latvia"
 msgstr "Letònia"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:374
 msgid "Lav"
 msgstr "Lav"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:375
 msgid "Left Alt"
 msgstr "Alt esquerra"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:376
 msgid "Left Alt (while pressed)"
 msgstr "Alt esquerra (mentre està premuda)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:377
 msgid "Left Alt is swapped with Left Win"
 msgstr "Alt esquerra està intercanviada amb la tecla Win esquerra"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:378
 msgid "Left Ctrl"
 msgstr "Ctrl esquerra"
 
+#: ../rules/base.xml.in.h:379
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr "Ctrl esquerra (a la primera disposició), Ctrl dreta (a la darrera disposició)"
+
 #: ../rules/base.xml.in.h:380
 msgid "Left Ctrl+Left Shift"
 msgstr "Ctrl esquerra + Maj esquerra"
@@ -1542,7 +1542,7 @@ msgstr "Win esquerra"
 
 #: ../rules/base.xml.in.h:383
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
-msgstr "Win esquerraj (a la primera disposició), Win/Menú dreta (a la darrera disposició)"
+msgstr "Win esquerra (a la primera disposició), Win/Menú dreta (a la darrera disposició)"
 
 #: ../rules/base.xml.in.h:384
 msgid "Left Win (while pressed)"
@@ -2162,608 +2162,616 @@ msgid "Right Ctrl as Right Alt"
 msgstr "Ctrl dreta com a Alt dreta"
 
 #: ../rules/base.xml.in.h:539
+msgid "Right Ctrl+Right Shift"
+msgstr "Ctrl dreta+Maj dreta"
+
+#: ../rules/base.xml.in.h:540
 msgid "Right Shift"
 msgstr "Maj dreta"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:541
 msgid "Right Win"
 msgstr "Win dreta"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:542
 msgid "Right Win (while pressed)"
 msgstr "Win dreta (mentre està premuda)"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:543
 msgid "Right hand"
 msgstr "Dretà"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:544
 msgid "Right handed Dvorak"
 msgstr "Dvorak dretà"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:545
 msgid "Romania"
 msgstr "Romania"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:546
 msgid "Romanian keyboard with German letters"
 msgstr "Teclat romanès amb lletres alemanyes"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:547
 msgid "Romanian keyboard with German letters, eliminate dead keys"
 msgstr "Teclat romanès amb lletres alemanyes, sense tecles mortes"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:548
 msgid "Rou"
 msgstr "Rou"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:549
 msgid "Rus"
 msgstr "Rus"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:550
 msgid "Russia"
 msgstr "Rússia"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:551
 msgid "Russian"
 msgstr "Rus"
 
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:552
 msgid "Russian phonetic"
 msgstr "Rus fonètic"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:553
 msgid "Russian phonetic Dvorak"
 msgstr "Rus fonètic Dvorak"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:554
 msgid "Russian phonetic, eliminate dead keys"
 msgstr "Rus fonètic, sense tecles mortes"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:555
 msgid "Russian with Kazakh"
 msgstr "Rus amb Kazakh"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:556
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "Teclat SILVERCREST Multimedia Wireless"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:557
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:558
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:559
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:560
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:560 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:7
 msgid "SRB"
 msgstr "SRB"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:562
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:563
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:564
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:565
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:566
 msgid "Scroll Lock"
 msgstr "Bloq Despl"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:567
 msgid "ScrollLock"
 msgstr "BloqDespl"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:568
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:569
 msgid "Semi-colon on third level"
 msgstr "Punt i coma al tercer nivell"
 
-#: ../rules/base.xml.in.h:569 ../rules/base.extras.xml.in.h:8
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:8
 msgid "Serbia"
 msgstr "Sèrbia"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:571
 msgid "Shift cancels CapsLock"
 msgstr "Maj cancel·la BloqMaj"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:572
 msgid "Shift does not cancel NumLock, chooses 3d level instead"
 msgstr "Maj no cancel·la BloqNúm, en el seu lloc selecciona el 3r nivell"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:573
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Maj amb el teclat numèric funciona com al MS Windows"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:574
 msgid "Shift+CapsLock"
 msgstr "Maj+BloqMaj"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:575
 msgid "Simple"
 msgstr "Senzill"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:576
 msgid "Slovakia"
 msgstr "Eslovàquia"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:577
 msgid "Slovenia"
 msgstr "Eslovènia"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:578
 msgid "South Africa"
-msgstr "Sudàfrica"
+msgstr "Sud-àfrica"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:579
 msgid "Southern Uzbek"
 msgstr "Uzbek del sud"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:580
 msgid "Spain"
 msgstr "Espanya"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:581
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Tecles especials (Ctrl+Alt+&lt;tecla&gt;) gestionades en un servidor"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:582
 msgid "SrL"
 msgstr "SrL"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:583
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:584
 msgid "Standard"
 msgstr "Estàndard"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:585
 msgid "Standard (Cedilla)"
 msgstr "Estàndard (ce trencada)"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:587
 msgid "Standard RSTU"
 msgstr "Estàndard RSTU"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:589
 msgid "Standard RSTU on Russian layout"
 msgstr "Estàndard RSTU en una disposició russa"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:590
 msgid "Sun Type 5/6"
 msgstr "Sun Type 5/6"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:591
 msgid "Sun dead keys"
 msgstr "Tecles mortes de Sun"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:592
 msgid "Super Power Multimedia Keyboard"
 msgstr "Teclat Super Power Multimedia"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:593
 msgid "Svdvorak"
 msgstr "Svdvorak"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:594
 msgid "Svk"
 msgstr "Svk"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:595
 msgid "Svn"
 msgstr "Svn"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:596
 msgid "Swap Ctrl and CapsLock"
 msgstr "Intercanvia Ctrl i BloqMaj"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:597
 msgid "Swap ESC and CapsLock"
 msgstr "Intercanvia Esc i BloqMaj"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:598
 msgid "Swe"
 msgstr "Swe"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:599
 msgid "Sweden"
 msgstr "Suècia"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:600
 msgid "Switzerland"
 msgstr "Suïssa"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:601
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:602
 msgid "Syr"
 msgstr "Syr"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:603
 msgid "Syria"
 msgstr "Síria"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:604
 msgid "Syriac"
 msgstr "Siri"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:605
 msgid "Syriac phonetic"
 msgstr "Siri fonètic"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:606
 msgid "TIS-820.2538"
 msgstr "TIS-820.2538"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:607
 msgid "Tajikistan"
 msgstr "Tadjikistan"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:608
 msgid "Tamil"
 msgstr "Tàmil"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:609
 msgid "Tamil TAB Typewriter"
 msgstr "Tàmil TAB Typewriter"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:610
 msgid "Tamil TSCII Typewriter"
 msgstr "Tàmil TSCII Typewriter"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:611
 msgid "Tamil Unicode"
 msgstr "Tàmil Unicode"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:612
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:613
 msgid "Tatar"
 msgstr "Tàtar"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:614
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:615
 msgid "Tha"
 msgstr "Tha"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:616
 msgid "Thailand"
 msgstr "Tailàndia"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:617
 msgid "Tibetan"
 msgstr "Tibetà"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:618
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibetà (amb nombres ASCII)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:619
 msgid "Tifinagh"
 msgstr "Tifinagh"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:620
 msgid "Tifinagh Alternative"
 msgstr "Tifinagh alternativa"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:621
 msgid "Tifinagh Alternative Phonetic"
 msgstr "Tifinagh fonètic alternativa"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:622
 msgid "Tifinagh Extended"
 msgstr "Tifinagh ampliada"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:623
 msgid "Tifinagh Extended Phonetic"
 msgstr "Tifinagh fonètic ampliada"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:624
 msgid "Tifinagh Phonetic"
 msgstr "Tifinagh fonètica"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:625
 msgid "Tilde (~) variant"
 msgstr "Variant titlla (~)"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:626
 msgid "Tjk"
 msgstr "Tjk"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:627
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "A la tecla corresponent en un teclat Dvorak."
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:628
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "A la tecla corresponent en un teclat Qwerty."
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:629
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:630
 msgid "Traditional phonetic"
 msgstr "Fonètic tradicional"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:631
 msgid "Trust Direct Access Keyboard"
 msgstr "Teclat Trust Direct Access"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:632
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:633
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Teclat Trust Wireless Classic"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:634
 msgid "Tur"
 msgstr "Tur"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:635
 msgid "Turkey"
 msgstr "Turquia"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:636
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:637
 msgid "Typewriter"
 msgstr "Màquina d'escriure"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:638
+msgid "Typewriter, legacy"
+msgstr "Màquina d'escriure, llegat"
+
+#: ../rules/base.xml.in.h:639
 msgid "UCW layout (accented letters only)"
 msgstr "Disposició UCW (només lletres accentuades)"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:640
 msgid "US keyboard with Bosnian digraphs"
 msgstr "Teclat US amb dígrafs bosnians"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:641
 msgid "US keyboard with Bosnian letters"
 msgstr "Teclat US amb lletres bosnianes"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:642
 msgid "US keyboard with Croatian digraphs"
 msgstr "Teclat US amb dígrafs croats"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:643
 msgid "US keyboard with Croatian letters"
 msgstr "Teclat US amb lletres croates"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:644
 msgid "US keyboard with Estonian letters"
-msgstr "Teclat US amb lletres estònies"
+msgstr "Teclat US amb lletres estonianes"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:645
 msgid "US keyboard with Italian letters"
 msgstr "Teclat US amb lletres italianes"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:646
 msgid "US keyboard with Lithuanian letters"
 msgstr "Teclat US amb dígrafs lituans"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:647
 msgid "US keyboard with Slovenian letters"
 msgstr "Teclat US amb lletres eslovenes"
 
-#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:648 ../rules/base.extras.xml.in.h:9
 msgid "USA"
 msgstr "EUA"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:649
 msgid "Udmurt"
 msgstr "Udmurt"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:650
 msgid "Ukr"
 msgstr "Ukr"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:651
 msgid "Ukraine"
 msgstr "Ucraïna"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:652
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Addicions Unicode (fletxes i operadors matemàtics)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:653
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Addicions Unicode (fletxes i operadors matemàtics). Els operadors matemàtics al nivell predeterminat"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:654
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:655
 msgid "United Kingdom"
 msgstr "Regne Unit"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:656
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:657
 msgid "Urdu, Alternative phonetic"
 msgstr "Urdú, fonètic alternatiu"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:658
 msgid "Urdu, Phonetic"
 msgstr "Urdú, fonètic"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:659
 msgid "Urdu, Winkeys"
 msgstr "Urdú, tecles Win"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:660
 msgid "Use Bosnian digraphs"
 msgstr "Usa dígrafs bosnians"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:661
 msgid "Use Croatian digraphs"
 msgstr "Usa dígrafs croats"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:662
 msgid "Use guillemets for quotes"
 msgstr "Usa cometes angulars per les cometes"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:663
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Usa el LED del teclat per a mostrar la disposició alternativa"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:664
 msgid "Using space key to input non-breakable space character"
 msgstr "Usa la tecla d'espai per a introduir un caràcter d'espai sense salt"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:665
 msgid "Usual space at any level"
 msgstr "Espai normal en qualsevol nivell"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:666
 msgid "Uzb"
 msgstr "Uzb"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:667
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:668
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:669
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "Teclat ViewSonic KU-306 Internet"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:670
 msgid "Vnm"
 msgstr "Vnm"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:671
 msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
 msgstr "Teclat numèric Wang 724 amb addicions Unicode (fletxes i operadors matemàtics)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:672
 msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Teclat numèric Wang 724 amb addicions Unicode (fletxes i operadors matemàtics). Els operadors matemàtics en el nivell per defecte"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:673
 msgid "Wang model 724 azerty"
 msgstr "Wang model 724 azerty"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:674
 msgid "Western"
 msgstr "Occidental"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:675
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:676
 msgid "Winkeys"
 msgstr "Tecles Win"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:677
 msgid "With &lt;\\|&gt; key"
 msgstr "Amb la tecla &lt;\\|&gt;"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:678
 msgid "With EuroSign on 5"
 msgstr "Amb el signe de l'euro al 5"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:679
 msgid "With guillemets"
 msgstr "Amb cometes angulars"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:680
 msgid "Yahoo! Internet Keyboard"
 msgstr "Teclat Yahoo! Internet"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:681
 msgid "Yakut"
 msgstr "Iacut"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:682
 msgid "Yoruba"
 msgstr "Ioruba"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:683
 msgid "Z and ZHE swapped"
 msgstr "Z i ZHE intercanviades"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:684
 msgid "Zar"
 msgstr "Zar"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:685
 msgid "azerty"
 msgstr "azerty"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:686
 msgid "azerty/digits"
 msgstr "azerty/dígits"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:687
 msgid "digits"
 msgstr "dígits"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:688
 msgid "displaced semicolon and quote (obsolete)"
 msgstr "punt i coma i cometa desplaçats (obsolet)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:689
 msgid "lyx"
 msgstr "lyx"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:690
 msgid "qwerty"
 msgstr "qwerty"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:691
 msgid "qwerty, extended Backslash"
 msgstr "qwerty, barra inversa ampliada"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:692
 msgid "qwerty/digits"
 msgstr "qwerty/dígits"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:693
 msgid "qwertz"
 msgstr "qwertz"
 
@@ -2790,3 +2798,9 @@ msgstr "Internacional (combinació Unicode AltGr)"
 #: ../rules/base.extras.xml.in.h:6
 msgid "International (AltGr Unicode combining, alternative)"
 msgstr "Internacional (combinació Unicode AltGr, alternativa)"
+
+#~ msgid "Baltic+"
+#~ msgstr "Baltic+"
+
+#~ msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+#~ msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
diff --git a/xorg-server/xkbdata.src/po/cs.po b/xorg-server/xkbdata.src/po/cs.po
index 027eaec31..82ec5b3cd 100644
--- a/xorg-server/xkbdata.src/po/cs.po
+++ b/xorg-server/xkbdata.src/po/cs.po
@@ -1,20 +1,21 @@
 # Translation of xkeyboard-config to Czech.
-# Copyright (C) 2007, 2008, 2009 the author(s) of xkeyboard-config.
+# Copyright (C) 2007, 2008, 2009, 2010 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, 2009.
+# Petr Kovar <pknbe@volny.cz>, 2007, 2008, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-1.6.99\n"
+"Project-Id-Version: xkeyboard-config-1.8\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2009-09-15 23:31+0100\n"
-"PO-Revision-Date: 2009-09-21 01:35+0200\n"
+"POT-Creation-Date: 2010-01-16 18:08+0000\n"
+"PO-Revision-Date: 2010-01-17 22:52+0100\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"
+"X-Generator: Lokalize 1.0\n"
 
 #: ../rules/base.xml.in.h:1
 msgid "(F)"
@@ -357,791 +358,791 @@ msgid "BTC 9116U Mini Wireless Internet and Gaming"
 msgstr "BTC 9116U Mini Wireless Internet and Gaming"
 
 #: ../rules/base.xml.in.h:86
-msgid "Baltic+"
-msgstr "Baltic+"
-
-#: ../rules/base.xml.in.h:87
 msgid "Ban"
 msgstr "BAN"
 
-#: ../rules/base.xml.in.h:88
+#: ../rules/base.xml.in.h:87
 msgid "Bangladesh"
 msgstr "Bangladéš"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:88
 msgid "Bashkirian"
 msgstr "Baškirské"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:89
 msgid "Bel"
 msgstr "BEL"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:90
 msgid "Belarus"
 msgstr "Bělorusko"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:91
 msgid "Belgium"
 msgstr "Belgie"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:92
 msgid "BenQ X-Touch"
 msgstr "BenQ X-Touch"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:93
 msgid "BenQ X-Touch 730"
 msgstr "BenQ X-Touch 730"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:94
 msgid "BenQ X-Touch 800"
 msgstr "BenQ X-Touch 800"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:95
 msgid "Bengali"
 msgstr "Bengálské"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:96
 msgid "Bengali Probhat"
 msgstr "Bengálské Probhat"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:97
 msgid "Bepo, ergonomic, Dvorak way"
 msgstr "Bepo, ergonomické, typ Dvorak"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:98
 msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
 msgstr "Bepo, ergonomické, typ Dvorak, pouze Latin-9"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:99
 msgid "Bgr"
 msgstr "BGR"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:100
 msgid "Bhu"
 msgstr "BHU"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:101
 msgid "Bhutan"
 msgstr "Bhútán"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:102
 msgid "Biblical Hebrew (Tiro)"
 msgstr "Biblická hebrejština (Tiro)"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:103
 msgid "Bih"
 msgstr "BIH"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:104
 msgid "Blr"
 msgstr "BLR"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:105
 msgid "Bosnia and Herzegovina"
 msgstr "Bosna a Hercegovina"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Obě klávesy Alt dohromady"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Obě klávesy Ctrl dohromady"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Obě klávesy Shift dohromady"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:109
 msgid "Bra"
 msgstr "BRA"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:110
 msgid "Braille"
 msgstr "Braillovo písmo"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:111
 msgid "Brazil"
 msgstr "Brazílie"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:112
 msgid "Breton"
 msgstr "Bretonské"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:113
 msgid "Brl"
 msgstr "BRL"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:114
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet Keyboard"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:115
 msgid "Buckwalter"
 msgstr "Buckwalter"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:116
 msgid "Bulgaria"
 msgstr "Bulharsko"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:117
 msgid "CRULP"
 msgstr "CRULP"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:118
 msgid "Cambodia"
 msgstr "Kambodža"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:119
 msgid "Can"
 msgstr "CAN"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:120
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:121
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:122
 msgid "CapsLock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:123
 msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
 msgstr "Caps Lock (na první rozložení), Shift+Caps Lock (na poslední rozložení)"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:124
 msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
 msgstr "Caps Lock (při stisknutí), Alt+Caps Lock provádí původní akci Caps Lock"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:125
 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:127
+#: ../rules/base.xml.in.h:126
 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:128
+#: ../rules/base.xml.in.h:127
 msgid "CapsLock is disabled"
 msgstr "Klávesa Caps Lock je vypnuta"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:128
 msgid "CapsLock key behavior"
 msgstr "Chování klávesy Caps Lock"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:129
 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:131
+#: ../rules/base.xml.in.h:130
 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:132
+#: ../rules/base.xml.in.h:131
 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:133
+#: ../rules/base.xml.in.h:132
 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:134
+#: ../rules/base.xml.in.h:133
 msgid "Catalan variant with middle-dot L"
 msgstr "Katalánská varianta s ela geminada"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:134
 msgid "Cedilla"
 msgstr "Cédille"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:135
 msgid "Che"
 msgstr "CHE"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:136
 msgid "Cherokee"
 msgstr "Čerokí"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:137
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:138
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:139
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (alternativní volba)"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:140
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:141
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:142
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:143
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:144
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet Keyboard"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:145
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:146
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:147
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:148
 msgid "China"
 msgstr "Čína"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:149
 msgid "Chuvash"
 msgstr "Čuvašské"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:150
 msgid "Chuvash Latin"
 msgstr "Čuvašské latinské"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:151
 msgid "Classic"
 msgstr "Klasické"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:152
 msgid "Classic Dvorak"
 msgstr "Klasické Dvorak"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:153
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:154
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:155
 msgid "Colemak"
 msgstr "Colemak"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:156
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access Keyboard"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard (13 kláves)"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 kláves)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 kláves)"
 
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:160
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq Keyboard"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:161
 msgid "Compose key position"
 msgstr "Umístění klávesy Compose"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:162
 msgid "Congo, Democratic Republic of the"
 msgstr "Konžská demokratická republika"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Ctrl + Alt + Backspace"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:164
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "Ctrl je přiřazena ke klávesám Alt, Alt je přiřazena ke klávesám Win"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:165
 msgid "Control is mapped to 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:167
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Dobruca-1 Q)"
 msgstr "Krymskotatarské (Dobruca-1 Q)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Dobruca-2 Q)"
 msgstr "Krymskotatarské (Dobruca-2 Q)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Krymskotatarské (turecké Alt-Q)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:170
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Krymskotatarské (turecké F)"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:171
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Krymskotatarské (turecké Q)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:172
 msgid "Croatia"
 msgstr "Chorvatsko"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:173
 msgid "Ctrl key position"
 msgstr "Umístění klávesy Ctrl"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:174
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:175
 msgid "Cyrillic"
 msgstr "Cyrilice"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:176
 msgid "Cyrillic with guillemets"
 msgstr "Cyrilice s francouzskými uvozovkami"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:177
 msgid "Cyrillic, Z and ZHE swapped"
 msgstr "Cyrilice, prohozené Z a Ž"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:178
 msgid "Cze"
 msgstr "CZE"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:179
 msgid "Czechia"
 msgstr "Česko"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:180
 msgid "DOS"
 msgstr "DOS"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:181
 msgid "DRC"
 msgstr "DRC"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:182
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:183
 msgid "Dan"
 msgstr "DAN"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:184
 msgid "Dead acute"
 msgstr "Mrtvá čárka"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:185
 msgid "Dead grave acute"
 msgstr "Mrtvá opačná čárka (gravis)"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:186
 msgid "Default numeric keypad keys"
 msgstr "Výchozí numerická klávesnice"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:187
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:188
 msgid "Dell 101-key PC"
 msgstr "Dell PC 101klávesové"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:189
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Notebook Dell Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:190
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Notebook Dell řady Precision M"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:191
 msgid "Dell Latitude series laptop"
 msgstr "Notebook řady Dell Latitude"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:192
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:193
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:194
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:195
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:196
 msgid "Denmark"
 msgstr "Dánsko"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:197
 msgid "Deu"
 msgstr "DEU"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:198
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:199
 msgid "Diamond 9801 / 9802 series"
 msgstr "Řada Diamond 9801 / 9802"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:200
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:201
 msgid "Dvorak (UK Punctuation)"
 msgstr "Dvorak (britská interpunkce)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:202
 msgid "Dvorak international"
 msgstr "Dvorak mezinárodní"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:203
 msgid "Dvorak, Polish quotes on key 1"
 msgstr "Dvorak, polské uvozovky na klávese 1"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:204
 msgid "Dvorak, Polish quotes on quotemark key"
 msgstr "Dvorak, polské uvozovky na klávese uvozovky"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:205
 msgid "E"
 msgstr "E"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:206
 msgid "Eastern"
 msgstr "Východní"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:207
 msgid "Eliminate dead keys"
 msgstr "Vyloučit mrtvé klávesy"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:208
 msgid "Enable extra typographic characters"
 msgstr "Povolit přídavné znaky hladké sazby"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:209
 msgid "English"
 msgstr "Anglické"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:210
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:211
 msgid "Enter on keypad"
 msgstr "Enter na numerické klávesnici"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:212
 msgid "Epo"
 msgstr "EPO"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:213
 msgid "Ergonomic"
 msgstr "Ergonomické"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:214
 msgid "Esp"
 msgstr "ESP"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:215
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:216
 msgid "Est"
 msgstr "EST"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:217
 msgid "Estonia"
 msgstr "Estonsko"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:218
 msgid "Eth"
 msgstr "ETH"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:219
 msgid "Ethiopia"
 msgstr "Etiopie"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:220
 msgid "Evdev-managed keyboard"
 msgstr "Klávesnice spravovaná pomocí Evdev"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:221
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:222
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:223
 msgid "Extended"
 msgstr "Rozšířené"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:224
 msgid "Extended - Winkeys"
 msgstr "Rozšířené - klávesy Win"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:225
 msgid "Extended Backslash"
 msgstr "Rozšířená klávesa zpětného lomítka"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:226
 msgid "F-letter (F) variant"
 msgstr "Varianta se znakem F"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:227
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:228
 msgid "Fao"
 msgstr "FAO"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:229
 msgid "Faroe Islands"
 msgstr "Faerské ostrovy"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:230
 msgid "Fin"
 msgstr "FIN"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:231
 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:235
+#: ../rules/base.xml.in.h:234
 msgid "Four-level key with abstract separators"
 msgstr "Klávesa čtvrté úrovně s abstraktními oddělovači"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:235
 msgid "Four-level key with comma"
 msgstr "Klávesa čtvrté úrovně s čárkou"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:236
 msgid "Four-level key with dot"
 msgstr "Klávesa čtvrté úrovně s tečkou"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:237
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Klávesa čtvrté úrovně s tečkou, omezení Latin-9"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:238
 msgid "Four-level key with momayyez"
 msgstr "Klávesa čtvrté úrovně se znakem momajjez"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:239
 msgid "Fra"
 msgstr "FRA"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:240
 msgid "France"
 msgstr "Francie"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:241
 msgid "French"
 msgstr "Francouzské"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:242
 msgid "French (Macintosh)"
 msgstr "Francouzské (Macintosh)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:243
 msgid "French (legacy)"
 msgstr "Francouzské (zděděné)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:244
 msgid "French Dvorak"
 msgstr "Francouzské Dvorak"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:245
 msgid "French, Sun dead keys"
 msgstr "Francouzské, mrtvé klávesy Sun"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:246
 msgid "French, eliminate dead keys"
 msgstr "Francouzské, vyloučit mrtvé klávesy"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:247
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Notebook Fujitsu-Siemens Computers AMILO"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:248
 msgid "Fula"
 msgstr "Fula"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:249
 msgid "GBr"
 msgstr "GBR"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:250
 msgid "Ga"
 msgstr "GA"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:251
 msgid "Generic 101-key PC"
 msgstr "Obecné PC 101klávesové"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:252
 msgid "Generic 102-key (Intl) PC"
 msgstr "Obecné PC 102klávesové (mez.)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:253
 msgid "Generic 104-key PC"
 msgstr "Obecné PC 104klávesové"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:254
 msgid "Generic 105-key (Intl) PC"
 msgstr "Obecné PC 105klávesové (mez.)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:255
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:256
 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:258
+#: ../rules/base.xml.in.h:257
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:258
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:259
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:260
 msgid "Geo"
 msgstr "GEO"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:261
 msgid "Georgia"
 msgstr "Gruzie"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:262
 msgid "Georgian"
 msgstr "Gruzínské"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:263
 msgid "Georgian AZERTY Tskapo"
 msgstr "Gruzínské AZERTY Tskapo"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:264
 msgid "German (Macintosh)"
 msgstr "Německé (Macintosh)"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:265
 msgid "German, Sun dead keys"
 msgstr "Německé, mrtvé klávesy Sun"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:266
 msgid "German, eliminate dead keys"
 msgstr "Německé, vyloučit mrtvé klávesy"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:267
 msgid "Germany"
 msgstr "Německo"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:268
 msgid "Gha"
 msgstr "GHA"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:269
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:270
 msgid "Gre"
 msgstr "GRE"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:271
 msgid "Greece"
 msgstr "Řecko"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:272
 msgid "Group toggle on multiply/divide key"
 msgstr "Přepínání skupiny klávesou násobení/dělení"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:273
 msgid "Gui"
 msgstr "GUI"
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:274
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:275
 msgid "Gujarati"
 msgstr "Gudžarátské"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:276
 msgid "Gurmukhi"
 msgstr "Gurmuchské"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:277
 msgid "Gurmukhi Jhelum"
 msgstr "Gurmuchské (Jhelum)"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:278
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:279
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking Keyboard"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:280
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Happy Hacking Keyboard for Mac"
 
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:281
 msgid "Hausa"
 msgstr "Hausa"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:282
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard"
 
+#: ../rules/base.xml.in.h:283
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard Mini 110 Notebook"
+
 #: ../rules/base.xml.in.h:284
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
@@ -1239,293 +1240,293 @@ msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:308
-msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E, mez."
-
-#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:310
 msgid "ISO Alternate"
 msgstr "ISO alternativní"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:311
 msgid "Iceland"
 msgstr "Island"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:312
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:313
 msgid "Include dead tilde"
 msgstr "Zahrnout mrtvou klávesu vlnovky"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:314
 msgid "Ind"
 msgstr "IND"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:315
 msgid "India"
 msgstr "Indie"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:316
 msgid "International (AltGr dead keys)"
 msgstr "Mezinárodní (mrtvé klávesy AltGr)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:317
 msgid "International (with dead keys)"
 msgstr "Mezinárodní (s mrtvými klávesami)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:318
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:319
 msgid "Iran"
 msgstr "Írán"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:320
 msgid "Iraq"
 msgstr "Irák"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:321
 msgid "Ireland"
 msgstr "Irsko"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:322
 msgid "Irl"
 msgstr "IRL"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:323
 msgid "Irn"
 msgstr "IRN"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:324
 msgid "Irq"
 msgstr "IRQ"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:325
 msgid "Isl"
 msgstr "ISL"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:326
 msgid "Isr"
 msgstr "ISR"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:327
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:328
 msgid "Ita"
 msgstr "ITA"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:329
 msgid "Italy"
 msgstr "Itálie"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:330
 msgid "Japan"
 msgstr "Japonsko"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:331
 msgid "Japan (PC-98xx Series)"
 msgstr "Japonsko (řada PC-98xx)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:332
 msgid "Japanese keyboard options"
 msgstr "Volby japonské klávesnice"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:333
 msgid "Jpn"
 msgstr "JPN"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:334
 msgid "Kalmyk"
 msgstr "Kalmycké"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:335
 msgid "Kana"
 msgstr "Kana"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:336
 msgid "Kana Lock key is locking"
 msgstr "Klávesa Kana Lock uzamyká"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:337
 msgid "Kannada"
 msgstr "Kannadské"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:338
 msgid "Kashubian"
 msgstr "Kašubské"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:339
 msgid "Kaz"
 msgstr "KAZ"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:340
 msgid "Kazakh with Russian"
 msgstr "Kazašská s ruštinou"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:341
 msgid "Kazakhstan"
 msgstr "Kazachstán"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:342
 msgid "Key sequence to kill the X server"
 msgstr "Pořadí kláves zabíjející server X"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:343
 msgid "Key to choose 3rd level"
 msgstr "Klávesa umožňující výběr 3. úrovně"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:344
 msgid "Key(s) to change layout"
 msgstr "Klávesa měnící rozložení"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:345
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:346
 msgid "Kgz"
 msgstr "KGZ"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:347
 msgid "Khm"
 msgstr "KHM"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:348
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:349
 msgid "Kor"
 msgstr "KOR"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:350
 msgid "Korea, Republic of"
 msgstr "Korejská republika"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:351
 msgid "Ktunaxa"
 msgstr "Ktunaxa"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:352
 msgid "Kurdish, (F)"
 msgstr "Kurdské, (F)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:353
 msgid "Kurdish, Arabic-Latin"
 msgstr "Kurdské, arabsko-latinské"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:354
 msgid "Kurdish, Latin Alt-Q"
 msgstr "Kurdské, latinské Alt-Q"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:355
 msgid "Kurdish, Latin Q"
 msgstr "Kurdské, latinské Q"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:356
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstán"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:357
 msgid "LAm"
 msgstr "LAm"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:358
 msgid "LEKP"
 msgstr "LEKP"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:359
 msgid "LEKPa"
 msgstr "LEKPa"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:360
 msgid "Lao"
 msgstr "LAO"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:361
 msgid "Laos"
 msgstr "Laos"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:362
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Laptop Keyboard pro notebook Compaq (např. Armada)"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:363
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Internet Keyboard pro notebook Compaq (např. Presario)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:364
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Notebook eMachines m68xx"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:365
 msgid "Latin"
 msgstr "Latinské"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:366
 msgid "Latin American"
 msgstr "Latinskoamerické"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:367
 msgid "Latin Unicode"
 msgstr "Latinské Unicode"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:368
 msgid "Latin Unicode qwerty"
 msgstr "Latinské Unicode qwerty"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:369
 msgid "Latin qwerty"
 msgstr "Latinské qwerty"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:370
 msgid "Latin unicode"
 msgstr "Latinské Unicode"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:371
 msgid "Latin unicode qwerty"
 msgstr "Latinské Unicode qwerty"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:372
 msgid "Latin with guillemets"
 msgstr "Latinské s francouzskými uvozovkami"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:373
 msgid "Latvia"
 msgstr "Lotyšsko"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:374
 msgid "Lav"
 msgstr "LAV"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:375
 msgid "Left Alt"
 msgstr "Levá klávesa Alt"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:376
 msgid "Left Alt (while pressed)"
 msgstr "Levá klávesa Alt (při stisknutí)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:377
 msgid "Left Alt is swapped with Left Win"
 msgstr "Levá klávesa Alt je prohozena s levou klávesou Win"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:378
 msgid "Left Ctrl"
 msgstr "Levá klávesa Ctrl"
 
+#: ../rules/base.xml.in.h:379
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr "Levá klávesa Ctrl (na první rozložení), pravá klávesa Ctrl (na poslední rozložení)"
+
 #: ../rules/base.xml.in.h:380
 msgid "Left Ctrl+Left Shift"
 msgstr "Levá klávesa Ctrl + levá klávesa Shift"
@@ -2160,608 +2161,616 @@ msgid "Right Ctrl as Right Alt"
 msgstr "Pravá klávesa Ctrl funguje jako pravá klávesa Alt"
 
 #: ../rules/base.xml.in.h:539
+msgid "Right Ctrl+Right Shift"
+msgstr "Pravá klávesa Ctrl + pravá klávesa Shift"
+
+#: ../rules/base.xml.in.h:540
 msgid "Right Shift"
 msgstr "Pravá klávesa Shift"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:541
 msgid "Right Win"
 msgstr "Pravá klávesa Win"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:542
 msgid "Right Win (while pressed)"
 msgstr "Pravá klávesa Win (při stisknutí)"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:543
 msgid "Right hand"
 msgstr "Pravoruké"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:544
 msgid "Right handed Dvorak"
 msgstr "Pravoruké Dvorak"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:545
 msgid "Romania"
 msgstr "Rumunsko"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:546
 msgid "Romanian keyboard with German letters"
 msgstr "Rumunská klávesnice s německými znaky"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:547
 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:547
+#: ../rules/base.xml.in.h:548
 msgid "Rou"
 msgstr "ROU"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:549
 msgid "Rus"
 msgstr "RUS"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:550
 msgid "Russia"
 msgstr "Rusko"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:551
 msgid "Russian"
 msgstr "Ruské"
 
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:552
 msgid "Russian phonetic"
 msgstr "Ruské fonetické"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:553
 msgid "Russian phonetic Dvorak"
 msgstr "Ruské fonetické Dvorak"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:554
 msgid "Russian phonetic, eliminate dead keys"
 msgstr "Ruské fonetické, vyloučit mrtvé klávesy"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:555
 msgid "Russian with Kazakh"
 msgstr "Ruská s kazaštinou"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:556
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:557
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:558
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:559
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:560
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:560 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:7
 msgid "SRB"
 msgstr "SRB"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:562
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:563
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:564
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:565
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:566
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:567
 msgid "ScrollLock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:568
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:569
 msgid "Semi-colon on third level"
 msgstr "Středník na třetí úrovni"
 
-#: ../rules/base.xml.in.h:569 ../rules/base.extras.xml.in.h:8
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:8
 msgid "Serbia"
 msgstr "Srbsko"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:571
 msgid "Shift cancels CapsLock"
 msgstr "Shift ruší Caps Lock"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:572
 msgid "Shift does not cancel NumLock, chooses 3d level instead"
 msgstr "Shift neruší Num Lock, namísto toho vybírá 3. úroveň"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:573
 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:573
+#: ../rules/base.xml.in.h:574
 msgid "Shift+CapsLock"
 msgstr "Shift+Caps Lock"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:575
 msgid "Simple"
 msgstr "Jednoduché"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:576
 msgid "Slovakia"
 msgstr "Slovensko"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:577
 msgid "Slovenia"
 msgstr "Slovinsko"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:578
 msgid "South Africa"
 msgstr "Jižní Afrika"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:579
 msgid "Southern Uzbek"
 msgstr "Jihouzbecké"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:580
 msgid "Spain"
 msgstr "Španělsko"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:581
 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:581
+#: ../rules/base.xml.in.h:582
 msgid "SrL"
 msgstr "SRL"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:583
 msgid "Sri Lanka"
 msgstr "Srí Lanka"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:584
 msgid "Standard"
 msgstr "Standardní"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:585
 msgid "Standard (Cedilla)"
 msgstr "Standardní (cédille)"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:587
 msgid "Standard RSTU"
 msgstr "Standardní RSTU"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:589
 msgid "Standard RSTU on Russian layout"
 msgstr "Standardní RSTU s ruským rozložením"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:590
 msgid "Sun Type 5/6"
 msgstr "Sun Type 5/6"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:591
 msgid "Sun dead keys"
 msgstr "Mrtvé klávesy Sun"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:592
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:593
 msgid "Svdvorak"
 msgstr "Svdvorak"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:594
 msgid "Svk"
 msgstr "SVK"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:595
 msgid "Svn"
 msgstr "SVN"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:596
 msgid "Swap Ctrl and CapsLock"
 msgstr "Zaměnit Ctrl a Caps Lock"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:597
 msgid "Swap ESC and CapsLock"
 msgstr "Zaměnit Esc a Caps Lock"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:598
 msgid "Swe"
 msgstr "SWE"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:599
 msgid "Sweden"
 msgstr "Švédsko"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:600
 msgid "Switzerland"
 msgstr "Švýcarsko"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:601
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:602
 msgid "Syr"
 msgstr "SYR"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:603
 msgid "Syria"
 msgstr "Sýrie"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:604
 msgid "Syriac"
 msgstr "Syrské"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:605
 msgid "Syriac phonetic"
 msgstr "Syrské fonetické"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:606
 msgid "TIS-820.2538"
 msgstr "TIS-820.2538"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:607
 msgid "Tajikistan"
 msgstr "Tádžikistán"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:608
 msgid "Tamil"
 msgstr "Tamilské"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:609
 msgid "Tamil TAB Typewriter"
 msgstr "Tamil TAB Typewriter"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:610
 msgid "Tamil TSCII Typewriter"
 msgstr "Tamil TSCII Typewriter"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:611
 msgid "Tamil Unicode"
 msgstr "Tamilské Unicode"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:612
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:613
 msgid "Tatar"
 msgstr "Tatarské"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:614
 msgid "Telugu"
 msgstr "Tegulské"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:615
 msgid "Tha"
 msgstr "THA"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:616
 msgid "Thailand"
 msgstr "Thajsko"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:617
 msgid "Tibetan"
 msgstr "Tibetské"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:618
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibetské (s číslicemi ASCII)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:619
 msgid "Tifinagh"
 msgstr "Tifinagh"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:620
 msgid "Tifinagh Alternative"
 msgstr "Tifinagh, alternativní"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:621
 msgid "Tifinagh Alternative Phonetic"
 msgstr "Tifinagh, alternativní fonetické"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:622
 msgid "Tifinagh Extended"
 msgstr "Tifinagh, rozšířené"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:623
 msgid "Tifinagh Extended Phonetic"
 msgstr "Tifinagh, rozšířené fonetické"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:624
 msgid "Tifinagh Phonetic"
 msgstr "Tifinagh, fonetické"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:625
 msgid "Tilde (~) variant"
 msgstr "Varianta s vlnovkou (~)"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:626
 msgid "Tjk"
 msgstr "TJK"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:627
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "K odpovídající klávese na klávesnici Dvorak."
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:628
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "K odpovídající klávese na klávesnici Qwerty."
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:629
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:630
 msgid "Traditional phonetic"
 msgstr "Tradiční fonetické"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:631
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:632
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:633
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:634
 msgid "Tur"
 msgstr "TUR"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:635
 msgid "Turkey"
 msgstr "Turecko"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:636
 msgid "Turkmenistan"
 msgstr "Turkmenistán"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:637
 msgid "Typewriter"
 msgstr "Psací stroj"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:638
+msgid "Typewriter, legacy"
+msgstr "Psací stroj, zděděné"
+
+#: ../rules/base.xml.in.h:639
 msgid "UCW layout (accented letters only)"
 msgstr "Rozložení UCW (pouze znaky s diakritikou)"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:640
 msgid "US keyboard with Bosnian digraphs"
 msgstr "Americká klávesnice s bosenskými spřežkami"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:641
 msgid "US keyboard with Bosnian letters"
 msgstr "Americká klávesnice s bosenskými znaky"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:642
 msgid "US keyboard with Croatian digraphs"
 msgstr "Americká klávesnice s chorvatskými spřežkami"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:643
 msgid "US keyboard with Croatian letters"
 msgstr "Americká klávesnice s chorvatskými znaky"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:644
 msgid "US keyboard with Estonian letters"
 msgstr "Americká klávesnice s estonskými znaky"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:645
 msgid "US keyboard with Italian letters"
 msgstr "Americká klávesnice s italskými znaky"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:646
 msgid "US keyboard with Lithuanian letters"
 msgstr "Americká klávesnice s litevskými znaky"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:647
 msgid "US keyboard with Slovenian letters"
 msgstr "Americká klávesnice se slovinskými znaky"
 
-#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:648 ../rules/base.extras.xml.in.h:9
 msgid "USA"
 msgstr "USA"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:649
 msgid "Udmurt"
 msgstr "Udmurtské"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:650
 msgid "Ukr"
 msgstr "UKR"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:651
 msgid "Ukraine"
 msgstr "Ukrajina"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:652
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Doplňky Unicode (šipky a matematické operátory)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:653
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Doplňky Unicode (šipky a matematické operátory). Matematické operátory na výchozí úrovni."
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:654
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:655
 msgid "United Kingdom"
 msgstr "Spojené království"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:656
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:657
 msgid "Urdu, Alternative phonetic"
 msgstr "Urdské, alternativní fonetické"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:658
 msgid "Urdu, Phonetic"
 msgstr "Urdské, fonetické"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:659
 msgid "Urdu, Winkeys"
 msgstr "Urdské, klávesy Win"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:660
 msgid "Use Bosnian digraphs"
 msgstr "Používat bosenské spřežky"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:661
 msgid "Use Croatian digraphs"
 msgstr "Používat chorvatské spřežky"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:662
 msgid "Use guillemets for quotes"
 msgstr "Používat francouzské uvozovky"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:663
 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:662
+#: ../rules/base.xml.in.h:664
 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:663
+#: ../rules/base.xml.in.h:665
 msgid "Usual space at any level"
 msgstr "Na jakékoliv úrovni znak běžné mezery"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:666
 msgid "Uzb"
 msgstr "UZB"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:667
 msgid "Uzbekistan"
 msgstr "Uzbekistán"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:668
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:669
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 Internet Keyboard"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:670
 msgid "Vnm"
 msgstr "VNM"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:671
 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:670
+#: ../rules/base.xml.in.h:672
 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:671
+#: ../rules/base.xml.in.h:673
 msgid "Wang model 724 azerty"
 msgstr "Wang, model 724 azerty"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:674
 msgid "Western"
 msgstr "Západní"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:675
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:676
 msgid "Winkeys"
 msgstr "Klávesy Win"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:677
 msgid "With &lt;\\|&gt; key"
 msgstr "S klávesou &lt;\\|&gt;"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:678
 msgid "With EuroSign on 5"
 msgstr "Se znakem eura na klávese 5"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:679
 msgid "With guillemets"
 msgstr "S francouzskými uvozovkami"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:680
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:681
 msgid "Yakut"
 msgstr "jakutské"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:682
 msgid "Yoruba"
 msgstr "Jorubské"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:683
 msgid "Z and ZHE swapped"
 msgstr "Prohozené Z a Ž"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:684
 msgid "Zar"
 msgstr "ZAR"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:685
 msgid "azerty"
 msgstr "azerty"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:686
 msgid "azerty/digits"
 msgstr "azerty/číslice"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:687
 msgid "digits"
 msgstr "číslice"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:688
 msgid "displaced semicolon and quote (obsolete)"
 msgstr "posunutý středník a uvozovka (zastaralé)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:689
 msgid "lyx"
 msgstr "lyx"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:690
 msgid "qwerty"
 msgstr "qwerty"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:691
 msgid "qwerty, extended Backslash"
 msgstr "qwerty, rozšířená klávesa zpětného lomítka"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:692
 msgid "qwerty/digits"
 msgstr "qwerty/číslice"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:693
 msgid "qwertz"
 msgstr "qwertz"
 
diff --git a/xorg-server/xkbdata.src/po/de.po b/xorg-server/xkbdata.src/po/de.po
index 872ca67db..ecad074b8 100644
--- a/xorg-server/xkbdata.src/po/de.po
+++ b/xorg-server/xkbdata.src/po/de.po
@@ -1,14 +1,14 @@
 # German translation of xkeyboard-config.
 # This file is distributed under the same license as the xkeyboard-config package.
 # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009.
-# Mario Blättermann <mariobl@gnome.org>, 2009.
+# Mario Blättermann <mariobl@gnome.org>, 2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-1.6.99\n"
+"Project-Id-Version: xkeyboard-config-1.8\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2009-09-15 23:31+0100\n"
-"PO-Revision-Date: 2009-09-16 21:08+0100\n"
+"POT-Creation-Date: 2010-01-16 18:08+0000\n"
+"PO-Revision-Date: 2010-01-16 22:05+0100\n"
 "Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -358,792 +358,792 @@ msgid "BTC 9116U Mini Wireless Internet and Gaming"
 msgstr "BTC 9116U Mini Wireless Internet and Gaming"
 
 #: ../rules/base.xml.in.h:86
-msgid "Baltic+"
-msgstr "Baltisch+"
-
-#: ../rules/base.xml.in.h:87
 msgid "Ban"
 msgstr "Ban"
 
-#: ../rules/base.xml.in.h:88
+#: ../rules/base.xml.in.h:87
 msgid "Bangladesh"
 msgstr "Bangladesch"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:88
 msgid "Bashkirian"
 msgstr "Baschkirisch"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:89
 msgid "Bel"
 msgstr "Bel"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:90
 msgid "Belarus"
 msgstr "Weißrussland"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:91
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:92
 msgid "BenQ X-Touch"
 msgstr "BenQ X-Touch"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:93
 msgid "BenQ X-Touch 730"
 msgstr "BenQ X-Touch 730"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:94
 msgid "BenQ X-Touch 800"
 msgstr "BenQ X-Touch 800"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:95
 msgid "Bengali"
 msgstr "Bengalisch"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:96
 msgid "Bengali Probhat"
 msgstr "Bengali Probhat"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:97
 msgid "Bepo, ergonomic, Dvorak way"
 msgstr "Bepo, ergonomisch, Dvorak-ähnlich"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:98
 msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
 msgstr "Bepo, ergonomisch, Dvorak-ähnlich, nur latin-9"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:99
 msgid "Bgr"
 msgstr "Bgr"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:100
 msgid "Bhu"
 msgstr "Bhu"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:101
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:102
 msgid "Biblical Hebrew (Tiro)"
 msgstr "Althebräisch (Tiro)"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:103
 msgid "Bih"
 msgstr "Bih"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:104
 msgid "Blr"
 msgstr "Blr"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:105
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnien-Herzegowina"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Beide Alt-Tasten gleichzeitig"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Beide Steuerungstasten gleichzeitig"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Beide Umschalttasten gleichzeitig"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:109
 msgid "Bra"
 msgstr "Bra"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:110
 msgid "Braille"
 msgstr "Braille"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:111
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:112
 msgid "Breton"
 msgstr "Bretonisch"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:113
 msgid "Brl"
 msgstr "Brl"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:114
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet Keyboard"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:115
 msgid "Buckwalter"
 msgstr "Buckwalter"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:116
 msgid "Bulgaria"
 msgstr "Bulgarien"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:117
 msgid "CRULP"
 msgstr "CRULP"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:118
 msgid "Cambodia"
 msgstr "Kambodscha"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:119
 msgid "Can"
 msgstr "Can"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:120
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:121
 msgid "Caps Lock"
 msgstr "Feststelltaste"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:122
 msgid "CapsLock"
 msgstr "Feststelltaste"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:123
 msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
 msgstr "Feststelltaste (zur ersten Belegung), Umschalttaste+Feststelltaste (zur letzten Belegung)"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:124
 msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
 msgstr "Feststelltaste (gedrückt halten), Alt+Feststelltaste führen die normale Feststelltasten-Aktion aus"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:125
 msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
 msgstr "Feststelltaste arbeitet als Umschalttaste mit Sperrung. Umschalttaste »unterbricht« Feststelltaste"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:126
 msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
 msgstr "Feststelltaste arbeitet als Umschalttaste mit Sperrung. Umschalttaste beeinflusst Feststelltaste nicht"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:127
 msgid "CapsLock is disabled"
 msgstr "Feststelltaste ist deaktiviert"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:128
 msgid "CapsLock key behavior"
 msgstr "Verhalten der Feststelltaste"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:129
 msgid "CapsLock toggles Shift so all keys are affected"
 msgstr "Feststelltaste kehrt Umschalttaste um, so dass alle Tasten beeinflusst werden"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:130
 msgid "CapsLock toggles normal capitalization of alphabetic characters"
 msgstr "Feststelltaste kehrt die normale Großschreibung alphabetischer Zeichen um"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:131
 msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
 msgstr "Feststelltaste verwendet interne Großschreibung. Umschalttaste »unterbricht« Feststelltaste"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:132
 msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
 msgstr "Feststelltaste verwendet interne Großschreibung. Umschalttaste beeinflusst Feststelltaste nicht"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:133
 msgid "Catalan variant with middle-dot L"
 msgstr "Katalanische Variante mit mittelpunktiertem L"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:134
 msgid "Cedilla"
 msgstr "Cedilla"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:135
 msgid "Che"
 msgstr "Che"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:136
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:137
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:138
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:139
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (alternative Option)"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:140
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:141
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:142
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:143
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:144
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet Keyboard"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:145
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:146
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:147
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:148
 msgid "China"
 msgstr "China"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:149
 msgid "Chuvash"
 msgstr "Tschuwaschisch"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:150
 msgid "Chuvash Latin"
 msgstr "Tschuwaschisch (lateinische Schrift)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:151
 msgid "Classic"
 msgstr "Klassisch"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:152
 msgid "Classic Dvorak"
 msgstr "Dvorak (klassisch)"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:153
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:154
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:155
 msgid "Colemak"
 msgstr "Colemak"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:156
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access Keyboard"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard (13 Tasten)"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 Tasten)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 Tasten)"
 
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:160
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq Keyboard"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:161
 msgid "Compose key position"
 msgstr "Position der Compose-Taste"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:162
 msgid "Congo, Democratic Republic of the"
 msgstr "Demokratische Republik Kongo"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Strg + Alt + Löschtaste"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:164
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "Strg ist den Alt-Tasten zugeordnet, Alt ist den Windows-Tasten zugeordnet"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:165
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "Strg ist den Win-Tasten zugeordnet (und den üblichen Strg-Tasten)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Dobruca-1 Q)"
 msgstr "Krimtatarisch (Dobruca-1 Q)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Dobruca-2 Q)"
 msgstr "Krimtatarisch (Dobruca-2 Q)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Krimtatarisch (Türkisch Alt-Q)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:170
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Krimtatarisch (Türkisch F)"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:171
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Krimtatarisch (Türkisch Q)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:172
 msgid "Croatia"
 msgstr "Kroatien"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:173
 msgid "Ctrl key position"
 msgstr "Position der Strg-Taste"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:174
 msgid "Ctrl+Shift"
 msgstr "Strg+Umschalttaste"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:175
 msgid "Cyrillic"
 msgstr "Kyrillisch"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:176
 msgid "Cyrillic with guillemets"
 msgstr "Kyrillisch mit Anführungszeichen"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:177
 msgid "Cyrillic, Z and ZHE swapped"
 msgstr "Kyrillisch, »З« und »Ж« vertauscht"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:178
 msgid "Cze"
 msgstr "Cze"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:179
 msgid "Czechia"
 msgstr "Tschechien"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:180
 msgid "DOS"
 msgstr "DOS"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:181
 msgid "DRC"
 msgstr "DRC"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:182
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:183
 msgid "Dan"
 msgstr "Dan"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:184
 msgid "Dead acute"
 msgstr "Ohne Acute-(')Akzentzeichen"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:185
 msgid "Dead grave acute"
 msgstr "Ohne Grave-(`) und Acute-(')Akzentzeichen"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:186
 msgid "Default numeric keypad keys"
 msgstr "Vorgegebene Nummernblocktasten"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:187
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:188
 msgid "Dell 101-key PC"
 msgstr "Dell PC-Tastatur mit 101 Tasten"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:189
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell Laptop/Notebook Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:190
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell Laptop/Notebook Precision-M-Serie"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:191
 msgid "Dell Latitude series laptop"
 msgstr "Dell Latitude-Laptop"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:192
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:193
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:194
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:195
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB Multimedia Keybard"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:196
 msgid "Denmark"
 msgstr "Dänemark"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:197
 msgid "Deu"
 msgstr "Deu"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:198
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:199
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801 / 9802-Serie"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:200
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:201
 msgid "Dvorak (UK Punctuation)"
 msgstr "Dvorak (britische Punktierung)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:202
 msgid "Dvorak international"
 msgstr "Dvorak international"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:203
 msgid "Dvorak, Polish quotes on key 1"
 msgstr "Dvorak, polnische Anführungszeichen auf Taste 1"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:204
 msgid "Dvorak, Polish quotes on quotemark key"
 msgstr "Dvorak, polnische Anführungszeichen auf Taste mit Zitatzeichen"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:205
 msgid "E"
 msgstr "E"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:206
 msgid "Eastern"
 msgstr "Östlich"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:207
 msgid "Eliminate dead keys"
 msgstr "Akzenttasten deaktivieren"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:208
 msgid "Enable extra typographic characters"
 msgstr "Typographische Sonderzeichen aktivieren"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:209
 msgid "English"
 msgstr "Englisch"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:210
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:211
 msgid "Enter on keypad"
 msgstr "Eingabetaste im Nummernblock"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:212
 msgid "Epo"
 msgstr "Epo"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:213
 msgid "Ergonomic"
 msgstr "Ergonomic"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:214
 msgid "Esp"
 msgstr "Esp"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:215
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:216
 msgid "Est"
 msgstr "Est"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:217
 msgid "Estonia"
 msgstr "Estland"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:218
 msgid "Eth"
 msgstr "Eth"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:219
 msgid "Ethiopia"
 msgstr "Äthiopien"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:220
 msgid "Evdev-managed keyboard"
 msgstr "Evdev-verwaltete Tastatur"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:221
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:222
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:223
 msgid "Extended"
 msgstr "Erweitert"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:224
 msgid "Extended - Winkeys"
 msgstr "Erweitert - Windows-Tasten"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:225
 msgid "Extended Backslash"
 msgstr "Erweiterter Backslash"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:226
 msgid "F-letter (F) variant"
 msgstr "F-Variante"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:227
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:228
 msgid "Fao"
 msgstr "Fao"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:229
 msgid "Faroe Islands"
 msgstr "Färöer-Inseln"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:230
 msgid "Fin"
 msgstr "Fin"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:231
 msgid "Finland"
 msgstr "Finnland"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:234
 msgid "Four-level key with abstract separators"
 msgstr "Taste der vierten Ebene mit abstrakten Trennern"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:235
 msgid "Four-level key with comma"
 msgstr "Taste der vierten Ebene mit Komma"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:236
 msgid "Four-level key with dot"
 msgstr "Taste der vierten Ebene mit Punkt"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:237
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Taste der vierten Ebene mit Punkt, latin-9-Einschränkung"
 
 # momayyez? Was ist das?
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:238
 msgid "Four-level key with momayyez"
 msgstr "Taste der vierten Ebene mit »momayyez«"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:239
 msgid "Fra"
 msgstr "Fra"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:240
 msgid "France"
 msgstr "Frankreich"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:241
 msgid "French"
 msgstr "Französisch"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:242
 msgid "French (Macintosh)"
 msgstr "Französisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:243
 msgid "French (legacy)"
 msgstr "Französisch (veraltet)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:244
 msgid "French Dvorak"
 msgstr "Französisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:245
 msgid "French, Sun dead keys"
 msgstr "Französisch, Sun-Akzenttasten"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:246
 msgid "French, eliminate dead keys"
 msgstr "Französisch, ohne Akzenttasten"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:247
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO Laptop"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:248
 msgid "Fula"
 msgstr "Fula"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:249
 msgid "GBr"
 msgstr "GBr"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:250
 msgid "Ga"
 msgstr "Ga"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:251
 msgid "Generic 101-key PC"
 msgstr "Generische PC-Tastatur mit 101 Tasten"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:252
 msgid "Generic 102-key (Intl) PC"
 msgstr "Generische PC-Tastatur mit 102 Tasten (Intl)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:253
 msgid "Generic 104-key PC"
 msgstr "Generische PC-Tastatur mit 104 Tasten"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:254
 msgid "Generic 105-key (Intl) PC"
 msgstr "Generische PC-Tastatur mit 105 Tasten (Intl)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:255
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:256
 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:258
+#: ../rules/base.xml.in.h:257
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:258
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:259
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:260
 msgid "Geo"
 msgstr "Geo"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:261
 msgid "Georgia"
 msgstr "Georgien"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:262
 msgid "Georgian"
 msgstr "Georgisch"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:263
 msgid "Georgian AZERTY Tskapo"
 msgstr "Georgisch, AZERTY Tskapo"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:264
 msgid "German (Macintosh)"
 msgstr "Deutsch (Macintosh)"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:265
 msgid "German, Sun dead keys"
 msgstr "Deutsch, Sun-Akzenttasten"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:266
 msgid "German, eliminate dead keys"
 msgstr "Deutsch, ohne Akzenttasten"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:267
 msgid "Germany"
 msgstr "Deutschland"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:268
 msgid "Gha"
 msgstr "Gha"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:269
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:270
 msgid "Gre"
 msgstr "Gre"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:271
 msgid "Greece"
 msgstr "Griechenland"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:272
 msgid "Group toggle on multiply/divide key"
 msgstr "Gruppenumschalter auf der Multiplikations-/Divisionstaste"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:273
 msgid "Gui"
 msgstr "Gui"
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:274
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:275
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:276
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:277
 msgid "Gurmukhi Jhelum"
 msgstr "Gurmukhi Jhelum"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:278
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:279
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking Keyboard"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:280
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "»Happy Hacking Keyboard« für Mac"
 
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:281
 msgid "Hausa"
 msgstr "Haussa"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:282
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard"
 
+#: ../rules/base.xml.in.h:283
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard Mini 110 Notebook"
+
 #: ../rules/base.xml.in.h:284
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
@@ -1241,293 +1241,293 @@ msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:308
-msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-
-#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:310
 msgid "ISO Alternate"
 msgstr "ISO-Alternative"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:311
 msgid "Iceland"
 msgstr "Island"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:312
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:313
 msgid "Include dead tilde"
 msgstr "Akzent-Tilde einschließen"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:314
 msgid "Ind"
 msgstr "Ind"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:315
 msgid "India"
 msgstr "Indien"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:316
 msgid "International (AltGr dead keys)"
 msgstr "International (AltGr-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:317
 msgid "International (with dead keys)"
 msgstr "International (mit Akzenttasten)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:318
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:319
 msgid "Iran"
 msgstr "Iran"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:320
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:321
 msgid "Ireland"
 msgstr "Irland"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:322
 msgid "Irl"
 msgstr "Irl"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:323
 msgid "Irn"
 msgstr "Irn"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:324
 msgid "Irq"
 msgstr "Irq"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:325
 msgid "Isl"
 msgstr "Isl"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:326
 msgid "Isr"
 msgstr "Isr"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:327
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:328
 msgid "Ita"
 msgstr "Ita"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:329
 msgid "Italy"
 msgstr "Italien"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:330
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:331
 msgid "Japan (PC-98xx Series)"
 msgstr "Japan (PC-98xx-Serie)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:332
 msgid "Japanese keyboard options"
 msgstr "Japanische Tastaturoptionen"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:333
 msgid "Jpn"
 msgstr "Jpn"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:334
 msgid "Kalmyk"
 msgstr "Kalmückisch"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:335
 msgid "Kana"
 msgstr "Kana"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:336
 msgid "Kana Lock key is locking"
 msgstr "Kana-Sperrtaste ist gesperrt"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:337
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:338
 msgid "Kashubian"
 msgstr "Kaschubisch"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:339
 msgid "Kaz"
 msgstr "Kaz"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:340
 msgid "Kazakh with Russian"
 msgstr "Kasachisch mit russischer Belegung"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:341
 msgid "Kazakhstan"
 msgstr "Kasachstan"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:342
 msgid "Key sequence to kill the X server"
 msgstr "Tastenkombination zum erzwungenen Beenden des X-Servers"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:343
 msgid "Key to choose 3rd level"
 msgstr "Taste zum Wechsel in die dritte Tastaturebene"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:344
 msgid "Key(s) to change layout"
 msgstr "Taste(n) zum Wechseln der Belegung"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:345
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:346
 msgid "Kgz"
 msgstr "Kgz"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:347
 msgid "Khm"
 msgstr "Khm"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:348
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:349
 msgid "Kor"
 msgstr "Kor"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:350
 msgid "Korea, Republic of"
 msgstr "Korea, Republik"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:351
 msgid "Ktunaxa"
 msgstr "Ktunaxa"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:352
 msgid "Kurdish, (F)"
 msgstr "Kurdisch, (F)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:353
 msgid "Kurdish, Arabic-Latin"
 msgstr "Kurdisch, Arabisch-Lateinisch"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:354
 msgid "Kurdish, Latin Alt-Q"
 msgstr "Kurdisch, Lateinisches Alt-Q"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:355
 msgid "Kurdish, Latin Q"
 msgstr "Kurdisch, Lateinisches Q"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:356
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:357
 msgid "LAm"
 msgstr "LAm"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:358
 msgid "LEKP"
 msgstr "LEKP"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:359
 msgid "LEKPa"
 msgstr "LEKPa"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:360
 msgid "Lao"
 msgstr "Lao"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:361
 msgid "Laos"
 msgstr "Laos"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:362
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Compaq Laptop/Notebook-Tastatur (z.B. Armada) Laptop-Tastatur"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:363
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Compaq Laptop/Notebook-Tastatur (z.B. Presario) Laptop-Tastatur"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:364
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Laptop/notebook eMachines m68xx"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:365
 msgid "Latin"
 msgstr "Latein"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:366
 msgid "Latin American"
 msgstr "Lateinamerikanisch"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:367
 msgid "Latin Unicode"
 msgstr "Latein (Unicode)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:368
 msgid "Latin Unicode qwerty"
 msgstr "Lateinische qwerty-Tastatur (Unicode)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:369
 msgid "Latin qwerty"
 msgstr "Lateinische qwerty-Tastatur"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:370
 msgid "Latin unicode"
 msgstr "Latein (Unicode)"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:371
 msgid "Latin unicode qwerty"
 msgstr "Lateinische qwerty-Tastatur (Unicode)"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:372
 msgid "Latin with guillemets"
 msgstr "Lateinisch mit Anführungszeichen"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:373
 msgid "Latvia"
 msgstr "Lettland"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:374
 msgid "Lav"
 msgstr "Lav"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:375
 msgid "Left Alt"
 msgstr "Linke Alt-Taste"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:376
 msgid "Left Alt (while pressed)"
 msgstr "Linke Alt-Taste (gedrückt halten)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:377
 msgid "Left Alt is swapped with Left Win"
 msgstr "Linke Alt-Taste ist gegen linke Windows-Taste vertauscht"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:378
 msgid "Left Ctrl"
 msgstr "Linke Strg-Taste"
 
+#: ../rules/base.xml.in.h:379
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr "Linke Strg-Taste (zur ersten Belegung), rechte Strg-Taste (zur letzten Belegung)"
+
 #: ../rules/base.xml.in.h:380
 msgid "Left Ctrl+Left Shift"
 msgstr "Linke Strg-Taste+Linke Umschalttaste"
@@ -2162,608 +2162,616 @@ msgid "Right Ctrl as Right Alt"
 msgstr "Rechte Strg-Taste wie rechte Alt-Taste"
 
 #: ../rules/base.xml.in.h:539
+msgid "Right Ctrl+Right Shift"
+msgstr "Rechte Strg-Taste und rechte Umschalttaste"
+
+#: ../rules/base.xml.in.h:540
 msgid "Right Shift"
 msgstr "Rechte Umschalttaste"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:541
 msgid "Right Win"
 msgstr "Rechte Windows-Taste"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:542
 msgid "Right Win (while pressed)"
 msgstr "Rechte Windows-Taste (gedrückt halten)"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:543
 msgid "Right hand"
 msgstr "Rechtshändig"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:544
 msgid "Right handed Dvorak"
 msgstr "Dvorak (rechtshändig)"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:545
 msgid "Romania"
 msgstr "Rumänien"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:546
 msgid "Romanian keyboard with German letters"
 msgstr "Rumänische Tastatur mit deutschen Buchstaben"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:547
 msgid "Romanian keyboard with German letters, eliminate dead keys"
 msgstr "Rumänische Tastatur mit deutschen Buchstaben, ohne Akzenttasten"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:548
 msgid "Rou"
 msgstr "Rou"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:549
 msgid "Rus"
 msgstr "Rus"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:550
 msgid "Russia"
 msgstr "Russland"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:551
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:552
 msgid "Russian phonetic"
 msgstr "Russisch (phonetisch)"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:553
 msgid "Russian phonetic Dvorak"
 msgstr "Russisch (phonetisch, Dvorak)"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:554
 msgid "Russian phonetic, eliminate dead keys"
 msgstr "Russisch (phonetisch), ohne Akzenttasten"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:555
 msgid "Russian with Kazakh"
 msgstr "Russisch mit kasachischer Belegung"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:556
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:557
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:558
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:559
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:560
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:560 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:7
 msgid "SRB"
 msgstr "SRB"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:562
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:563
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:564
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:565
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:566
 msgid "Scroll Lock"
 msgstr "Rollen"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:567
 msgid "ScrollLock"
 msgstr "Rollen"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:568
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:569
 msgid "Semi-colon on third level"
 msgstr "Semikolon in der dritten Tastaturebene"
 
-#: ../rules/base.xml.in.h:569 ../rules/base.extras.xml.in.h:8
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:8
 msgid "Serbia"
 msgstr "Serbien"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:571
 msgid "Shift cancels CapsLock"
 msgstr "Umschalttaste deaktiviert Feststelltaste"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:572
 msgid "Shift does not cancel NumLock, chooses 3d level instead"
 msgstr "Umschalttaste deaktiviert NumLock nicht, wechselt stattdessen in die dritte Tastaturebene"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:573
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Unschalttaste funktioniert mit den Tasten des Nummernblocks wie in MS Windows"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:574
 msgid "Shift+CapsLock"
 msgstr "Umschalt-+Feststelltaste"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:575
 msgid "Simple"
 msgstr "Einfach"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:576
 msgid "Slovakia"
 msgstr "Slowakei"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:577
 msgid "Slovenia"
 msgstr "Slowenien"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:578
 msgid "South Africa"
 msgstr "Südafrika"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:579
 msgid "Southern Uzbek"
 msgstr "Süd-Usbekisch"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:580
 msgid "Spain"
 msgstr "Spanien"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:581
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Spezialtasten für Server (Strg+Alt+&lt;Taste&gt;)"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:582
 msgid "SrL"
 msgstr "SrL"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:583
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:584
 msgid "Standard"
 msgstr "Standard"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:585
 msgid "Standard (Cedilla)"
 msgstr "Standard (Cedilla)"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:587
 msgid "Standard RSTU"
 msgstr "Standard RSTU"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:589
 msgid "Standard RSTU on Russian layout"
 msgstr "Standard-RSTU mit russischer Belegung"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:590
 msgid "Sun Type 5/6"
 msgstr "Sun Typ 5/6"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:591
 msgid "Sun dead keys"
 msgstr "Sun-Akzenttasten"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:592
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:593
 msgid "Svdvorak"
 msgstr "Svdvorak"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:594
 msgid "Svk"
 msgstr "Svk"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:595
 msgid "Svn"
 msgstr "Svn"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:596
 msgid "Swap Ctrl and CapsLock"
 msgstr "Strg-Taste und Feststelltaste vertauschen"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:597
 msgid "Swap ESC and CapsLock"
 msgstr "Esc und Feststelltaste vertauschen"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:598
 msgid "Swe"
 msgstr "Swe"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:599
 msgid "Sweden"
 msgstr "Schweden"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:600
 msgid "Switzerland"
 msgstr "Schweiz"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:601
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:602
 msgid "Syr"
 msgstr "Syr"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:603
 msgid "Syria"
 msgstr "Syrien"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:604
 msgid "Syriac"
 msgstr "Syrisch"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:605
 msgid "Syriac phonetic"
 msgstr "Syrisch (phonetisch)"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:606
 msgid "TIS-820.2538"
 msgstr "Thai (TIS-620)"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:607
 msgid "Tajikistan"
 msgstr "Tadschikistan"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:608
 msgid "Tamil"
 msgstr "Tamilisch"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:609
 msgid "Tamil TAB Typewriter"
 msgstr "Tamilisch (TAB Schreibmaschine)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:610
 msgid "Tamil TSCII Typewriter"
 msgstr "Tamilisch (TSCII Schreibmaschine)"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:611
 msgid "Tamil Unicode"
 msgstr "Tamilisch (Unicode)"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:612
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:613
 msgid "Tatar"
 msgstr "Tatarisch"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:614
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:615
 msgid "Tha"
 msgstr "Tha"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:616
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:617
 msgid "Tibetan"
 msgstr "Tibetisch"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:618
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibetanisch (mit ASCII-Ziffern)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:619
 msgid "Tifinagh"
 msgstr "Tifinagh"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:620
 msgid "Tifinagh Alternative"
 msgstr "Tifinagh (alternativ)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:621
 msgid "Tifinagh Alternative Phonetic"
 msgstr "Tifinagh (alternativ, phonetisch)"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:622
 msgid "Tifinagh Extended"
 msgstr "Tifinagh (erweitert)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:623
 msgid "Tifinagh Extended Phonetic"
 msgstr "Tifinagh (erweitert, phonetisch)"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:624
 msgid "Tifinagh Phonetic"
 msgstr "Tifinagh (phonetisch)"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:625
 msgid "Tilde (~) variant"
 msgstr "Tilde-Variante (~)"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:626
 msgid "Tjk"
 msgstr "Tjk"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:627
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Zur entsprechenden Taste einer Dvorak-Tastatur."
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:628
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Zur entsprechenden Taste einer Qwerty-Tastatur."
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:629
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:630
 msgid "Traditional phonetic"
 msgstr "Traditionell (phonetisch)"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:631
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:632
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:633
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:634
 msgid "Tur"
 msgstr "Tur"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:635
 msgid "Turkey"
 msgstr "Türkei"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:636
 msgid "Turkmenistan"
 msgstr "Turkmenien"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:637
 msgid "Typewriter"
 msgstr "Schreibmaschine"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:638
+msgid "Typewriter, legacy"
+msgstr "Schreibmaschine, veraltet"
+
+#: ../rules/base.xml.in.h:639
 msgid "UCW layout (accented letters only)"
 msgstr "UCW-Belegung (nur akzentuierte Buchstaben)"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:640
 msgid "US keyboard with Bosnian digraphs"
 msgstr "US-Tastatur mit bosnischen Digraphen"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:641
 msgid "US keyboard with Bosnian letters"
 msgstr "US-Tastatur mit bosnischen Buchstaben"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:642
 msgid "US keyboard with Croatian digraphs"
 msgstr "US-Tastatur mit kroatischen Digraphen"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:643
 msgid "US keyboard with Croatian letters"
 msgstr "US-Tastatur mit kroatischen Buchstaben"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:644
 msgid "US keyboard with Estonian letters"
 msgstr "US-Tastatur mit estnischen Buchstaben"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:645
 msgid "US keyboard with Italian letters"
 msgstr "US-Tastatur mit italienischen Buchstaben"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:646
 msgid "US keyboard with Lithuanian letters"
 msgstr "US-Tastatur mit litauischen Buchstaben"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:647
 msgid "US keyboard with Slovenian letters"
 msgstr "US-Tastatur mit slowenischen Buchstaben"
 
-#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:648 ../rules/base.extras.xml.in.h:9
 msgid "USA"
 msgstr "USA"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:649
 msgid "Udmurt"
 msgstr "Udmurtisch"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:650
 msgid "Ukr"
 msgstr "Ukr"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:651
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:652
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Unicode-Ergänzungen (Pfeile und mathematische Operatoren)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:653
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Unicode-Ergänzungen (Pfeile und mathematische Operatoren). Mathematische Operatoren befinden sich in der Standardebene."
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:654
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:655
 msgid "United Kingdom"
 msgstr "Vereinigtes Königreich"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:656
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:657
 msgid "Urdu, Alternative phonetic"
 msgstr "Urdu, Alternative (phonetisch)"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:658
 msgid "Urdu, Phonetic"
 msgstr "Urdu, phonetisch"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:659
 msgid "Urdu, Winkeys"
 msgstr "Urdu, Windows-Tasten"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:660
 msgid "Use Bosnian digraphs"
 msgstr "Bosnische Digraphen verwenden"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:661
 msgid "Use Croatian digraphs"
 msgstr "Kroatische Digraphen verwenden"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:662
 msgid "Use guillemets for quotes"
 msgstr "Anführungszeichen für Zitate verwenden"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:663
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Tastatur-LED zur Anzeige der alternativen Belegung verwenden"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:664
 msgid "Using space key to input non-breakable space character"
 msgstr "Leertaste zur Eingabe nicht umbrechbarer Zeichen verwenden"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:665
 msgid "Usual space at any level"
 msgstr "Leertaste gibt in jeder Ebene stets Leerzeichen aus"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:666
 msgid "Uzb"
 msgstr "Uzb"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:667
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:668
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:669
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 Internet Keyboard"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:670
 msgid "Vnm"
 msgstr "Vnm"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:671
 msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
 msgstr "Wang 724 mit Unicode-Ergänzungen (Pfeile und mathematische Operatoren)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:672
 msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Wang 724 mit Unicode-Ergänzungen (Pfeile und mathematische Operatoren). Mathematische Operatoren in der Standardebene"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:673
 msgid "Wang model 724 azerty"
 msgstr "Wang Modell 724 (azerty)"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:674
 msgid "Western"
 msgstr "Westlich"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:675
 msgid "Winbook Model XP5"
 msgstr "Winbook Modell XP5"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:676
 msgid "Winkeys"
 msgstr "Win-Tasten"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:677
 msgid "With &lt;\\|&gt; key"
 msgstr "Mit &lt;\\|&gt;-Taste"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:678
 msgid "With EuroSign on 5"
 msgstr "mit Euro-Symbol auf »5«"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:679
 msgid "With guillemets"
 msgstr "Mit Anführungszeichen"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:680
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:681
 msgid "Yakut"
 msgstr "Jakutisch"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:682
 msgid "Yoruba"
 msgstr "Joruba"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:683
 msgid "Z and ZHE swapped"
 msgstr "»З« und »Ж« sind vertauscht"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:684
 msgid "Zar"
 msgstr "Zar"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:685
 msgid "azerty"
 msgstr "azerty"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:686
 msgid "azerty/digits"
 msgstr "azerty/Ziffern"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:687
 msgid "digits"
 msgstr "Ziffern"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:688
 msgid "displaced semicolon and quote (obsolete)"
 msgstr "Falsch platziertes Semikolon und Anführungszeichen (veraltet)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:689
 msgid "lyx"
 msgstr "LyX"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:690
 msgid "qwerty"
 msgstr "qwerty"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:691
 msgid "qwerty, extended Backslash"
 msgstr "qwerty, erweiterter Backslash"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:692
 msgid "qwerty/digits"
 msgstr "qwerty/Ziffern"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:693
 msgid "qwertz"
 msgstr "qwertz"
 
@@ -2791,6 +2799,12 @@ msgstr "International (AltGr-Unicode-Kombination)"
 msgid "International (AltGr Unicode combining, alternative)"
 msgstr "International (AltGr-Unicode-Kombination, alternativ)"
 
+#~ msgid "Baltic+"
+#~ msgstr "Baltisch+"
+
+#~ msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+#~ msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
 #~ msgid "Keypad"
 #~ msgstr "Nummernblock"
 
diff --git a/xorg-server/xkbdata.src/po/fi.po b/xorg-server/xkbdata.src/po/fi.po
index 024d4f762..e00c130c7 100644
--- a/xorg-server/xkbdata.src/po/fi.po
+++ b/xorg-server/xkbdata.src/po/fi.po
@@ -1,15 +1,15 @@
 # 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-2009.
+# Tommi Vainikainen <Tommi.Vainikainen@iki.fi>, 2005, 2007-2010.
 # Ilkka Tuohela <hile@iki.fi>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 1.6.99\n"
+"Project-Id-Version: xkeyboard-config 1.8\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2009-09-15 23:31+0100\n"
-"PO-Revision-Date: 2009-09-17 11:26+0300\n"
+"POT-Creation-Date: 2010-01-16 18:08+0000\n"
+"PO-Revision-Date: 2010-01-17 22:43+0200\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"
@@ -360,793 +360,793 @@ msgid "BTC 9116U Mini Wireless Internet and Gaming"
 msgstr "BTC 9116U Mini Wireless Internet and Gaming"
 
 #: ../rules/base.xml.in.h:86
-msgid "Baltic+"
-msgstr "Baltic+"
-
-#: ../rules/base.xml.in.h:87
 msgid "Ban"
 msgstr "Ban"
 
-#: ../rules/base.xml.in.h:88
+#: ../rules/base.xml.in.h:87
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:88
 msgid "Bashkirian"
 msgstr "baškiiri"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:89
 msgid "Bel"
 msgstr "Bel"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:90
 msgid "Belarus"
 msgstr "Valko-Venäjä"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:91
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:92
 msgid "BenQ X-Touch"
 msgstr "BenQ X-Touch"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:93
 msgid "BenQ X-Touch 730"
 msgstr "BenQ X-Touch 730"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:94
 msgid "BenQ X-Touch 800"
 msgstr "BenQ X-Touch 800"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:95
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:96
 msgid "Bengali Probhat"
 msgstr "Bengali probhat"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:97
 msgid "Bepo, ergonomic, Dvorak way"
 msgstr "Bepo, ergonominen, Dvorak-tavalla"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:98
 msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
 msgstr "Bepo, ergonominen, Dvorak-tavalla, pelkkä latin-9"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:99
 msgid "Bgr"
 msgstr "Bgr"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:100
 msgid "Bhu"
 msgstr "Bhu"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:101
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:102
 msgid "Biblical Hebrew (Tiro)"
 msgstr "Raamatullinen Heprea (Tiro)"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:103
 msgid "Bih"
 msgstr "Bih"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:104
 msgid "Blr"
 msgstr "Blr"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:105
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia-Hertsegovina"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Molemmat Alt-näppäimet"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Molemmat Ctrl-näppäimet"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Molemmat Shift-näppäimet"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:109
 msgid "Bra"
 msgstr "Bra"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:110
 msgid "Braille"
 msgstr "Braille"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:111
 msgid "Brazil"
 msgstr "Brasilia"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:112
 msgid "Breton"
 msgstr "Bretoni"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:113
 msgid "Brl"
 msgstr "Brl"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:114
 msgid "Brother Internet Keyboard"
 msgstr "Brother-Internet-näppäimistö"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:115
 msgid "Buckwalter"
 msgstr "Buckwalter"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:116
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:117
 msgid "CRULP"
 msgstr "CRULP"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:118
 msgid "Cambodia"
 msgstr "Kambodža"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:119
 msgid "Can"
 msgstr "Can"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:120
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:121
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:122
 msgid "CapsLock"
 msgstr "CapsLock"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:123
 msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
 msgstr "CapsLock (ensimmäiselle tasolle), Shift+CapsLock (viimeiselle tasolle)"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:124
 msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
 msgstr "CapsLock (painettaessa), Alt+CapsLock tekee normaalin CapsLock-toiminnon"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:125
 msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
 msgstr "CapsLock toimii lukitsevana Shiftinä. Shift kumoaa CapsLockin"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:126
 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:128
+#: ../rules/base.xml.in.h:127
 msgid "CapsLock is disabled"
 msgstr "Caps Lock ei käytössä"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:128
 msgid "CapsLock key behavior"
 msgstr "CapsLock-näppäimen toiminta"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:129
 msgid "CapsLock toggles Shift so all keys are affected"
 msgstr "CapsLock vaihtaa Shiftiä vaikuttaen kaikkiin näppäimiin"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:130
 msgid "CapsLock toggles normal capitalization of alphabetic characters"
 msgstr "CapsLock vaihtaa normaalin suuraakkostuksen aakkosille"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:131
 msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
 msgstr "CapsLock käyttää sisäistä suuraakkostusta. Shift kumoaa CapsLockin"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:132
 msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
 msgstr "CapsLock käyttää sisäistä suuraakkostusta. Shift ei kumoa CapsLockia"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:133
 msgid "Catalan variant with middle-dot L"
 msgstr "Katalaani-vaihtoehto keskipilkullisella L-kirjaimella"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:134
 msgid "Cedilla"
 msgstr "Sedilji"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:135
 msgid "Che"
 msgstr "Che"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:136
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:137
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:138
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:139
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (vaihtoehtoinen valinta)"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:140
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:141
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:142
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:143
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:144
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony-Internet-näppäimistö"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:145
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:146
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:147
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:148
 msgid "China"
 msgstr "Kiina"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:149
 msgid "Chuvash"
 msgstr "Chuvash"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:150
 msgid "Chuvash Latin"
 msgstr "Chuvash latinalainen"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:151
 msgid "Classic"
 msgstr "Perinteinen"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:152
 msgid "Classic Dvorak"
 msgstr "Perinteinen dvorak"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:153
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:154
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:155
 msgid "Colemak"
 msgstr "Colemak"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:156
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access -näppäimistö"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq-Internet-näppäimistö (13 näppäintä)"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq-Internet-näppäimistö (18 näppäintä)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq-Internet-näppäimistö (7 näppäintä)"
 
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:160
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq-näppäimistö"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:161
 msgid "Compose key position"
 msgstr "Compose-näppäimen sijainti"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:162
 msgid "Congo, Democratic Republic of the"
 msgstr "Kongon tasavalta"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Backspace"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:164
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "Contol on liitetty Alt-näppäimiin, Alt Win-näppäimiin"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:165
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "Contol on liitetty Win-näppäimiin (ja tavalliset Ctrl-näppämet)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Dobruca-1 Q)"
 msgstr "Krimintataari (Dobruca-1 Q)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Dobruca-2 Q)"
 msgstr "Krimintataari (Dobruca-2 Q)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Krimintataari (turkkilainen Alt-Q)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:170
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Krimintataari (turkkilainen F)"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:171
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Krimintataari (turkkilainen Q)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:172
 msgid "Croatia"
 msgstr "Kroatia"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:173
 msgid "Ctrl key position"
 msgstr "Ctrl-näppäimen sijainti"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:174
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:175
 msgid "Cyrillic"
 msgstr "Kyrillinen"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:176
 msgid "Cyrillic with guillemets"
 msgstr "Kyrillinen guillemot-lainausmerkeillä"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:177
 msgid "Cyrillic, Z and ZHE swapped"
 msgstr "Kyrillinen, Z ja ZHE vaihdettu"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:178
 msgid "Cze"
 msgstr "Cze"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:179
 msgid "Czechia"
 msgstr "Tšekki"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:180
 msgid "DOS"
 msgstr "DOS"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:181
 msgid "DRC"
 msgstr "DRC"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:182
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:183
 msgid "Dan"
 msgstr "Dan"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:184
 msgid "Dead acute"
 msgstr "Kuollut akuutti"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:185
 msgid "Dead grave acute"
 msgstr "Kuollut gravis"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:186
 msgid "Default numeric keypad keys"
 msgstr "Oletussormionäppäimet"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:187
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:188
 msgid "Dell 101-key PC"
 msgstr "Dell 101-näppäiminen PC"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:189
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Kannettava Dell Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:190
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Kannettava Dell Precision M -sarja"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:191
 msgid "Dell Latitude series laptop"
 msgstr "Kannettava Dell Latitude-sarja"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:192
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:193
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:194
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:195
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB -multimedianäppäimistö"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:196
 msgid "Denmark"
 msgstr "Tanska"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:197
 msgid "Deu"
 msgstr "Deu"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:198
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa-langaton työpöytänäppäimistö"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:199
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801/9802-sarja"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:200
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:201
 msgid "Dvorak (UK Punctuation)"
 msgstr "Dvorak (UK-pilkutus)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:202
 msgid "Dvorak international"
 msgstr "Dvorak kansainvälinen"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:203
 msgid "Dvorak, Polish quotes on key 1"
 msgstr "Dvorak, puolalaiset lainausmerkit \"1\"-näppäimistä"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:204
 msgid "Dvorak, Polish quotes on quotemark key"
 msgstr "Dvorak, puolalaiset lainausmerkit lainausmerkkinäppäimestä"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:205
 msgid "E"
 msgstr "E"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:206
 msgid "Eastern"
 msgstr "Itäinen"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:207
 msgid "Eliminate dead keys"
 msgstr "Ei kuolleita näppäimiä"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:208
 msgid "Enable extra typographic characters"
 msgstr "Ota käyttöön ylimääräiset typografiset merkit"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:209
 msgid "English"
 msgstr "englanti"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:210
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:211
 msgid "Enter on keypad"
 msgstr "Enter sormiossa"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:212
 msgid "Epo"
 msgstr "Epo"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:213
 msgid "Ergonomic"
 msgstr "ergonominen"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:214
 msgid "Esp"
 msgstr "Esp"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:215
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:216
 msgid "Est"
 msgstr "Est"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:217
 msgid "Estonia"
 msgstr "Viro"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:218
 msgid "Eth"
 msgstr "Eth"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:219
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:220
 msgid "Evdev-managed keyboard"
 msgstr "Evdev-hallittu näppäimistö"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:221
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:222
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:223
 msgid "Extended"
 msgstr "Laajennettu"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:224
 msgid "Extended - Winkeys"
 msgstr "Laajennettu - Win-näppäimet"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:225
 msgid "Extended Backslash"
 msgstr "Laajennettu kenoviiva"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:226
 msgid "F-letter (F) variant"
 msgstr "F-kirjainmuunnos (F)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:227
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:228
 msgid "Fao"
 msgstr "Fao"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:229
 msgid "Faroe Islands"
 msgstr "Färsaaret"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:230
 msgid "Fin"
 msgstr "Fin"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:231
 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:235
+#: ../rules/base.xml.in.h:234
 msgid "Four-level key with abstract separators"
 msgstr "Neljännen tason näppäin abstrakteilla erottimilla"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:235
 msgid "Four-level key with comma"
 msgstr "Neljännen tason näppäin pilkulla"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:236
 msgid "Four-level key with dot"
 msgstr "Neljännen tason näppäin pisteellä"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:237
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Neljännen tason näppäin pisteellä, latin-9-rajoituksella"
 
 # Wikipediasta katsoin, että momayyez on persialainen desimaalierotin, joka näyttää kauttaviivalta
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:238
 msgid "Four-level key with momayyez"
 msgstr "Neljännen tason näppäin persialaisella desimaalierottimella (momayyez)"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:239
 msgid "Fra"
 msgstr "Fra"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:240
 msgid "France"
 msgstr "Ranska"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:241
 msgid "French"
 msgstr "Ranskalainen"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:242
 msgid "French (Macintosh)"
 msgstr "Ranskalainen (Macintosh)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:243
 msgid "French (legacy)"
 msgstr "Ranskalainen (vanha)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:244
 msgid "French Dvorak"
 msgstr "Ranskalainen dvorak"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:245
 msgid "French, Sun dead keys"
 msgstr "Ranskalainen, Sunin kuolleet näppäimet"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:246
 msgid "French, eliminate dead keys"
 msgstr "Ranskalainen, ei kuolleita näppäimiä"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:247
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO-kannettava"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:248
 msgid "Fula"
 msgstr "Fula"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:249
 msgid "GBr"
 msgstr "GBr"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:250
 msgid "Ga"
 msgstr "Ga"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:251
 msgid "Generic 101-key PC"
 msgstr "Yleinen 101-näppäiminen PC"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:252
 msgid "Generic 102-key (Intl) PC"
 msgstr "Yleinen 102-näppäiminen (kansainvälinen) PC"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:253
 msgid "Generic 104-key PC"
 msgstr "Yleinen 104-näppäiminen PC"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:254
 msgid "Generic 105-key (Intl) PC"
 msgstr "Yleinen 105-näppäiminen (kansainvälinen) PC"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:255
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-21e"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:256
 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:258
+#: ../rules/base.xml.in.h:257
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-rulla"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:258
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:259
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:260
 msgid "Geo"
 msgstr "Geo"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:261
 msgid "Georgia"
 msgstr "Georgia"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:262
 msgid "Georgian"
 msgstr "Georgia"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:263
 msgid "Georgian AZERTY Tskapo"
 msgstr "Georgian AZERTY Tskapo"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:264
 msgid "German (Macintosh)"
 msgstr "Saksalainen (Macintosh)"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:265
 msgid "German, Sun dead keys"
 msgstr "Saksalainen, Sunin kuolleet näppäimet"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:266
 msgid "German, eliminate dead keys"
 msgstr "Saksalainen, ei kuolleita näppäimiä"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:267
 msgid "Germany"
 msgstr "Saksa"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:268
 msgid "Gha"
 msgstr "Gha"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:269
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:270
 msgid "Gre"
 msgstr "Gre"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:271
 msgid "Greece"
 msgstr "Kreikka"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:272
 msgid "Group toggle on multiply/divide key"
 msgstr "Ryhmän vaihto kerto/jako-näppäimellä"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:273
 msgid "Gui"
 msgstr "Gui"
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:274
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:275
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:276
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:277
 msgid "Gurmukhi Jhelum"
 msgstr "Gurmukhi Jhelum"
 
 # Lienee tuotemerkki
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:278
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:279
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking -näppäimistö"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:280
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Happy Hacking -näppäimistö, Mac-versio"
 
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:281
 msgid "Hausa"
 msgstr "Hausa"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:282
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard-Internet-näppäimistö"
 
+#: ../rules/base.xml.in.h:283
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard Mini 110 Notebook"
+
 #: ../rules/base.xml.in.h:284
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
@@ -1244,293 +1244,293 @@ msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:308
-msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E, kansainvälinen"
-
-#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:310
 msgid "ISO Alternate"
 msgstr "ISO vaihtoehtoinen"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:311
 msgid "Iceland"
 msgstr "Islanti"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:312
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:313
 msgid "Include dead tilde"
 msgstr "Sisällytä kuollut tilde"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:314
 msgid "Ind"
 msgstr "Ind"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:315
 msgid "India"
 msgstr "Intia"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:316
 msgid "International (AltGr dead keys)"
 msgstr "Kansainvälinen (AltGr -kuolleet näppäimet)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:317
 msgid "International (with dead keys)"
 msgstr "Kansainvälinen (ilman kuolleita näppäimiä)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:318
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:319
 msgid "Iran"
 msgstr "Iran"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:320
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:321
 msgid "Ireland"
 msgstr "Irlanti"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:322
 msgid "Irl"
 msgstr "Irl"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:323
 msgid "Irn"
 msgstr "Irn"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:324
 msgid "Irq"
 msgstr "Irq"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:325
 msgid "Isl"
 msgstr "Isl"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:326
 msgid "Isr"
 msgstr "Isr"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:327
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:328
 msgid "Ita"
 msgstr "Ita"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:329
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:330
 msgid "Japan"
 msgstr "Japani"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:331
 msgid "Japan (PC-98xx Series)"
 msgstr "Japani (PC-98xx-sarja)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:332
 msgid "Japanese keyboard options"
 msgstr "japanilaisen näppäimistön valinnat"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:333
 msgid "Jpn"
 msgstr "Jpn"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:334
 msgid "Kalmyk"
 msgstr "kalmukki"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:335
 msgid "Kana"
 msgstr "Kana"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:336
 msgid "Kana Lock key is locking"
 msgstr "Kana, lukitusnäppäin lukitseva"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:337
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:338
 msgid "Kashubian"
 msgstr "Kashubia"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:339
 msgid "Kaz"
 msgstr "Kaz"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:340
 msgid "Kazakh with Russian"
 msgstr "Kazakstan venäjän kanssa"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:341
 msgid "Kazakhstan"
 msgstr "Kazakstan"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:342
 msgid "Key sequence to kill the X server"
 msgstr "Näppäinyhdistelmä, joka tappaa X-palvelimen"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:343
 msgid "Key to choose 3rd level"
 msgstr "Kolmannen tason valintanäppäin"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:344
 msgid "Key(s) to change layout"
 msgstr "Asettelunvaihtonäppäimet"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:345
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:346
 msgid "Kgz"
 msgstr "Kgz"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:347
 msgid "Khm"
 msgstr "Khm"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:348
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:349
 msgid "Kor"
 msgstr "Kor"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:350
 msgid "Korea, Republic of"
 msgstr "Etelä-Korea"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:351
 msgid "Ktunaxa"
 msgstr "Ktunaxa"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:352
 msgid "Kurdish, (F)"
 msgstr "Kurdi, (F)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:353
 msgid "Kurdish, Arabic-Latin"
 msgstr "Kurdi, arabia-latinalainen"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:354
 msgid "Kurdish, Latin Alt-Q"
 msgstr "Kurdi, latinalainen Alt-Q"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:355
 msgid "Kurdish, Latin Q"
 msgstr "Kurdi, latinalainen Q"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:356
 msgid "Kyrgyzstan"
 msgstr "Kirgisia"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:357
 msgid "LAm"
 msgstr "LAm"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:358
 msgid "LEKP"
 msgstr "LEKP"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:359
 msgid "LEKPa"
 msgstr "LEKPa"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:360
 msgid "Lao"
 msgstr "Lao"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:361
 msgid "Laos"
 msgstr "Laos"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:362
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Kannettava Compaq (esim. Armada) kannettavan näppäimistö "
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:363
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Kannettava Compaq (esim. Armada) Internet-näppäimistö "
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:364
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Kannettava eMachines m68xx"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:365
 msgid "Latin"
 msgstr "Latinalainen"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:366
 msgid "Latin American"
 msgstr "Latinalainen amerikka"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:367
 msgid "Latin Unicode"
 msgstr "Latinalainen Unicode"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:368
 msgid "Latin Unicode qwerty"
 msgstr "Latinalainen Unicode-qwerty"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:369
 msgid "Latin qwerty"
 msgstr "Latinalainen qwerty"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:370
 msgid "Latin unicode"
 msgstr "Latinalainen Unicode"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:371
 msgid "Latin unicode qwerty"
 msgstr "Latinalainen Unicode-qwerty"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:372
 msgid "Latin with guillemets"
 msgstr "Latinalainen guillemot-lainausmerkeillä"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:373
 msgid "Latvia"
 msgstr "Latvia"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:374
 msgid "Lav"
 msgstr "Lav"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:375
 msgid "Left Alt"
 msgstr "Vasen Alt"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:376
 msgid "Left Alt (while pressed)"
 msgstr "Vasen Alt-näppäin (painettaessa)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:377
 msgid "Left Alt is swapped with Left Win"
 msgstr "Vaihda vasen Alt-näppän vasemman Win-näppäimen kanssa"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:378
 msgid "Left Ctrl"
 msgstr "Vasen Ctrl"
 
+#: ../rules/base.xml.in.h:379
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr "Vasen ctrl (ensimmäiselle asettelulle), Oikea Ctrl (viimeiselle asettelulle)"
+
 #: ../rules/base.xml.in.h:380
 msgid "Left Ctrl+Left Shift"
 msgstr "Vasen Ctrl+Vasen Shift"
@@ -2165,608 +2165,616 @@ msgid "Right Ctrl as Right Alt"
 msgstr "Oikea Ctrl kuten oikea Alt"
 
 #: ../rules/base.xml.in.h:539
+msgid "Right Ctrl+Right Shift"
+msgstr "Oikea Ctrl+Oikea Shift"
+
+#: ../rules/base.xml.in.h:540
 msgid "Right Shift"
 msgstr "Oikea Shift"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:541
 msgid "Right Win"
 msgstr "Oikea Win"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:542
 msgid "Right Win (while pressed)"
 msgstr "Oikea Win (painettaessa)"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:543
 msgid "Right hand"
 msgstr "Oikeakätinen"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:544
 msgid "Right handed Dvorak"
 msgstr "Oikeakätinen dvorak"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:545
 msgid "Romania"
 msgstr "Romania"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:546
 msgid "Romanian keyboard with German letters"
 msgstr "Romanialainen näppäimistö saksalaisilla kirjaimilla"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:547
 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:547
+#: ../rules/base.xml.in.h:548
 msgid "Rou"
 msgstr "Rou"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:549
 msgid "Rus"
 msgstr "Rus"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:550
 msgid "Russia"
 msgstr "Venäjä"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:551
 msgid "Russian"
 msgstr "Venäläinen"
 
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:552
 msgid "Russian phonetic"
 msgstr "Venäläinen foneettinen"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:553
 msgid "Russian phonetic Dvorak"
 msgstr "Venäläinen foneettinen dvorak"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:554
 msgid "Russian phonetic, eliminate dead keys"
 msgstr "Venäläinen foneettinen, ei kuolleita näppäimiä"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:555
 msgid "Russian with Kazakh"
 msgstr "Venäjä kazakhin kanssa"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:556
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST langaton multimedianäppäimistö"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:557
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:558
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:559
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:560
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:560 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:7
 msgid "SRB"
 msgstr "SRB"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:562
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:563
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:564
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:565
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:566
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:567
 msgid "ScrollLock"
 msgstr "ScrollLock"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:568
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:569
 msgid "Semi-colon on third level"
 msgstr "Puolipilkku kolmannella tasolla"
 
-#: ../rules/base.xml.in.h:569 ../rules/base.extras.xml.in.h:8
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:8
 msgid "Serbia"
 msgstr "Serbia"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:571
 msgid "Shift cancels CapsLock"
 msgstr "Shift kumoaa CapsLockin"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:572
 msgid "Shift does not cancel NumLock, chooses 3d level instead"
 msgstr "Shift ei kumoa CapsLockia, valitsee 3. tason sen sijaan"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:573
 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:573
+#: ../rules/base.xml.in.h:574
 msgid "Shift+CapsLock"
 msgstr "Shift+CapsLock"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:575
 msgid "Simple"
 msgstr "yksinkertainen"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:576
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:577
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:578
 msgid "South Africa"
 msgstr "Etelä-Afrikka"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:579
 msgid "Southern Uzbek"
 msgstr "Eteläinen uzbeekki"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:580
 msgid "Spain"
 msgstr "Espanja"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:581
 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:581
+#: ../rules/base.xml.in.h:582
 msgid "SrL"
 msgstr "SrL"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:583
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:584
 msgid "Standard"
 msgstr "Tavallinen"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:585
 msgid "Standard (Cedilla)"
 msgstr "Tavallinen (Pilkku alla)"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:587
 msgid "Standard RSTU"
 msgstr "Tavallinen RSTU"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:589
 msgid "Standard RSTU on Russian layout"
 msgstr "Tavallinen RSTU venäläisellä asettelulla"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:590
 msgid "Sun Type 5/6"
 msgstr "Sun Type 5/6"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:591
 msgid "Sun dead keys"
 msgstr "Sunin kuolleet näppäimet"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:592
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power -multimedianäppäimistö"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:593
 msgid "Svdvorak"
 msgstr "Svdvorak"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:594
 msgid "Svk"
 msgstr "Svk"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:595
 msgid "Svn"
 msgstr "Svn"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:596
 msgid "Swap Ctrl and CapsLock"
 msgstr "Vaihda Ctrl ja CapsLock"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:597
 msgid "Swap ESC and CapsLock"
 msgstr "Vaihda Esc ja CapsLock"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:598
 msgid "Swe"
 msgstr "Swe"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:599
 msgid "Sweden"
 msgstr "Ruotsi"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:600
 msgid "Switzerland"
 msgstr "Sveitsi"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:601
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (lehtiö-PC)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:602
 msgid "Syr"
 msgstr "Syr"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:603
 msgid "Syria"
 msgstr "Syyria"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:604
 msgid "Syriac"
 msgstr "Syyrialainen"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:605
 msgid "Syriac phonetic"
 msgstr "Syyrialainen foneettinen"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:606
 msgid "TIS-820.2538"
 msgstr "TIS-820.2538"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:607
 msgid "Tajikistan"
 msgstr "Tadžikistan"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:608
 msgid "Tamil"
 msgstr "Tamili"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:609
 msgid "Tamil TAB Typewriter"
 msgstr "Tamili TAB Typewriter"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:610
 msgid "Tamil TSCII Typewriter"
 msgstr "Tamili TSCII Typewriter"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:611
 msgid "Tamil Unicode"
 msgstr "Tamili Unicode"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:612
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:613
 msgid "Tatar"
 msgstr "Tataari"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:614
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:615
 msgid "Tha"
 msgstr "Tha"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:616
 msgid "Thailand"
 msgstr "Thaimaa"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:617
 msgid "Tibetan"
 msgstr "Tiibet"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:618
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tiibet (ASCII-numeroilla)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:619
 msgid "Tifinagh"
 msgstr "Tifinagh"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:620
 msgid "Tifinagh Alternative"
 msgstr "Tifinagh, vaihtoehtoinen"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:621
 msgid "Tifinagh Alternative Phonetic"
 msgstr "Tifinagh, vaihtoehtoinen foneettinen"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:622
 msgid "Tifinagh Extended"
 msgstr "Tifinagh, laajennettu"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:623
 msgid "Tifinagh Extended Phonetic"
 msgstr "Tifinagh, laajennettu foneettinen"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:624
 msgid "Tifinagh Phonetic"
 msgstr "Tifinagh, foneettinen"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:625
 msgid "Tilde (~) variant"
 msgstr "Tildemuunnos (~)"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:626
 msgid "Tjk"
 msgstr "Tjk"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:627
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Vastaavaan näppäimeen Dvorak-näppäimistössä."
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:628
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Vastaavaan näppäimeen Qwerty-näppäimistössä."
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:629
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:630
 msgid "Traditional phonetic"
 msgstr "Perinteinen foneettinen"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:631
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:632
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:633
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:634
 msgid "Tur"
 msgstr "Tur"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:635
 msgid "Turkey"
 msgstr "Turkki"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:636
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:637
 msgid "Typewriter"
 msgstr "Kirjoituskone"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:638
+msgid "Typewriter, legacy"
+msgstr "Kirjoituskone, perinteinen"
+
+#: ../rules/base.xml.in.h:639
 msgid "UCW layout (accented letters only)"
 msgstr "UCW-asettelu (vain aksenttikirjaimet)"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:640
 msgid "US keyboard with Bosnian digraphs"
 msgstr "Yhdysvaltalainen näppäimistö bosnialaisilla merkkipareilla"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:641
 msgid "US keyboard with Bosnian letters"
 msgstr "Yhdysvaltalainen näppäimistö bosnialaisilla kirjaimilla"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:642
 msgid "US keyboard with Croatian digraphs"
 msgstr "Yhdysvaltalainen näppäimistö kroatialaisilla merkkipareilla"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:643
 msgid "US keyboard with Croatian letters"
 msgstr "Yhdysvaltalainen näppäimistö kroatialaisilla kirjaimilla"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:644
 msgid "US keyboard with Estonian letters"
 msgstr "Yhdysvaltalainen näppäimistö virolaisilla kirjaimilla"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:645
 msgid "US keyboard with Italian letters"
 msgstr "Yhdysvaltalainen näppäimistö italialaisilla kirjaimilla"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:646
 msgid "US keyboard with Lithuanian letters"
 msgstr "Yhdysvaltalainen näppäimistö liettualaisilla kirjaimilla"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:647
 msgid "US keyboard with Slovenian letters"
 msgstr "Yhdysvaltalainen näppäimistö slovenialaisilla kirjaimilla"
 
-#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:648 ../rules/base.extras.xml.in.h:9
 msgid "USA"
 msgstr "USA"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:649
 msgid "Udmurt"
 msgstr "Udmurt"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:650
 msgid "Ukr"
 msgstr "Ukr"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:651
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:652
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Unicode-lisäosat (nuolet ja matematiikkatoiminnot)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:653
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Unicode-lisäosat (nuolet ja matematiikkatoiminnot). Matematiikkatoiminnot oletustasolla"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:654
 msgid "UnicodeExpert"
 msgstr "Unicode-asiantuntija"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:655
 msgid "United Kingdom"
 msgstr "Iso-Britannia"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:656
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:657
 msgid "Urdu, Alternative phonetic"
 msgstr "Urdu, vaihtoehtoinen foneettinen"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:658
 msgid "Urdu, Phonetic"
 msgstr "Urdu, foneettinen"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:659
 msgid "Urdu, Winkeys"
 msgstr "Urdu, Win-näppäimet"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:660
 msgid "Use Bosnian digraphs"
 msgstr "Käytä bosnialaisia merkkipareja"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:661
 msgid "Use Croatian digraphs"
 msgstr "Käytä kroatialaisia merkkipareja"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:662
 msgid "Use guillemets for quotes"
 msgstr "Käytä guillemot-lainausmerkkejä"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:663
 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:662
+#: ../rules/base.xml.in.h:664
 msgid "Using space key to input non-breakable space character"
 msgstr "Sitovan välilyöntimerkin syöttäminen"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:665
 msgid "Usual space at any level"
 msgstr "Normaali välilyönti kaikilla tasoilla"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:666
 msgid "Uzb"
 msgstr "Uzb"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:667
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:668
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:669
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 Internet -näppäimistö"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:670
 msgid "Vnm"
 msgstr "Vnm"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:671
 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:670
+#: ../rules/base.xml.in.h:672
 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:671
+#: ../rules/base.xml.in.h:673
 msgid "Wang model 724 azerty"
 msgstr "Wang malli 724 azerty"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:674
 msgid "Western"
 msgstr "Läntinen"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:675
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:676
 msgid "Winkeys"
 msgstr "Win-näppäimet"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:677
 msgid "With &lt;\\|&gt; key"
 msgstr "&lt;\\|&gt;-näppäimillä"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:678
 msgid "With EuroSign on 5"
 msgstr "Euro-merkki 5-näppäimessä"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:679
 msgid "With guillemets"
 msgstr "Guillemot-lainausmerkeillä"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:680
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo!-Internet-näppäimistö"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:681
 msgid "Yakut"
 msgstr "Yakut"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:682
 msgid "Yoruba"
 msgstr "Yoruba"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:683
 msgid "Z and ZHE swapped"
 msgstr "Z ja ZHE vaihdettu"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:684
 msgid "Zar"
 msgstr "Zar"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:685
 msgid "azerty"
 msgstr "azerty"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:686
 msgid "azerty/digits"
 msgstr "azerty/numerot"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:687
 msgid "digits"
 msgstr "numerot"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:688
 msgid "displaced semicolon and quote (obsolete)"
 msgstr "sijoiltaan olevat puolipilkku ja lainaismekrki (vanhentunut)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:689
 msgid "lyx"
 msgstr "lyx"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:690
 msgid "qwerty"
 msgstr "qwerty"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:691
 msgid "qwerty, extended Backslash"
 msgstr "qwerty, laajennettu Backslash"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:692
 msgid "qwerty/digits"
 msgstr "qwerty/numerot"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:693
 msgid "qwertz"
 msgstr "qwertz"
 
@@ -2794,6 +2802,12 @@ msgstr "Kansainvälinen (AltGr-Unicode-yhdistäminen)"
 msgid "International (AltGr Unicode combining, alternative)"
 msgstr "Kansainvälinen (AltGr-Unicode-yhdistäminen, vaihtoehtoinen)"
 
+#~ msgid "Baltic+"
+#~ msgstr "Baltic+"
+
+#~ msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+#~ msgstr "IBM ThinkPad 560Z/600/600E/A22E, kansainvälinen"
+
 #~ msgid "Brazilian ABNT2"
 #~ msgstr "Brasilialainen ABNT2"
 
diff --git a/xorg-server/xkbdata.src/po/fr.po b/xorg-server/xkbdata.src/po/fr.po
index fcc3850ed..42929600a 100644
--- a/xorg-server/xkbdata.src/po/fr.po
+++ b/xorg-server/xkbdata.src/po/fr.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 1.6.99\n"
+"Project-Id-Version: xkeyboard-config 1.8\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2009-09-15 23:31+0100\n"
-"PO-Revision-Date: 2009-09-16 14:54-0500\n"
+"POT-Creation-Date: 2010-01-16 18:08+0000\n"
+"PO-Revision-Date: 2010-01-18 09:46-0500\n"
 "Last-Translator: Marc Veillet <scouigne@gmail.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -93,6 +93,7 @@ msgid "102/qwertz/comma/Dead keys"
 msgstr "102/qwertz/virgule/touches mortes"
 
 #: ../rules/base.xml.in.h:19
+#, fuzzy
 msgid "102/qwertz/comma/Eliminate dead keys"
 msgstr "102/qwertz/virgule/sans touches mortes"
 
@@ -361,791 +362,791 @@ msgid "BTC 9116U Mini Wireless Internet and Gaming"
 msgstr "BTC 9116U Mini Internet et Jeu sans fil"
 
 #: ../rules/base.xml.in.h:86
-msgid "Baltic+"
-msgstr "Baltic+"
-
-#: ../rules/base.xml.in.h:87
 msgid "Ban"
 msgstr "Ban"
 
-#: ../rules/base.xml.in.h:88
+#: ../rules/base.xml.in.h:87
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:88
 msgid "Bashkirian"
 msgstr "Bashkirien"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:89
 msgid "Bel"
 msgstr "Bel"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:90
 msgid "Belarus"
 msgstr "Bélarus"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:91
 msgid "Belgium"
 msgstr "Belgique"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:92
 msgid "BenQ X-Touch"
 msgstr "BenQ X-Touch"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:93
 msgid "BenQ X-Touch 730"
 msgstr "BenQ X-Touch 730"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:94
 msgid "BenQ X-Touch 800"
 msgstr "BenQ X-Touch 800"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:95
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:96
 msgid "Bengali Probhat"
 msgstr "Bengali Probhat"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:97
 msgid "Bepo, ergonomic, Dvorak way"
 msgstr "Bépo, ergonomique, façon Dvorak"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:98
 msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
 msgstr "Bépo, ergonomique, façon Dvorak, latin-9 seulement"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:99
 msgid "Bgr"
 msgstr "Bgr"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:100
 msgid "Bhu"
 msgstr "Bhu"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:101
 msgid "Bhutan"
 msgstr "Bhoutan"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:102
 msgid "Biblical Hebrew (Tiro)"
 msgstr "Hébreu biblique (Tiro)"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:103
 msgid "Bih"
 msgstr "Bih"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:104
 msgid "Blr"
 msgstr "Blr"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:105
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnie-Herzégovine"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Les touches Alt ensemble"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Les touches Ctrl ensemble"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Les touches Maj. ensemble"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:109
 msgid "Bra"
 msgstr "Bra"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:110
 msgid "Braille"
 msgstr "Braille"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:111
 msgid "Brazil"
 msgstr "Brésil"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:112
 msgid "Breton"
 msgstr "Breton"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:113
 msgid "Brl"
 msgstr "Brl"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:114
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:115
 msgid "Buckwalter"
 msgstr "Buckwalter"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:116
 msgid "Bulgaria"
 msgstr "Bulgarie"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:117
 msgid "CRULP"
 msgstr "CRULP"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:118
 msgid "Cambodia"
 msgstr "Cambodge"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:119
 msgid "Can"
 msgstr "Can"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:120
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:121
 msgid "Caps Lock"
 msgstr "Verr. maj."
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:122
 msgid "CapsLock"
 msgstr "Verr. Maj."
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:123
 msgid "CapsLock (to first layout), Shift+CapsLock (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:125
+#: ../rules/base.xml.in.h:124
 msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
 msgstr "Verr. Maj. (lorsque pressée), Alt+Verr. Maj. provoque le même résultat"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:125
 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:127
+#: ../rules/base.xml.in.h:126
 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 sur Verr. Maj."
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:127
 msgid "CapsLock is disabled"
 msgstr "Verr. Maj. est désactivé."
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:128
 msgid "CapsLock key behavior"
 msgstr "Comportement de la touche Verrouillage majuscule"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:129
 msgid "CapsLock toggles Shift so all keys are affected"
 msgstr "Verr. maj. inverse Maj., ce qui affecte toutes les touches"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:130
 msgid "CapsLock toggles normal capitalization of alphabetic characters"
 msgstr "Verr. maj. inverse la mise en majuscule usuelle des caractères alphabétiques"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:131
 msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
 msgstr "Verr. maj. permet la mise en majuscule interne. Maj. \"annule\" le verrouillage des majuscules"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:132
 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 sur cette commande"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:133
 msgid "Catalan variant with middle-dot L"
 msgstr "Catalan avec L point médian"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:134
 msgid "Cedilla"
 msgstr "Cédille"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:135
 msgid "Che"
 msgstr "Che"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:136
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:137
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:138
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:139
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (autre option)"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:140
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:141
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:142
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:143
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:144
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:145
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:146
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:147
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:148
 msgid "China"
 msgstr "Chine"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:149
 msgid "Chuvash"
 msgstr "Chuvash"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:150
 msgid "Chuvash Latin"
 msgstr "Latin Chuvash"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:151
 msgid "Classic"
 msgstr "Classique"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:152
 msgid "Classic Dvorak"
 msgstr "Dvorak classique"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:153
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:154
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:155
 msgid "Colemak"
 msgstr "Colemak"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:156
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet (13 touches)"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet (18 touches)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet (7 touches)"
 
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:160
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:161
 msgid "Compose key position"
 msgstr "Position de la touche Compose"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:162
 msgid "Congo, Democratic Republic of the"
 msgstr "République démocratique du Congo"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Eff. arrière"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:164
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
-msgstr "La touche Ctrl est obtenue avec la touche Alt, Alt est obtenue avec les touches logo"
+msgstr "La touche Ctrl est obtenue avec la touche Alt, Alt est obtenue avec les touches Logo"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:165
 msgid "Control is mapped to 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:167
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Dobruca-1 Q)"
 msgstr "Tatar de Crimée (Q Dobruca-1)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Dobruca-2 Q)"
 msgstr "Tatar de Crimée (Q Dobruca-2)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Tatar de Crimée (Alt-Q turc)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:170
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Tatar de Crimée (F turc)"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:171
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Tatar de Crimée (Q turc)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:172
 msgid "Croatia"
 msgstr "Croatie"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:173
 msgid "Ctrl key position"
 msgstr "Position de la touche Ctrl"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:174
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Maj."
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:175
 msgid "Cyrillic"
 msgstr "Cyrillique"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:176
 msgid "Cyrillic with guillemets"
 msgstr "Cyrillique avec guillemets"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:177
 msgid "Cyrillic, Z and ZHE swapped"
 msgstr "Cyrillique, Z et ZHE permutés"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:178
 msgid "Cze"
 msgstr "Cze"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:179
 msgid "Czechia"
 msgstr "République tchèque"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:180
 msgid "DOS"
 msgstr "DOS"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:181
 msgid "DRC"
 msgstr "RDC"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:182
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:183
 msgid "Dan"
 msgstr "Dan"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:184
 msgid "Dead acute"
 msgstr "Touche morte d'accent aigu"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:185
 msgid "Dead grave acute"
 msgstr "Touche morte d'accent grave"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:186
 msgid "Default numeric keypad keys"
 msgstr "Touches du pavé numérique par défaut"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:187
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:188
 msgid "Dell 101-key PC"
 msgstr "Dell PC 101 touches"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:189
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Portable Dell Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:190
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Portable Dell Precision série M"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:191
 msgid "Dell Latitude series laptop"
 msgstr "Portable Latitude Dell"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:192
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:193
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:194
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:195
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Clavier multimédia USB Dell"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:196
 msgid "Denmark"
 msgstr "Danemark"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:197
 msgid "Deu"
 msgstr "Deu"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:198
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Desktop sans fil"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:199
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801 / 9802 series"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:200
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:201
 msgid "Dvorak (UK Punctuation)"
 msgstr "Dvorak (ponctuation britannique)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:202
 msgid "Dvorak international"
 msgstr "Dvorak international"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:203
 msgid "Dvorak, Polish quotes on key 1"
 msgstr "Dvorak, guillemets polonais sur la touche « 1 »"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:204
 msgid "Dvorak, Polish quotes on quotemark key"
 msgstr "Dvorak, guillemets polonais sur la touche des guillemets"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:205
 msgid "E"
 msgstr "E"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:206
 msgid "Eastern"
 msgstr "Orientale"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:207
 msgid "Eliminate dead keys"
 msgstr "Éliminer les touches mortes"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:208
 msgid "Enable extra typographic characters"
 msgstr "Active des caractères typographiques supplémentaires"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:209
 msgid "English"
 msgstr "Anglais"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:210
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:211
 msgid "Enter on keypad"
 msgstr "Retour sur clavier numérique"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:212
 msgid "Epo"
 msgstr "Epo"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:213
 msgid "Ergonomic"
 msgstr "Ergonomique"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:214
 msgid "Esp"
 msgstr "Esp"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:215
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:216
 msgid "Est"
 msgstr "Est"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:217
 msgid "Estonia"
 msgstr "Estonie"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:218
 msgid "Eth"
 msgstr "Eth"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:219
 msgid "Ethiopia"
 msgstr "Éthiopie"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:220
 msgid "Evdev-managed keyboard"
 msgstr "Clavier piloté par evdev"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:221
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:222
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:223
 msgid "Extended"
 msgstr "Étendue"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:224
 msgid "Extended - Winkeys"
-msgstr "Étendue - Touches logo"
+msgstr "Étendue - Touches Logo"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:225
 msgid "Extended Backslash"
 msgstr "Barre contre-oblique étendue"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:226
 msgid "F-letter (F) variant"
 msgstr "Variante (F)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:227
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:228
 msgid "Fao"
 msgstr "Fao"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:229
 msgid "Faroe Islands"
 msgstr "Féroé, Îles"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:230
 msgid "Fin"
 msgstr "Fin"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:231
 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:235
+#: ../rules/base.xml.in.h:234
 msgid "Four-level key with abstract separators"
 msgstr "Touches à quatre niveaux avec séparateurs abstraits"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:235
 msgid "Four-level key with comma"
 msgstr "Touches à quatre niveaux avec virgule"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:236
 msgid "Four-level key with dot"
 msgstr "Touches à quatre niveaux avec point"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:237
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Touches à quatre niveaux avec point, avec restrinction Latin-9"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:238
 msgid "Four-level key with momayyez"
 msgstr "Touches à quatre niveaux avec momayyez"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:239
 msgid "Fra"
 msgstr "Fra"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:240
 msgid "France"
 msgstr "France"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:241
 msgid "French"
 msgstr "Français"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:242
 msgid "French (Macintosh)"
 msgstr "Français (Apple-Macintosh)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:243
 msgid "French (legacy)"
 msgstr "Français (obsolète)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:244
 msgid "French Dvorak"
 msgstr "Dvorak français"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:245
 msgid "French, Sun dead keys"
 msgstr "Français, touches mortes Sun"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:246
 msgid "French, eliminate dead keys"
 msgstr "Français, sans touches mortes"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:247
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Portable Fujitsu-Siemens Computers AMILO"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:248
 msgid "Fula"
 msgstr "Peul"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:249
 msgid "GBr"
 msgstr "GBr"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:250
 msgid "Ga"
 msgstr "Ga"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:251
 msgid "Generic 101-key PC"
 msgstr "PC générique 101 touches"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:252
 msgid "Generic 102-key (Intl) PC"
 msgstr "PC générique 102 touches (intl)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:253
 msgid "Generic 104-key PC"
 msgstr "PC générique 104 touches"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:254
 msgid "Generic 105-key (Intl) PC"
 msgstr "PC générique 105 touches (intl)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:255
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:256
 msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
 msgstr "Genius Comfy KB-16M / Genius MM KWD-910"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:257
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:258
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:259
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:260
 msgid "Geo"
 msgstr "Geo"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:261
 msgid "Georgia"
 msgstr "Géorgie"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:262
 msgid "Georgian"
 msgstr "Géorgien"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:263
 msgid "Georgian AZERTY Tskapo"
 msgstr "AZERTY géorgien Tskapo"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:264
 msgid "German (Macintosh)"
 msgstr "Allemand (Apple-Macintosh)"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:265
 msgid "German, Sun dead keys"
 msgstr "Allemand, touches mortes Sun"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:266
 msgid "German, eliminate dead keys"
 msgstr "Allemand, sans touches mortes"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:267
 msgid "Germany"
 msgstr "Allemagne"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:268
 msgid "Gha"
 msgstr "Gha"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:269
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:270
 msgid "Gre"
 msgstr "Gre"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:271
 msgid "Greece"
 msgstr "Grèce"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:272
 msgid "Group toggle on multiply/divide key"
 msgstr "Les touches Multiplier/Diviser basculent d'un groupe à l'autre"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:273
 msgid "Gui"
 msgstr "Gui"
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:274
 msgid "Guinea"
 msgstr "Guinée"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:275
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:276
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:277
 msgid "Gurmukhi Jhelum"
 msgstr "Gurmukhi Jhelum"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:278
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:279
 msgid "Happy Hacking Keyboard"
 msgstr "Clavier Happy Hacking"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:280
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Clavier Happy Hacking pour Mac"
 
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:281
 msgid "Hausa"
 msgstr "Haoussa"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:282
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet"
 
+#: ../rules/base.xml.in.h:283
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard Mini 110 Notebook"
+
 #: ../rules/base.xml.in.h:284
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
@@ -1243,293 +1244,293 @@ msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:308
-msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E (Intl)"
-
-#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:310
 msgid "ISO Alternate"
 msgstr "Autre ISO"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:311
 msgid "Iceland"
 msgstr "Islande"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:312
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:313
 msgid "Include dead tilde"
 msgstr "Inclut le tilde"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:314
 msgid "Ind"
 msgstr "Ind"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:315
 msgid "India"
 msgstr "Inde"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:316
 msgid "International (AltGr dead keys)"
 msgstr "International (AltCar et touches mortes)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:317
 msgid "International (with dead keys)"
 msgstr "International (avec touches mortes)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:318
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:319
 msgid "Iran"
 msgstr "Iran"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:320
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:321
 msgid "Ireland"
 msgstr "Irlande"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:322
 msgid "Irl"
 msgstr "Irl"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:323
 msgid "Irn"
 msgstr "Irn"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:324
 msgid "Irq"
 msgstr "Irq"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:325
 msgid "Isl"
 msgstr "Isl"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:326
 msgid "Isr"
 msgstr "Isr"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:327
 msgid "Israel"
 msgstr "Israël"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:328
 msgid "Ita"
 msgstr "Ita"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:329
 msgid "Italy"
 msgstr "Italie"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:330
 msgid "Japan"
 msgstr "Japon"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:331
 msgid "Japan (PC-98xx Series)"
 msgstr "PC-98xx japonais"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:332
 msgid "Japanese keyboard options"
 msgstr "Options de clavier japonais"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:333
 msgid "Jpn"
 msgstr "Jpn"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:334
 msgid "Kalmyk"
 msgstr "Kalmyk"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:335
 msgid "Kana"
 msgstr "Kana"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:336
 msgid "Kana Lock key is locking"
 msgstr "La touche de verrouillage Kana agit comme touche de verrouillage"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:337
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:338
 msgid "Kashubian"
 msgstr "Kachoube"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:339
 msgid "Kaz"
 msgstr "Kaz"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:340
 msgid "Kazakh with Russian"
 msgstr "Kazakh avec russe"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:341
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:342
 msgid "Key sequence to kill the X server"
 msgstr "Séquence de touches pour fermer le serveur X"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:343
 msgid "Key to choose 3rd level"
 msgstr "Touche sélectionnant le 3e niveau"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:344
 msgid "Key(s) to change layout"
 msgstr "Touche(s) changeant de disposition."
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:345
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:346
 msgid "Kgz"
 msgstr "Kgz"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:347
 msgid "Khm"
 msgstr "Khm"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:348
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:349
 msgid "Kor"
 msgstr "Kor"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:350
 msgid "Korea, Republic of"
 msgstr "Corée, République de"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:351
 msgid "Ktunaxa"
 msgstr "Ktunaxa"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:352
 msgid "Kurdish, (F)"
 msgstr "Kurde, (F)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:353
 msgid "Kurdish, Arabic-Latin"
 msgstr "Kurde, Arabe-latin"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:354
 msgid "Kurdish, Latin Alt-Q"
 msgstr "Kurde, Latin Alt-Q"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:355
 msgid "Kurdish, Latin Q"
 msgstr "Kurde, Latin Q"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:356
 msgid "Kyrgyzstan"
 msgstr "Kirghizistan"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:357
 msgid "LAm"
 msgstr "LAm"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:358
 msgid "LEKP"
 msgstr "LEKP"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:359
 msgid "LEKPa"
 msgstr "LEKPa"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:360
 msgid "Lao"
 msgstr "Lao"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:361
 msgid "Laos"
 msgstr "Laos"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:362
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Compaq portable (p.e. Armada)"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:363
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Compaq portable Internet (p.e. Presario)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:364
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "eMachines m68xx"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:365
 msgid "Latin"
 msgstr "Latin"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:366
 msgid "Latin American"
 msgstr "Amérique latine"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:367
 msgid "Latin Unicode"
 msgstr "Latin Unicode"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:368
 msgid "Latin Unicode qwerty"
 msgstr "Latin Unicode qwerty"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:369
 msgid "Latin qwerty"
 msgstr "Latin qwerty"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:370
 msgid "Latin unicode"
 msgstr "Unicode Latin"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:371
 msgid "Latin unicode qwerty"
 msgstr "Unicode Latin QWERTY"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:372
 msgid "Latin with guillemets"
 msgstr "Latin avec guillemets"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:373
 msgid "Latvia"
 msgstr "Lettonie"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:374
 msgid "Lav"
 msgstr "Lav"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:375
 msgid "Left Alt"
 msgstr "Alt gauche"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:376
 msgid "Left Alt (while pressed)"
 msgstr "Alt de gauche (lorsque pressée)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:377
 msgid "Left Alt is swapped with Left Win"
 msgstr "La touche Alt de gauche est échangée avec la touche Logo de gauche"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:378
 msgid "Left Ctrl"
 msgstr "Ctrl gauche"
 
+#: ../rules/base.xml.in.h:379
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr "Ctrl gauche (première disposition), Ctrl droi (dernière disposition)"
+
 #: ../rules/base.xml.in.h:380
 msgid "Left Ctrl+Left Shift"
 msgstr "Ctrl gauche+Maj. gauche"
@@ -1544,7 +1545,7 @@ msgstr "Touche Logo gauche"
 
 #: ../rules/base.xml.in.h:383
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
-msgstr "Touche logo de gauche (première disposition), touche logo de droite (dernière disposition)"
+msgstr "Touche Logo de gauche (première disposition), touche Logo de droite (dernière disposition)"
 
 #: ../rules/base.xml.in.h:384
 msgid "Left Win (while pressed)"
@@ -2097,7 +2098,7 @@ msgstr "Phonétique"
 
 #: ../rules/base.xml.in.h:522
 msgid "Phonetic Winkeys"
-msgstr "Touches logo phonétiques"
+msgstr "Touches Logo phonétiques"
 
 #: ../rules/base.xml.in.h:523
 msgid "Pol"
@@ -2164,608 +2165,616 @@ msgid "Right Ctrl as Right Alt"
 msgstr "Ctrl de droite comme Alt de droite"
 
 #: ../rules/base.xml.in.h:539
+msgid "Right Ctrl+Right Shift"
+msgstr "Ctrl de droite + Majuscule de droite"
+
+#: ../rules/base.xml.in.h:540
 msgid "Right Shift"
 msgstr "Maj. droite"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:541
 msgid "Right Win"
-msgstr "Touche logo droite"
+msgstr "Touche Logo droite"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:542
 msgid "Right Win (while pressed)"
-msgstr "Touche logo de  (lorsque pressée)"
+msgstr "Touche Logo de  (lorsque pressée)"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:543
 msgid "Right hand"
 msgstr "Main droite"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:544
 msgid "Right handed Dvorak"
 msgstr "Dvorak pour droitier"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:545
 msgid "Romania"
 msgstr "Roumanie"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:546
 msgid "Romanian keyboard with German letters"
 msgstr "Clavier roumain avec lettres allemandes"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:547
 msgid "Romanian keyboard with German letters, eliminate dead keys"
 msgstr "Clavier roumain avec lettres allemandes, sans touches mortes"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:548
 msgid "Rou"
 msgstr "Rou"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:549
 msgid "Rus"
 msgstr "Rus"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:550
 msgid "Russia"
 msgstr "Russie"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:551
 msgid "Russian"
 msgstr "Russe"
 
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:552
 msgid "Russian phonetic"
 msgstr "Phonétique russe"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:553
 msgid "Russian phonetic Dvorak"
 msgstr "Dvorak phonétique russe"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:554
 msgid "Russian phonetic, eliminate dead keys"
 msgstr "Phonétique russe, sans lettres mortes"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:555
 msgid "Russian with Kazakh"
 msgstr "Russe avec kazakh"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:556
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia sans fil"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:557
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:558
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:559
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:560
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:560 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:7
 msgid "SRB"
 msgstr "SRB"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:562
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:563
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:564
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:565
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:566
 msgid "Scroll Lock"
 msgstr "Arrêt défilement"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:567
 msgid "ScrollLock"
 msgstr "Arrêt défil."
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:568
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:569
 msgid "Semi-colon on third level"
 msgstr "Point virgule au 3e niveau"
 
-#: ../rules/base.xml.in.h:569 ../rules/base.extras.xml.in.h:8
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:8
 msgid "Serbia"
 msgstr "Serbie"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:571
 msgid "Shift cancels CapsLock"
 msgstr "Maj. annule le verrouillage majuscule"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:572
 msgid "Shift does not cancel NumLock, chooses 3d level instead"
 msgstr "Maj. n'annule pas le verrouillage numérique; choisir le 3e niveau"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:573
 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:573
+#: ../rules/base.xml.in.h:574
 msgid "Shift+CapsLock"
 msgstr "Maj.+ Verr. maj."
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:575
 msgid "Simple"
 msgstr "Simple"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:576
 msgid "Slovakia"
 msgstr "Slovaquie"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:577
 msgid "Slovenia"
 msgstr "Slovénie"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:578
 msgid "South Africa"
 msgstr "Afrique du Sud"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:579
 msgid "Southern Uzbek"
 msgstr "Ouzbek du Sud"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:580
 msgid "Spain"
 msgstr "Espagne"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:581
 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:581
+#: ../rules/base.xml.in.h:582
 msgid "SrL"
 msgstr "SrL"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:583
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:584
 msgid "Standard"
 msgstr "Standard"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:585
 msgid "Standard (Cedilla)"
 msgstr "Standard (cédille)"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:587
 msgid "Standard RSTU"
 msgstr "Standard RSTU"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:589
 msgid "Standard RSTU on Russian layout"
 msgstr "Standard RSTU avec une disposition russe"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:590
 msgid "Sun Type 5/6"
 msgstr "Sun Type 5/6"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:591
 msgid "Sun dead keys"
 msgstr "Touches mortes Sun"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:592
 msgid "Super Power Multimedia Keyboard"
 msgstr "Multimedia Super Power"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:593
 msgid "Svdvorak"
 msgstr "Svdvorak"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:594
 msgid "Svk"
 msgstr "Svk"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:595
 msgid "Svn"
 msgstr "Svn"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:596
 msgid "Swap Ctrl and CapsLock"
 msgstr "Permuter Ctrl et Verr. maj."
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:597
 msgid "Swap ESC and CapsLock"
 msgstr "Permuter ESC et Verr. maj."
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:598
 msgid "Swe"
 msgstr "Sué"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:599
 msgid "Sweden"
 msgstr "Suède"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:600
 msgid "Switzerland"
 msgstr "Suisse"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:601
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:602
 msgid "Syr"
 msgstr "Syr"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:603
 msgid "Syria"
 msgstr "Syrie"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:604
 msgid "Syriac"
 msgstr "Syriaque"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:605
 msgid "Syriac phonetic"
 msgstr "Phonétique syriaque"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:606
 msgid "TIS-820.2538"
 msgstr "TIS-820.2538"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:607
 msgid "Tajikistan"
 msgstr "Tadjikistan"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:608
 msgid "Tamil"
 msgstr "Tamoul"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:609
 msgid "Tamil TAB Typewriter"
 msgstr "Machine à écrire tamoule TAB"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:610
 msgid "Tamil TSCII Typewriter"
 msgstr "Machine à écrire tamoule TSCII"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:611
 msgid "Tamil Unicode"
 msgstr "Unicode tamoul"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:612
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:613
 msgid "Tatar"
 msgstr "Tatar"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:614
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:615
 msgid "Tha"
 msgstr "Tha"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:616
 msgid "Thailand"
 msgstr "Thaïlande"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:617
 msgid "Tibetan"
 msgstr "Tibétain"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:618
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibétain (avec touches numériques ASCII)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:619
 msgid "Tifinagh"
 msgstr "Tifinagh"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:620
 msgid "Tifinagh Alternative"
 msgstr "Tifinagh alternatif"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:621
 msgid "Tifinagh Alternative Phonetic"
 msgstr "Tifinagh avec phonétique alternative"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:622
 msgid "Tifinagh Extended"
 msgstr "Tifinagh étendu"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:623
 msgid "Tifinagh Extended Phonetic"
 msgstr "Tifinagh avec phonétique étendue"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:624
 msgid "Tifinagh Phonetic"
 msgstr "Tifinagh phonétique"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:625
 msgid "Tilde (~) variant"
 msgstr "Variante avec tilde"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:626
 msgid "Tjk"
 msgstr "Tjk"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:627
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Mène à la touche correspondante sur un clavier Dvorak."
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:628
 msgid "To the corresponding key in a Qwerty keyboard."
-msgstr "Mène à la touche correspondante sur un clavier Qwerty"
+msgstr "Mène à la touche correspondante sur un clavier Qwerty."
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:629
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:630
 msgid "Traditional phonetic"
 msgstr "Phonétique traditionnel"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:631
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:632
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:633
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Classic"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:634
 msgid "Tur"
 msgstr "Tur"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:635
 msgid "Turkey"
 msgstr "Turquie"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:636
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:637
 msgid "Typewriter"
 msgstr "Machine à écrire"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:638
+msgid "Typewriter, legacy"
+msgstr "Machine à écrire"
+
+#: ../rules/base.xml.in.h:639
 msgid "UCW layout (accented letters only)"
 msgstr "Disposition UCW (lettres accentuées seulement)"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:640
 msgid "US keyboard with Bosnian digraphs"
 msgstr "Clavier US avec digraphes bosniaques"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:641
 msgid "US keyboard with Bosnian letters"
 msgstr "Clavier US avec lettres bosniaques"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:642
 msgid "US keyboard with Croatian digraphs"
 msgstr "Clavier US avec digraphes croates"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:643
 msgid "US keyboard with Croatian letters"
 msgstr "Clavier US avec lettres croates"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:644
 msgid "US keyboard with Estonian letters"
 msgstr "Clavier US avec lettres estoniennes"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:645
 msgid "US keyboard with Italian letters"
 msgstr "Clavier US avec lettres italiennes"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:646
 msgid "US keyboard with Lithuanian letters"
 msgstr "Clavier US avec lettres lituaniennes"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:647
 msgid "US keyboard with Slovenian letters"
 msgstr "Clavier US avec lettres slovènes"
 
-#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:648 ../rules/base.extras.xml.in.h:9
 msgid "USA"
 msgstr "USA"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:649
 msgid "Udmurt"
 msgstr "Oudmourte"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:650
 msgid "Ukr"
 msgstr "Ukr"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:651
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:652
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Ajouts Unicode (touches fléchées et opérateurs mathématiques)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:653
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "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:652
+#: ../rules/base.xml.in.h:654
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:655
 msgid "United Kingdom"
 msgstr "Royaume-Uni"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:656
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:657
 msgid "Urdu, Alternative phonetic"
 msgstr "Ourdou, phonétique alternatif"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:658
 msgid "Urdu, Phonetic"
 msgstr "Ourdou, phonétique"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:659
 msgid "Urdu, Winkeys"
 msgstr "Ourdou, touches Logo"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:660
 msgid "Use Bosnian digraphs"
 msgstr "Avec digraphes bosniaques"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:661
 msgid "Use Croatian digraphs"
 msgstr "Avec digraphes croates"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:662
 msgid "Use guillemets for quotes"
 msgstr "Remplacer les guillemets droits avec les guillements français"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:663
 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:662
+#: ../rules/base.xml.in.h:664
 msgid "Using space key to input non-breakable space character"
-msgstr "Utiliser la barre d'espacement pout insérer un espace insécable"
+msgstr "Utiliser la barre d'espacement pour insérer un espace insécable"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:665
 msgid "Usual space at any level"
 msgstr "La barre d'espacement renvoie une espace ordinaire à tous les niveaux"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:666
 msgid "Uzb"
 msgstr "Uzb"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:667
 msgid "Uzbekistan"
 msgstr "Ouzbékistan"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:668
 msgid "Vietnam"
 msgstr "Viêt Nam"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:669
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "Clavier Internet ViewSonic KU-306"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:670
 msgid "Vnm"
 msgstr "Vnm"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:671
 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:670
+#: ../rules/base.xml.in.h:672
 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:671
+#: ../rules/base.xml.in.h:673
 msgid "Wang model 724 azerty"
 msgstr "Modèle Wang 724 azerty"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:674
 msgid "Western"
 msgstr "Occidentale"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:675
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:676
 msgid "Winkeys"
 msgstr "Touches Logo"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:677
 msgid "With &lt;\\|&gt; key"
 msgstr "Avec la touche &lt;\\|&gt;"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:678
 msgid "With EuroSign on 5"
 msgstr "Avec le signe Euro sur la touche 5."
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:679
 msgid "With guillemets"
 msgstr "Avec guillemets"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:680
 msgid "Yahoo! Internet Keyboard"
 msgstr "Clavier Yahoo! Internet"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:681
 msgid "Yakut"
 msgstr "Yacoute"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:682
 msgid "Yoruba"
 msgstr "Yoruba"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:683
 msgid "Z and ZHE swapped"
 msgstr "Z et ZHE permutés"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:684
 msgid "Zar"
 msgstr "Zar"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:685
 msgid "azerty"
 msgstr "azerty"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:686
 msgid "azerty/digits"
 msgstr "azerty/chiffres"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:687
 msgid "digits"
 msgstr "chiffres"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:688
 msgid "displaced semicolon and quote (obsolete)"
 msgstr "(Obsolète) Point-virgule et guillemets droits déplacés"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:689
 msgid "lyx"
 msgstr "lyx"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:690
 msgid "qwerty"
 msgstr "qwerty"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:691
 msgid "qwerty, extended Backslash"
 msgstr "qwerty, contre-oblique étendue"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:692
 msgid "qwerty/digits"
 msgstr "qwerty/chiffres"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:693
 msgid "qwertz"
 msgstr "qwertz"
 
@@ -2793,6 +2802,12 @@ msgstr "International (AltCar et Unicode)"
 msgid "International (AltGr Unicode combining, alternative)"
 msgstr "International (AltCar et Unicode, alternatif))"
 
+#~ msgid "Baltic+"
+#~ msgstr "Baltic+"
+
+#~ msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+#~ msgstr "IBM ThinkPad 560Z/600/600E/A22E (Intl)"
+
 #~ msgid "Keypad"
 #~ msgstr "Pavé numérique"
 
diff --git a/xorg-server/xkbdata.src/po/id.po b/xorg-server/xkbdata.src/po/id.po
index 0f955d14f..f37661499 100644
--- a/xorg-server/xkbdata.src/po/id.po
+++ b/xorg-server/xkbdata.src/po/id.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2008 THE xkeyboard-config'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the xkeyboard-config package.
 # Erwid M Jadied <jadied@gmail.com>, 2008.
-# Andhika Padmawan <andhika.padmawan@gmail.com>, 2009.
+# Andhika Padmawan <andhika.padmawan@gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-1.6.99\n"
+"Project-Id-Version: xkeyboard-config-1.8\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2009-09-15 23:31+0100\n"
-"PO-Revision-Date: 2009-09-17 11:53-0400\n"
+"POT-Creation-Date: 2010-01-16 18:08+0000\n"
+"PO-Revision-Date: 2010-01-17 15:58+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -359,791 +359,791 @@ msgid "BTC 9116U Mini Wireless Internet and Gaming"
 msgstr "BTC 91116U Internet dan Permainan Nirkabel Mini"
 
 #: ../rules/base.xml.in.h:86
-msgid "Baltic+"
-msgstr "Baltic+"
-
-#: ../rules/base.xml.in.h:87
 msgid "Ban"
 msgstr "Ban"
 
-#: ../rules/base.xml.in.h:88
+#: ../rules/base.xml.in.h:87
 msgid "Bangladesh"
 msgstr "Banglades"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:88
 msgid "Bashkirian"
 msgstr "Bashkirian"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:89
 msgid "Bel"
 msgstr "Bel"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:90
 msgid "Belarus"
 msgstr "Belarus"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:91
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:92
 msgid "BenQ X-Touch"
 msgstr "BenQ X-Touch"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:93
 msgid "BenQ X-Touch 730"
 msgstr "BenQ X-Touch 730"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:94
 msgid "BenQ X-Touch 800"
 msgstr "BenQ X-Touch 800"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:95
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:96
 msgid "Bengali Probhat"
 msgstr "Bengali Probhat"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:97
 msgid "Bepo, ergonomic, Dvorak way"
 msgstr "Bepo, ergonomic, Dvorak way"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:98
 msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
 msgstr "Bepo, ergonomic, Dvorak way, latin-9 only"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:99
 msgid "Bgr"
 msgstr "Bgr"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:100
 msgid "Bhu"
 msgstr "Bhu"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:101
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:102
 msgid "Biblical Hebrew (Tiro)"
 msgstr "Biblical Hebrew (Tiro)"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:103
 msgid "Bih"
 msgstr "Bih"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:104
 msgid "Blr"
 msgstr "Blr"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:105
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia dan Herzegovina"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Kedua tombol Alt bersama"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Kedua tombol Ctrl bersama"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Kedua tombol Shift bersama"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:109
 msgid "Bra"
 msgstr "Bra"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:110
 msgid "Braille"
 msgstr "Braille"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:111
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:112
 msgid "Breton"
 msgstr "Breton"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:113
 msgid "Brl"
 msgstr "Brl"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:114
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet Keyboard"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:115
 msgid "Buckwalter"
 msgstr "Buckwalter"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:116
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:117
 msgid "CRULP"
 msgstr "CRULP"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:118
 msgid "Cambodia"
 msgstr "Kamboja"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:119
 msgid "Can"
 msgstr "Can"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:120
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:121
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:122
 msgid "CapsLock"
 msgstr "CapsLock"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:123
 msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
 msgstr "CapsLock (ke tata letak pertama), Shift+CapsLock (ke tata letak terakhir)"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:124
 msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
 msgstr "CapsLock (ketika ditekan), Alt+CapsLock melakukan aksi capslock asli"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:125
 msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
 msgstr "CapsLock bertindak sebagai Shift dengan mengunci. Shift \"jeda\" CapsLock."
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:126
 msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
 msgstr "CapsLock bertindak sebagai Shift yang terkunci. Shift tidak mempengaruhi CapsLock"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:127
 msgid "CapsLock is disabled"
 msgstr "CapsLock dinonaktifkan"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:128
 msgid "CapsLock key behavior"
 msgstr "Tindakan tombol CapsLock"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:129
 msgid "CapsLock toggles Shift so all keys are affected"
 msgstr "CapsLock toggle Shift sehingga semua tombol terpengaruh"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:130
 msgid "CapsLock toggles normal capitalization of alphabetic characters"
 msgstr "CapsLock toggle huruf besar normal atau karakter secara alfabet"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:131
 msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
 msgstr "CapsLock menggunakan huruf besar internal. Shift \"pauses\" CapsLock"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:132
 msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
 msgstr "CapsLock menggunakan huruf besar internal. Shift tidak mempengaruhi CapsLock"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:133
 msgid "Catalan variant with middle-dot L"
 msgstr "Varian Katalan dengan titik-tengah pada L"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:134
 msgid "Cedilla"
 msgstr "Cedilla"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:135
 msgid "Che"
 msgstr "Che"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:136
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:137
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:138
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:139
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (alternate option)"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:140
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:141
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:142
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:143
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:144
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet Keyboard"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:145
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:146
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:147
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:148
 msgid "China"
 msgstr "China"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:149
 msgid "Chuvash"
 msgstr "Chuvash"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:150
 msgid "Chuvash Latin"
 msgstr "Chuvash Latin"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:151
 msgid "Classic"
 msgstr "Classic"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:152
 msgid "Classic Dvorak"
 msgstr "Classic Dvorak"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:153
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:154
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:155
 msgid "Colemak"
 msgstr "Colemak"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:156
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access Keyboard"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard (13 tombol)"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 tombol)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 tombol)"
 
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:160
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq Keyboard"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:161
 msgid "Compose key position"
 msgstr "Posisi tombol Compose"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:162
 msgid "Congo, Democratic Republic of the"
 msgstr "Kongo, Republik Demokrat"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Backspace"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:164
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "Kendali dipetakan ke tombol Alt, Alt dipetakan ke tombol Win"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:165
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "Kendali dipetakan ke tombol Win ( dan tombol Ctrl biasa)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Dobruca-1 Q)"
 msgstr "Crimean Tatar (Dobruca-1 Q)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Dobruca-2 Q)"
 msgstr "Crimean Tatar (Dobruca-2 Q)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Crimean Tatar (Turkish Alt-Q)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:170
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Crimean Tatar (Turkish F)"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:171
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Crimean Tatar (Turkish Q)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:172
 msgid "Croatia"
 msgstr "Kroasia"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:173
 msgid "Ctrl key position"
 msgstr "Posisi tombol Ctrl"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:174
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:175
 msgid "Cyrillic"
 msgstr "Cyrillic"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:176
 msgid "Cyrillic with guillemets"
 msgstr "Cyrillic dengan guillemets"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:177
 msgid "Cyrillic, Z and ZHE swapped"
 msgstr "Cyrillic, Z dan ZHE di-swap"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:178
 msgid "Cze"
 msgstr "Cze"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:179
 msgid "Czechia"
 msgstr "Czechia"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:180
 msgid "DOS"
 msgstr "DOS"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:181
 msgid "DRC"
 msgstr "DRC"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:182
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:183
 msgid "Dan"
 msgstr "Dan"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:184
 msgid "Dead acute"
 msgstr "Dead acute"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:185
 msgid "Dead grave acute"
 msgstr "Dead grave acute"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:186
 msgid "Default numeric keypad keys"
 msgstr "Tombol angka keypad standar"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:187
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:188
 msgid "Dell 101-key PC"
 msgstr "Dell 101-key PC"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:189
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:190
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell Laptop/notebook Precision M series"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:191
 msgid "Dell Latitude series laptop"
 msgstr "Dell Latitude series laptop"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:192
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:193
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:194
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:195
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:196
 msgid "Denmark"
 msgstr "Denmark"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:197
 msgid "Deu"
 msgstr "Deu"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:198
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:199
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801 / 9802 series"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:200
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:201
 msgid "Dvorak (UK Punctuation)"
 msgstr "Dvorak (UK Punctuation)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:202
 msgid "Dvorak international"
 msgstr "Dvorak international"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:203
 msgid "Dvorak, Polish quotes on key 1"
 msgstr "Dvorak, tanda kutip Polandia pada tombol 1"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:204
 msgid "Dvorak, Polish quotes on quotemark key"
 msgstr "Dvorak, tanda kutip Polandia pada tombol quotemark"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:205
 msgid "E"
 msgstr "E"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:206
 msgid "Eastern"
 msgstr "Eastern"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:207
 msgid "Eliminate dead keys"
 msgstr "Hapus tombol mati"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:208
 msgid "Enable extra typographic characters"
 msgstr "Aktifkan karakter tipografi ekstra"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:209
 msgid "English"
 msgstr "Inggris"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:210
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:211
 msgid "Enter on keypad"
 msgstr "Enter pada keypad"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:212
 msgid "Epo"
 msgstr "Epo"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:213
 msgid "Ergonomic"
 msgstr "Ergonomic"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:214
 msgid "Esp"
 msgstr "Esp"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:215
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:216
 msgid "Est"
 msgstr "Est"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:217
 msgid "Estonia"
 msgstr "Estonia"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:218
 msgid "Eth"
 msgstr "Eth"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:219
 msgid "Ethiopia"
 msgstr "Ethiopia"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:220
 msgid "Evdev-managed keyboard"
 msgstr "Evdev-managed keyboard"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:221
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:222
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:223
 msgid "Extended"
 msgstr "Extended"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:224
 msgid "Extended - Winkeys"
 msgstr "Extended - Winkeys"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:225
 msgid "Extended Backslash"
 msgstr "Extended Backslash"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:226
 msgid "F-letter (F) variant"
 msgstr "varian huruf-F (F)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:227
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:228
 msgid "Fao"
 msgstr "Fao"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:229
 msgid "Faroe Islands"
 msgstr "kepulauan Farao"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:230
 msgid "Fin"
 msgstr "Fin"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:231
 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:235
+#: ../rules/base.xml.in.h:234
 msgid "Four-level key with abstract separators"
 msgstr "Tombol empat-tingkat dengan pemisah abstrak"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:235
 msgid "Four-level key with comma"
 msgstr "Tombol empat-tingkat dengan koma"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:236
 msgid "Four-level key with dot"
 msgstr "Tombol empat-tingkat dengan titik"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:237
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Tombol empat-tingkat dengan titik, pembatasan latin-9"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:238
 msgid "Four-level key with momayyez"
 msgstr "Tombol empat tingkat dengan momayyez"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:239
 msgid "Fra"
 msgstr "Fra"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:240
 msgid "France"
 msgstr "Perancis"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:241
 msgid "French"
 msgstr "Perancis"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:242
 msgid "French (Macintosh)"
 msgstr "French (Macintosh)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:243
 msgid "French (legacy)"
 msgstr "French (legacy)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:244
 msgid "French Dvorak"
 msgstr "French Dvorak"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:245
 msgid "French, Sun dead keys"
 msgstr "Frence, Tombol mati Matahari"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:246
 msgid "French, eliminate dead keys"
 msgstr "French, hapus tombol mati"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:247
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO laptop"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:248
 msgid "Fula"
 msgstr "Fula"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:249
 msgid "GBr"
 msgstr "GBr"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:250
 msgid "Ga"
 msgstr "Ga"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:251
 msgid "Generic 101-key PC"
 msgstr "Generic 101-key PC"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:252
 msgid "Generic 102-key (Intl) PC"
 msgstr "Generic 102-key (Intl) PC"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:253
 msgid "Generic 104-key PC"
 msgstr "Generic 104-key PC"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:254
 msgid "Generic 105-key (Intl) PC"
 msgstr "Generic 105-key (Intl) PC"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:255
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:256
 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:258
+#: ../rules/base.xml.in.h:257
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:258
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:259
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:260
 msgid "Geo"
 msgstr "Geo"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:261
 msgid "Georgia"
 msgstr "Georgia"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:262
 msgid "Georgian"
 msgstr "Georgia"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:263
 msgid "Georgian AZERTY Tskapo"
 msgstr "Georgian AZERTY Tskapo"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:264
 msgid "German (Macintosh)"
 msgstr "German (Macintosh)"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:265
 msgid "German, Sun dead keys"
 msgstr "German, Tombol mati Matahari"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:266
 msgid "German, eliminate dead keys"
 msgstr "German, hapus tombol mati"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:267
 msgid "Germany"
 msgstr "Jerman"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:268
 msgid "Gha"
 msgstr "Gha"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:269
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:270
 msgid "Gre"
 msgstr "Gre"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:271
 msgid "Greece"
 msgstr "Yunani"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:272
 msgid "Group toggle on multiply/divide key"
 msgstr "Grup toggle pada tombol perkalian/pembagian"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:273
 msgid "Gui"
 msgstr "Gui"
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:274
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:275
 msgid "Gujarati"
 msgstr "Gujurati"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:276
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:277
 msgid "Gurmukhi Jhelum"
 msgstr "Gurmukhi Jhelum"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:278
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:279
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking Keyboard"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:280
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Happy Hacking Keyboard untukr Mac"
 
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:281
 msgid "Hausa"
 msgstr "Hausa"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:282
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard"
 
+#: ../rules/base.xml.in.h:283
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard Mini 110 Notebook"
+
 #: ../rules/base.xml.in.h:284
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
@@ -1241,293 +1241,293 @@ msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:308
-msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-
-#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:310
 msgid "ISO Alternate"
 msgstr "ISO Alternate"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:311
 msgid "Iceland"
 msgstr "Islandia"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:312
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:313
 msgid "Include dead tilde"
 msgstr "Termasuk tilde mati"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:314
 msgid "Ind"
 msgstr "Ind"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:315
 msgid "India"
 msgstr "India"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:316
 msgid "International (AltGr dead keys)"
 msgstr "Internasional (AltGr tombol mati)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:317
 msgid "International (with dead keys)"
 msgstr "Internasional (dengan tombol mati)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:318
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:319
 msgid "Iran"
 msgstr "Iran"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:320
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:321
 msgid "Ireland"
 msgstr "Irlandia"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:322
 msgid "Irl"
 msgstr "Irl"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:323
 msgid "Irn"
 msgstr "Irn"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:324
 msgid "Irq"
 msgstr "Irq"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:325
 msgid "Isl"
 msgstr "Isl"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:326
 msgid "Isr"
 msgstr "Isr"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:327
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:328
 msgid "Ita"
 msgstr "Ita"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:329
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:330
 msgid "Japan"
 msgstr "Jepang"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:331
 msgid "Japan (PC-98xx Series)"
 msgstr "Japan (PC-98xx Series)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:332
 msgid "Japanese keyboard options"
 msgstr "Pilihan Keyboard Jepang"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:333
 msgid "Jpn"
 msgstr "Jpn"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:334
 msgid "Kalmyk"
 msgstr "Kalmyk"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:335
 msgid "Kana"
 msgstr "Kana"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:336
 msgid "Kana Lock key is locking"
 msgstr "Tombol Kana Lock terkunci"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:337
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:338
 msgid "Kashubian"
 msgstr "Kashubian"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:339
 msgid "Kaz"
 msgstr "Kaz"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:340
 msgid "Kazakh with Russian"
 msgstr "Kazakh dengan Rusia"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:341
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:342
 msgid "Key sequence to kill the X server"
 msgstr "Sekuensi kunci untuk mematikan server X"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:343
 msgid "Key to choose 3rd level"
 msgstr "Tekan Menu Kiri untuk memilih tingkat 3"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:344
 msgid "Key(s) to change layout"
 msgstr "Tombol untuk mengubah tata letak"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:345
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:346
 msgid "Kgz"
 msgstr "Kgz"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:347
 msgid "Khm"
 msgstr "Khm"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:348
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:349
 msgid "Kor"
 msgstr "Kor"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:350
 msgid "Korea, Republic of"
 msgstr "Republik Korea"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:351
 msgid "Ktunaxa"
 msgstr "Ktunaxa"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:352
 msgid "Kurdish, (F)"
 msgstr "Kurdish, (F)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:353
 msgid "Kurdish, Arabic-Latin"
 msgstr "Kurdish, Arabic-Latin"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:354
 msgid "Kurdish, Latin Alt-Q"
 msgstr "Kurdish, Latin Alt-Q"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:355
 msgid "Kurdish, Latin Q"
 msgstr "Kurdish, Latin Q"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:356
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:357
 msgid "LAm"
 msgstr "LAm"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:358
 msgid "LEKP"
 msgstr "LEKP"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:359
 msgid "LEKPa"
 msgstr "LEKPa"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:360
 msgid "Lao"
 msgstr "Lao"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:361
 msgid "Laos"
 msgstr "Laos"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:362
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:363
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:364
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Laptop/notebook eMachines m68xx"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:365
 msgid "Latin"
 msgstr "Latin"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:366
 msgid "Latin American"
 msgstr "Latin Amerika"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:367
 msgid "Latin Unicode"
 msgstr "Latin Unicode"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:368
 msgid "Latin Unicode qwerty"
 msgstr "Latin Unicode qwerty"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:369
 msgid "Latin qwerty"
 msgstr "Latin qwerty"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:370
 msgid "Latin unicode"
 msgstr "Latin unicode"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:371
 msgid "Latin unicode qwerty"
 msgstr "Latin unicode qwerty"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:372
 msgid "Latin with guillemets"
 msgstr "Latin dengan guillemets"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:373
 msgid "Latvia"
 msgstr "Latvia"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:374
 msgid "Lav"
 msgstr "Lav"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:375
 msgid "Left Alt"
 msgstr "Alt Kiri"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:376
 msgid "Left Alt (while pressed)"
 msgstr "Alt Kiri (ketika ditekan)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:377
 msgid "Left Alt is swapped with Left Win"
 msgstr "Alt Kiri ditukar dengan Win Kiri"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:378
 msgid "Left Ctrl"
 msgstr "Ctrl Kiri"
 
+#: ../rules/base.xml.in.h:379
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr "Ctrl Kiri (ke tata letak pertama), Ctrl Kanan (ke tata letak terakhir)"
+
 #: ../rules/base.xml.in.h:380
 msgid "Left Ctrl+Left Shift"
 msgstr "Ctrl Kiri+Shift Kiri"
@@ -2162,608 +2162,616 @@ msgid "Right Ctrl as Right Alt"
 msgstr "Ctrl Kanan bertindak seperti Alt Kanan"
 
 #: ../rules/base.xml.in.h:539
+msgid "Right Ctrl+Right Shift"
+msgstr "Ctrl Kanan+Shift Kanan"
+
+#: ../rules/base.xml.in.h:540
 msgid "Right Shift"
 msgstr "Shift Kanan"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:541
 msgid "Right Win"
 msgstr "Win Kanan"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:542
 msgid "Right Win (while pressed)"
 msgstr "Win Kanan (ketika ditekan)"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:543
 msgid "Right hand"
 msgstr "Tangan Kanan"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:544
 msgid "Right handed Dvorak"
 msgstr "Right handed Dvorak"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:545
 msgid "Romania"
 msgstr "Rumania"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:546
 msgid "Romanian keyboard with German letters"
 msgstr "Keyboard Rumania dengan huruf Jerman"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:547
 msgid "Romanian keyboard with German letters, eliminate dead keys"
 msgstr "Keyboard Rumania dengan huruf Jerman, hapus tombol mati"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:548
 msgid "Rou"
 msgstr "Rou"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:549
 msgid "Rus"
 msgstr "Rus"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:550
 msgid "Russia"
 msgstr "Rusia"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:551
 msgid "Russian"
 msgstr "Rusia"
 
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:552
 msgid "Russian phonetic"
 msgstr "Russian phonetic"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:553
 msgid "Russian phonetic Dvorak"
 msgstr "Russian phonetic Dvorak"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:554
 msgid "Russian phonetic, eliminate dead keys"
 msgstr "Russian phonetic, hapus tombol mati"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:555
 msgid "Russian with Kazakh"
 msgstr "Rusia dengan Kazakh"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:556
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:557
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:558
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:559
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:560
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:560 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:7
 msgid "SRB"
 msgstr "SRB"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:562
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:563
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:564
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:565
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:566
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:567
 msgid "ScrollLock"
 msgstr "ScrollLock"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:568
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:569
 msgid "Semi-colon on third level"
 msgstr "Semi-kolon pada level ketiga"
 
-#: ../rules/base.xml.in.h:569 ../rules/base.extras.xml.in.h:8
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:8
 msgid "Serbia"
 msgstr "Serbia"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:571
 msgid "Shift cancels CapsLock"
 msgstr "Shift membatalkan CapsLock"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:572
 msgid "Shift does not cancel NumLock, chooses 3d level instead"
 msgstr "Shift tidak membatalkan NumLock, lebih memilih level ketiga"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:573
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Shit dengan keypad numerik bekerja sesuai pada MS Windows"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:574
 msgid "Shift+CapsLock"
 msgstr "Shift+CapsLock"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:575
 msgid "Simple"
 msgstr "Sederhana"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:576
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:577
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:578
 msgid "South Africa"
 msgstr "Afrika Selatan"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:579
 msgid "Southern Uzbek"
 msgstr "Uzbek Selatan"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:580
 msgid "Spain"
 msgstr "Spanyol"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:581
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Tombol spesial (Ctrl+Alt+&lt;key&gt;) ditangani pada server"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:582
 msgid "SrL"
 msgstr "Srl"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:583
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:584
 msgid "Standard"
 msgstr "Standard"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:585
 msgid "Standard (Cedilla)"
 msgstr "Standard (Cedilla)"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:587
 msgid "Standard RSTU"
 msgstr "Standard RSTU"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:589
 msgid "Standard RSTU on Russian layout"
 msgstr "Standard RSTU pada layout Rusia"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:590
 msgid "Sun Type 5/6"
 msgstr "Sun Type 5/6"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:591
 msgid "Sun dead keys"
 msgstr "Tombol mati Matahari"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:592
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:593
 msgid "Svdvorak"
 msgstr "Svdvorak"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:594
 msgid "Svk"
 msgstr "Svk"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:595
 msgid "Svn"
 msgstr "Svn"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:596
 msgid "Swap Ctrl and CapsLock"
 msgstr "Tukar Ctrl dan CapsLock"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:597
 msgid "Swap ESC and CapsLock"
 msgstr "Tujar ESC dan CapsLock"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:598
 msgid "Swe"
 msgstr "Swe"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:599
 msgid "Sweden"
 msgstr "Swedia"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:600
 msgid "Switzerland"
 msgstr "Switzerland"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:601
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:602
 msgid "Syr"
 msgstr "Syr"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:603
 msgid "Syria"
 msgstr "Syria"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:604
 msgid "Syriac"
 msgstr "Syriac"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:605
 msgid "Syriac phonetic"
 msgstr "Syriac phonetic"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:606
 msgid "TIS-820.2538"
 msgstr "TIS-820.2538"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:607
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:608
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:609
 msgid "Tamil TAB Typewriter"
 msgstr "Tamil TAB Typewriter"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:610
 msgid "Tamil TSCII Typewriter"
 msgstr "Tamil TSCII Typewriter"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:611
 msgid "Tamil Unicode"
 msgstr "Tamil Unicode"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:612
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:613
 msgid "Tatar"
 msgstr "Tatar"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:614
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:615
 msgid "Tha"
 msgstr "Tha"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:616
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:617
 msgid "Tibetan"
 msgstr "Tibetan"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:618
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibetan (with ASCII numerals)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:619
 msgid "Tifinagh"
 msgstr "Tifinagh"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:620
 msgid "Tifinagh Alternative"
 msgstr "Tifinagh Alternative"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:621
 msgid "Tifinagh Alternative Phonetic"
 msgstr "Tifinagh Alternative Phonetic"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:622
 msgid "Tifinagh Extended"
 msgstr "Tifinagh Extended"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:623
 msgid "Tifinagh Extended Phonetic"
 msgstr "Tifinagh Alternative Phonetic"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:624
 msgid "Tifinagh Phonetic"
 msgstr "Tifinagh  Phonetic"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:625
 msgid "Tilde (~) variant"
 msgstr "Varian tilde  (~)"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:626
 msgid "Tjk"
 msgstr "Tjk"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:627
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Ke tombol dalam papan ketik Dvorak."
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:628
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Ke tombol dalam papan ketik Qwerty."
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:629
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:630
 msgid "Traditional phonetic"
 msgstr "Traditional phonetic"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:631
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:632
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:633
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:634
 msgid "Tur"
 msgstr "Tur"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:635
 msgid "Turkey"
 msgstr "Turki"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:636
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:637
 msgid "Typewriter"
 msgstr "Typewriter"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:638
+msgid "Typewriter, legacy"
+msgstr "Typewriter, warisan"
+
+#: ../rules/base.xml.in.h:639
 msgid "UCW layout (accented letters only)"
 msgstr "UCW layout (accented letters only)"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:640
 msgid "US keyboard with Bosnian digraphs"
 msgstr "Keyboard Amerika dengan Bosnia digraphs"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:641
 msgid "US keyboard with Bosnian letters"
 msgstr "Keyboard Amerika dengan huruf Bosnia"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:642
 msgid "US keyboard with Croatian digraphs"
 msgstr "Keyboard Amerika dengan Kroasia digraphs"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:643
 msgid "US keyboard with Croatian letters"
 msgstr "Keyboard Amerika dengan huruf Kroasia"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:644
 msgid "US keyboard with Estonian letters"
 msgstr "Keyboard Amerika dengan huruf Estonia"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:645
 msgid "US keyboard with Italian letters"
 msgstr "Papan ketik AS dengan huruf Italia"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:646
 msgid "US keyboard with Lithuanian letters"
 msgstr "Keyboard Amerika dengan huruf Lituania"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:647
 msgid "US keyboard with Slovenian letters"
 msgstr "Keyboard Amerika dengan huruf Slovenia"
 
-#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:648 ../rules/base.extras.xml.in.h:9
 msgid "USA"
 msgstr "USA"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:649
 msgid "Udmurt"
 msgstr "Udmurt"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:650
 msgid "Ukr"
 msgstr "Ukr"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:651
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:652
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Tambahan unicode (panah dan operator matematika)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:653
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Tambahan unicode (panah dan operator matematika). Operator matematika pada tingkat standar"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:654
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:655
 msgid "United Kingdom"
 msgstr "Inggris Raya"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:656
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:657
 msgid "Urdu, Alternative phonetic"
 msgstr "Urdu, Fonetik alternatif"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:658
 msgid "Urdu, Phonetic"
 msgstr "Urdu, Fonetik"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:659
 msgid "Urdu, Winkeys"
 msgstr "Urdu, Tombol Win"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:660
 msgid "Use Bosnian digraphs"
 msgstr "Gunakan diagraph Bosnia"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:661
 msgid "Use Croatian digraphs"
 msgstr "Gunakan diagraph Kroasia"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:662
 msgid "Use guillemets for quotes"
 msgstr "Gunakan guillemets untuk tanda petik"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:663
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Gunakan keyboard LED untuk menunjukkan layout alternatif"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:664
 msgid "Using space key to input non-breakable space character"
 msgstr "Menggunakan spasi untuk input karakter spasi yang tidak pecah"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:665
 msgid "Usual space at any level"
 msgstr "Tombol spasi biasa pada semua tingkat"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:666
 msgid "Uzb"
 msgstr "Uzb"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:667
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:668
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:669
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 Internet Keyboard"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:670
 msgid "Vnm"
 msgstr "Vnm"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:671
 msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
 msgstr "Wang 724 keypad dengan tambahan unicode (panah and operator matematika). "
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:672
 msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Wang 724 keypad dengan tambahan unicode (panah and operator matematika). Operator matematika pada tingkat standar"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:673
 msgid "Wang model 724 azerty"
 msgstr "Wang model 724 azerty"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:674
 msgid "Western"
 msgstr "Western"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:675
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:676
 msgid "Winkeys"
 msgstr "Tombol Win"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:677
 msgid "With &lt;\\|&gt; key"
 msgstr "Dengan &lt;\\|&gt; key;tombol"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:678
 msgid "With EuroSign on 5"
 msgstr "Dengan tanda Euro pada 5"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:679
 msgid "With guillemets"
 msgstr "Dengan guillemets"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:680
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:681
 msgid "Yakut"
 msgstr "Yakut"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:682
 msgid "Yoruba"
 msgstr "Yoruba"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:683
 msgid "Z and ZHE swapped"
 msgstr "menukar Z dan ZHE "
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:684
 msgid "Zar"
 msgstr "Zar"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:685
 msgid "azerty"
 msgstr "azerty"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:686
 msgid "azerty/digits"
 msgstr "azerty/angka"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:687
 msgid "digits"
 msgstr "digit"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:688
 msgid "displaced semicolon and quote (obsolete)"
 msgstr "ganti titik koma dan tanda kutip (kuno)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:689
 msgid "lyx"
 msgstr "lyx"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:690
 msgid "qwerty"
 msgstr "qwerty"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:691
 msgid "qwerty, extended Backslash"
 msgstr "qwerty, ditambah Backslash"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:692
 msgid "qwerty/digits"
 msgstr "qwertz/angka"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:693
 msgid "qwertz"
 msgstr "qwertz"
 
@@ -2791,6 +2799,12 @@ msgstr "Internasional (AltGr menggabungkan Unicode)"
 msgid "International (AltGr Unicode combining, alternative)"
 msgstr "Internasional (AltGr menggabungkan Unicode, alternatif)"
 
+#~ msgid "Baltic+"
+#~ msgstr "Baltic+"
+
+#~ msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+#~ msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
 #~ msgid "Keypad"
 #~ msgstr "Keypad"
 
diff --git a/xorg-server/xkbdata.src/po/ky.po b/xorg-server/xkbdata.src/po/ky.po
index 231961dde..b08ebf695 100644
--- a/xorg-server/xkbdata.src/po/ky.po
+++ b/xorg-server/xkbdata.src/po/ky.po
@@ -1,14 +1,14 @@
 # Translation of 'xkeyboard-config' messages to Kirghiz.
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # This file is distributed under the same license as the xkeyboard-config package.
-# Ilyas Bakirov <just_ilyas@yahoo.com>, 2009.
+# Ilyas Bakirov <just_ilyas@yahoo.com>, 2009, 2010
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 1.6pre1\n"
+"Project-Id-Version: xkeyboard-config 1.6.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 23:49+0100\n"
-"PO-Revision-Date: 2009-06-07 23:39+0600\n"
+"POT-Creation-Date: 2009-09-15 23:31+0100\n"
+"PO-Revision-Date: 2009-09-17 20:10+0600\n"
 "Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
 "Language-Team: Kirghiz <i18n-team-ky-kyrgyz@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -131,7 +131,7 @@ msgstr "ACPI стандарттуу"
 
 #: ../rules/base.xml.in.h:29
 msgid "ATM/phone-style"
-msgstr ""
+msgstr "Банкомат(ATM)/телефондук стилинде"
 
 #: ../rules/base.xml.in.h:30
 msgid "Acer AirKey V"
@@ -258,9 +258,8 @@ msgid "Any Alt key"
 msgstr ""
 
 #: ../rules/base.xml.in.h:61
-#, fuzzy
 msgid "Any Win key"
-msgstr "Windows клавиатурасы"
+msgstr "Каалаган Win клавишасы"
 
 #: ../rules/base.xml.in.h:62
 msgid "Any Win key (while pressed)"
@@ -303,14 +302,12 @@ msgid "Asus Laptop"
 msgstr "Asus ноутбугу"
 
 #: ../rules/base.xml.in.h:72
-#, fuzzy
 msgid "At bottom left"
-msgstr "Ctrl клавишасы төмөн сол жакта жайгашкан"
+msgstr "Төмөн сол жакта"
 
 #: ../rules/base.xml.in.h:73
-#, fuzzy
 msgid "At left of 'A'"
-msgstr "Ctrl клавишасы 'Ф' клавишанын сол жагында"
+msgstr "'А' клавишанын сол жагында"
 
 #: ../rules/base.xml.in.h:74
 msgid "Aze"
@@ -373,2405 +370,2436 @@ msgid "Bangladesh"
 msgstr "Бангладеш"
 
 #: ../rules/base.xml.in.h:89
+msgid "Bashkirian"
+msgstr "Башкирдик"
+
+#: ../rules/base.xml.in.h:90
 msgid "Bel"
 msgstr "Бел"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:91
 msgid "Belarus"
 msgstr "Беларусия"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:92
 msgid "Belgium"
 msgstr "Бельгия"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:93
 msgid "BenQ X-Touch"
 msgstr "BenQ X-Touch"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:94
 msgid "BenQ X-Touch 730"
 msgstr "BenQ X-Touch 730"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:95
 msgid "BenQ X-Touch 800"
 msgstr "BenQ X-Touch 800"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:96
 msgid "Bengali"
 msgstr "Бенгальдык"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:97
 msgid "Bengali Probhat"
 msgstr "Бенгальдык Пробат"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:98
 msgid "Bepo, ergonomic, Dvorak way"
 msgstr "Бепо, эргономикалык, Dvorak'ка окшош"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:99
 msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
 msgstr "Бепо, эргономикалык, Dvorak'ка окшош, latin-9 гана"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:100
 msgid "Bgr"
 msgstr "Болг"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:101
 msgid "Bhu"
 msgstr "Бут"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:102
 msgid "Bhutan"
 msgstr "Бутан"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:103
 msgid "Biblical Hebrew (Tiro)"
 msgstr "Библейдик иврит (Tiro)"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:104
 msgid "Bih"
 msgstr "Босн"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:105
 msgid "Blr"
 msgstr "Бел"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:106
 msgid "Bosnia and Herzegovina"
 msgstr "Босния жана Герциговиния"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:107
 msgid "Both Alt keys together"
 msgstr "Эки Alt клавишалары бирге"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:108
 msgid "Both Ctrl keys together"
 msgstr "Эки Ctrl клавишалары бирге"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:109
 msgid "Both Shift keys together"
 msgstr "Эки Shift клавишалары бирге"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:110
 msgid "Bra"
 msgstr "Бра"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:111
 msgid "Braille"
 msgstr "Браиил"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:112
 msgid "Brazil"
 msgstr "Бразилия"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:113
 msgid "Breton"
 msgstr "Бретон"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:114
 msgid "Brl"
 msgstr "Брл"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:115
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet Keyboard"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:116
 msgid "Buckwalter"
 msgstr "Buckwalter"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:117
 msgid "Bulgaria"
 msgstr "Болгария"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:118
 msgid "CRULP"
-msgstr ""
+msgstr "CRULP"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:119
 msgid "Cambodia"
 msgstr "Камбоджия"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:120
 msgid "Can"
 msgstr "Кан"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:121
 msgid "Canada"
 msgstr "Канада"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:122
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:123
 msgid "CapsLock"
 msgstr "CapsLock"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:124
 msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:125
 msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
 msgstr ""
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:126
 msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:126
-#, fuzzy
+#: ../rules/base.xml.in.h:127
 msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
-msgstr "Shift блокировка менен амал жасайт. Shift Caps амалына тоскол болбойт."
+msgstr "CapsLock Shift блокировка менен клавишасы катары амал жасайт. Shift CapsLock амалына тоскол болбойт"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:128
+msgid "CapsLock is disabled"
+msgstr "CapsLock иштен чыгарылды"
+
+#: ../rules/base.xml.in.h:129
 msgid "CapsLock key behavior"
 msgstr ""
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:130
 msgid "CapsLock toggles Shift so all keys are affected"
 msgstr ""
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:131
 msgid "CapsLock toggles normal capitalization of alphabetic characters"
 msgstr ""
 
-#: ../rules/base.xml.in.h:130
-#, fuzzy
+#: ../rules/base.xml.in.h:132
 msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
-msgstr "Ички капитализацыяны ачат. Shift CapsLock амалын токтотот."
+msgstr "CapsLock ички капитализацыяны ачат. Shift CapsLock амалын токтотот"
 
-#: ../rules/base.xml.in.h:131
-#, fuzzy
+#: ../rules/base.xml.in.h:133
 msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
-msgstr "Ички капитализацыяны ачат. Shift CapsLock амалына таасир тийгизбейт."
+msgstr "CapsLock ички капитализацыяны ачат. Shift CapsLock амалына таасир тийгизбейт"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:134
 msgid "Catalan variant with middle-dot L"
 msgstr ""
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:135
 msgid "Cedilla"
-msgstr ""
+msgstr "Седиль"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:136
 msgid "Che"
 msgstr "Че"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:137
 msgid "Cherokee"
-msgstr ""
+msgstr "Чероки"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:138
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:139
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:140
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (альтернативдик)"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:141
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:142
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:143
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:144
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:145
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet Keyboard"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:146
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:147
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:148
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:149
 msgid "China"
 msgstr "Кытай"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:150
 msgid "Chuvash"
 msgstr "Чуваш"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:151
 msgid "Chuvash Latin"
 msgstr "Чуваш латындык"
 
-#: ../rules/base.xml.in.h:150
-#, fuzzy
+#: ../rules/base.xml.in.h:152
 msgid "Classic"
-msgstr "Классикалык Дровак"
+msgstr "Классикалык"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:153
 msgid "Classic Dvorak"
 msgstr "Классикалык Дровак"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:154
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:155
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:156
 msgid "Colemak"
-msgstr ""
+msgstr "Colemak"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access Keyboard"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq \"Интернет\" клавиатурасы (13 клавиша менен)"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq \"Интернет\" клавиатурасы (18 клавиша менен)"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:160
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq \"Интернет\" клавиатурасы  (7 клавиша менен)"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:161
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq Keyboard"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:162
 msgid "Compose key position"
 msgstr ""
 
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:163
 msgid "Congo, Democratic Republic of the"
-msgstr ""
+msgstr "Конго, Демократикалык республикасы"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:164
 msgid "Control + Alt + Backspace"
 msgstr ""
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:165
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:166
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:165
-msgid "Crimean Tatar (Dobruca-1 Q)"
+#: ../rules/base.xml.in.h:167
+msgid "Creative Desktop Wireless 7000"
 msgstr ""
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:168
+msgid "Crimean Tatar (Dobruca-1 Q)"
+msgstr "Крым татардык (Dobruca-1 Q)"
+
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Dobruca-2 Q)"
-msgstr ""
+msgstr "Крым татардык (Dobruca-2 Q)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:170
 msgid "Crimean Tatar (Turkish Alt-Q)"
-msgstr ""
+msgstr "Крым татардык (түрк Alt-Q)"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:171
 msgid "Crimean Tatar (Turkish F)"
-msgstr ""
+msgstr "Крым татардык (түрк F)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:172
 msgid "Crimean Tatar (Turkish Q)"
-msgstr ""
+msgstr "Крым татардык (түрк Q)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:173
 msgid "Croatia"
 msgstr "Хорватия"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:174
 msgid "Ctrl key position"
 msgstr "Ctrl клавишанын жайгашуусу"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:175
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:176
 msgid "Cyrillic"
 msgstr "Кириллица"
 
-#: ../rules/base.xml.in.h:174
-#, fuzzy
+#: ../rules/base.xml.in.h:177
 msgid "Cyrillic with guillemets"
-msgstr "Француздук тырмакчалар менен"
+msgstr ""
 
-#: ../rules/base.xml.in.h:175
-#, fuzzy
+#: ../rules/base.xml.in.h:178
 msgid "Cyrillic, Z and ZHE swapped"
-msgstr "З жана Ж орундарын алмаштырган"
+msgstr "Кирилл, З жана Ж орундарын алмаштырган"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:179
 msgid "Cze"
 msgstr "Чех"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:180
 msgid "Czechia"
 msgstr "Чехия"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:181
 msgid "DOS"
-msgstr ""
+msgstr "DOS"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:182
 msgid "DRC"
 msgstr "DRC"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:183
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:181
-#, fuzzy
+#: ../rules/base.xml.in.h:184
 msgid "Dan"
-msgstr "Бан"
+msgstr "Дан"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:185
 msgid "Dead acute"
 msgstr "Dead acute атайын символу"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:186
 msgid "Dead grave acute"
 msgstr "Dead grave acute атайын символу"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:187
 msgid "Default numeric keypad keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:188
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:189
 msgid "Dell 101-key PC"
 msgstr "Dell 101-клавиша менен PC"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:190
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell Inspiron 6xxx/8xxx ноутбугу"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:191
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell Precision M сериялуу ноутбугу"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:192
 msgid "Dell Latitude series laptop"
 msgstr "Dell Latitude сериялуу ноутбугу"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:193
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:194
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:195
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:196
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:197
 msgid "Denmark"
 msgstr "Дания"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:198
 msgid "Deu"
 msgstr "Нем"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:199
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:200
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801 / 9802 сериялары"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:201
 msgid "Dvorak"
 msgstr "Дровак"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:202
 msgid "Dvorak (UK Punctuation)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:203
 msgid "Dvorak international"
 msgstr ""
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:204
 msgid "Dvorak, Polish quotes on key 1"
 msgstr ""
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:205
 msgid "Dvorak, Polish quotes on quotemark key"
 msgstr ""
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:206
 msgid "E"
-msgstr ""
+msgstr "E"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:207
 msgid "Eastern"
 msgstr "Чыгыш"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:208
 msgid "Eliminate dead keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:209
 msgid "Enable extra typographic characters"
 msgstr ""
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:210
 msgid "English"
 msgstr "Англис"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:211
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:209
-#, fuzzy
+#: ../rules/base.xml.in.h:212
 msgid "Enter on keypad"
-msgstr "Pro кошумча панели менен"
+msgstr "Enter сандык клавиатурасында"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:213
 msgid "Epo"
 msgstr "Эсп"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:214
 msgid "Ergonomic"
-msgstr ""
+msgstr "Ergonomic"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:215
 msgid "Esp"
 msgstr "Исп"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:216
 msgid "Esperanto"
 msgstr "Эсперанто"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:217
 msgid "Est"
 msgstr "Эст"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:218
 msgid "Estonia"
 msgstr "Эстония"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:219
 msgid "Eth"
 msgstr "Эфп"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:220
 msgid "Ethiopia"
 msgstr "Эфиопия"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:221
 msgid "Evdev-managed keyboard"
 msgstr ""
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:222
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:223
 msgid "Ewe"
 msgstr "Эве"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:224
 msgid "Extended"
-msgstr ""
+msgstr "Кеңейтилген"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:225
 msgid "Extended - Winkeys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:226
 msgid "Extended Backslash"
 msgstr ""
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:227
 msgid "F-letter (F) variant"
 msgstr ""
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:228
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:229
 msgid "Fao"
 msgstr "Фар"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:230
 msgid "Faroe Islands"
 msgstr "Фаро аралдары"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:231
 msgid "Fin"
 msgstr "Фин"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:232
 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:232
+#: ../rules/base.xml.in.h:235
 msgid "Four-level key with abstract separators"
 msgstr ""
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:236
 msgid "Four-level key with comma"
 msgstr ""
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:237
 msgid "Four-level key with dot"
 msgstr ""
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:238
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr ""
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:239
 msgid "Four-level key with momayyez"
 msgstr ""
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:240
 msgid "Fra"
 msgstr "Фра"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:241
 msgid "France"
 msgstr "Франция"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:242
 msgid "French"
 msgstr "Француз"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:243
 msgid "French (Macintosh)"
 msgstr "Француз (Macintosh)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:244
 msgid "French (legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:245
 msgid "French Dvorak"
 msgstr "Француз Dvorak"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:246
 msgid "French, Sun dead keys"
 msgstr "Француз,атайын (dead keys) Sun клавишалары менен"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:247
 msgid "French, eliminate dead keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:248
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO laptop"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:249
 msgid "Fula"
 msgstr "Фула"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:250
 msgid "GBr"
 msgstr "Брит"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:251
 msgid "Ga"
 msgstr "Га"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:252
 msgid "Generic 101-key PC"
 msgstr "Жалпы 101-клавишалары менен PC"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:253
 msgid "Generic 102-key (Intl) PC"
 msgstr "Жалпы 102-клавишалары менен (Инт.) PC"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:254
 msgid "Generic 104-key PC"
 msgstr "Жалпы 104-клавишалары менен PC"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:255
 msgid "Generic 105-key (Intl) PC"
 msgstr "Жалпы 105-клавишалары менен (Инт.) PC"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:256
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:257
 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:255
+#: ../rules/base.xml.in.h:258
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:259
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:260
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:261
 msgid "Geo"
 msgstr "Груз"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:262
 msgid "Georgia"
 msgstr "Грузия"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:263
 msgid "Georgian"
 msgstr "Грузиндик"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:264
 msgid "Georgian AZERTY Tskapo"
 msgstr "Грузин AZERTY Tskapo"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:265
 msgid "German (Macintosh)"
 msgstr "Немец (Macintosh)"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:266
 msgid "German, Sun dead keys"
 msgstr "Немец, атайын (dead keys) Sun клавишалары менен"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:267
 msgid "German, eliminate dead keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:268
 msgid "Germany"
 msgstr "Германия"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:269
 msgid "Gha"
 msgstr "Ган"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:270
 msgid "Ghana"
 msgstr "Гана"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:271
 msgid "Gre"
 msgstr "Гре"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:272
 msgid "Greece"
 msgstr "Греция"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:273
 msgid "Group toggle on multiply/divide key"
 msgstr ""
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:274
 msgid "Gui"
 msgstr "Гви"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:275
 msgid "Guinea"
 msgstr "Гвинея"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:276
 msgid "Gujarati"
 msgstr "Гуджарати"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:277
 msgid "Gurmukhi"
 msgstr "Гурмукхи"
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:278
 msgid "Gurmukhi Jhelum"
-msgstr ""
+msgstr "Гурмукхи Jhelum"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:279
 msgid "Gyration"
 msgstr "Гирашн"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:280
 msgid "Happy Hacking Keyboard"
 msgstr ""
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:281
 msgid "Happy Hacking Keyboard for Mac"
 msgstr ""
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:282
 msgid "Hausa"
 msgstr "Хауза"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:283
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:284
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:285
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:286
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:287
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:288
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:289
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:290
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:291
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "Hewlett-Packard Pavilion dv5"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:292
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:293
 msgid "Hewlett-Packard nx9020"
 msgstr "Hewlett-Packard nx9020"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:294
 msgid "Hexadecimal"
 msgstr ""
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:295
 msgid "Hindi Bolnagri"
-msgstr ""
+msgstr "Хинди Болнагри"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:296
 msgid "Hindi Wx"
-msgstr ""
+msgstr "Хинди Wx"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:297
 msgid "Homophonic"
 msgstr ""
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:298
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:299
 msgid "Hrv"
 msgstr "Хорв"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:300
 msgid "Hun"
 msgstr "Венг"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:301
 msgid "Hungary"
 msgstr "Венгрия"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:302
 msgid "Hyper is mapped to Win-keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:303
 msgid "IBM (LST 1205-92)"
 msgstr "IBM (LST 1205-92)"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:304
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:305
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:306
 msgid "IBM Space Saver"
 msgstr "IBM Space Saver"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:307
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:308
 msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:310
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:311
 msgid "ISO Alternate"
 msgstr "Кошумча ISO"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:312
 msgid "Iceland"
 msgstr "Исландия"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:313
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:314
 msgid "Include dead tilde"
 msgstr ""
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:315
 msgid "Ind"
 msgstr "Инд"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:316
 msgid "India"
 msgstr "Индия"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:317
 msgid "International (AltGr dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:318
 msgid "International (with dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:319
 msgid "Inuktitut"
 msgstr "Иннуитская"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:320
 msgid "Iran"
 msgstr "Иран"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:321
 msgid "Iraq"
 msgstr "Ирак"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:322
 msgid "Ireland"
 msgstr "Ирландия"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:323
 msgid "Irl"
 msgstr "Ирл"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:324
 msgid "Irn"
 msgstr "Фарс"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:325
 msgid "Irq"
 msgstr "Ирк"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:326
 msgid "Isl"
 msgstr "Исл"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:327
 msgid "Isr"
 msgstr "Ивр"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:328
 msgid "Israel"
 msgstr "Израиль"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:329
 msgid "Ita"
 msgstr "Ит"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:330
 msgid "Italy"
 msgstr "Италия"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:331
 msgid "Japan"
 msgstr "Япония"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:332
 msgid "Japan (PC-98xx Series)"
 msgstr "Japan (PC-98xx Series)"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:333
 msgid "Japanese keyboard options"
 msgstr ""
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:334
 msgid "Jpn"
 msgstr "Яп"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:335
 msgid "Kalmyk"
 msgstr "Калмык"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:336
 msgid "Kana"
 msgstr "Кана"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:337
 msgid "Kana Lock key is locking"
 msgstr ""
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:338
 msgid "Kannada"
 msgstr "Каннада"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:339
 msgid "Kashubian"
 msgstr "Кашуб"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:340
 msgid "Kaz"
 msgstr "Каз"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:341
 msgid "Kazakh with Russian"
 msgstr "Казакча Орусча менен"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:342
 msgid "Kazakhstan"
 msgstr "Казахстан"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:343
 msgid "Key sequence to kill the X server"
 msgstr ""
 
-#: ../rules/base.xml.in.h:341
-#, fuzzy
+#: ../rules/base.xml.in.h:344
 msgid "Key to choose 3rd level"
-msgstr "3-чү денгээлди тандоо Menu клавишанын басылышы менен."
+msgstr "3-чү денгээлди тандоо баскычы"
 
-#: ../rules/base.xml.in.h:342
-#, fuzzy
+#: ../rules/base.xml.in.h:345
 msgid "Key(s) to change layout"
-msgstr "Alt+Ctrl раскладканы алмаштырат."
-
-#: ../rules/base.xml.in.h:343
-msgid "Keypad"
 msgstr ""
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:346
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:347
 msgid "Kgz"
 msgstr "Кгз"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:348
 msgid "Khm"
 msgstr "Кхм"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:349
 msgid "Komi"
-msgstr ""
+msgstr "Коми"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:350
 msgid "Kor"
 msgstr "Кор"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:351
 msgid "Korea, Republic of"
 msgstr "Корея Республикасы"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:352
 msgid "Ktunaxa"
-msgstr ""
+msgstr "Кутенай"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:353
 msgid "Kurdish, (F)"
 msgstr "Курд, (F)"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:354
 msgid "Kurdish, Arabic-Latin"
 msgstr "Курд, араб-латын"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:355
 msgid "Kurdish, Latin Alt-Q"
 msgstr "Курд, латын Alt-Q"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:356
 msgid "Kurdish, Latin Q"
 msgstr "Курд, латын Q"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:357
 msgid "Kyrgyzstan"
 msgstr "Кыргызстан"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:358
 msgid "LAm"
 msgstr "ЛатАм"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:359
 msgid "LEKP"
-msgstr ""
+msgstr "LEKP"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:360
 msgid "LEKPa"
-msgstr ""
+msgstr "LEKPa"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:361
 msgid "Lao"
 msgstr "Лао"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:362
 msgid "Laos"
 msgstr "Лаос"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:363
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr ""
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:364
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr ""
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:365
 msgid "Laptop/notebook eMachines m68xx"
 msgstr ""
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:366
 msgid "Latin"
 msgstr "Латын"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:367
 msgid "Latin American"
 msgstr "Латын американдык"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:368
 msgid "Latin Unicode"
 msgstr "Латын Unicode"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:369
 msgid "Latin Unicode qwerty"
 msgstr "Латын Unicode qwerty"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:370
 msgid "Latin qwerty"
 msgstr "Латын qwerty"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:371
 msgid "Latin unicode"
 msgstr "Латын unicode"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:372
 msgid "Latin unicode qwerty"
 msgstr "Латын unicode qwerty"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:373
 msgid "Latin with guillemets"
 msgstr ""
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:374
 msgid "Latvia"
 msgstr "Латвия"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:375
 msgid "Lav"
 msgstr "Лат"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:376
 msgid "Left Alt"
 msgstr "Сол Alt"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:377
 msgid "Left Alt (while pressed)"
 msgstr "Сол Alt клавишасы (басылган учурда)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:378
 msgid "Left Alt is swapped with Left Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:379
 msgid "Left Ctrl"
 msgstr "Сол Ctrl"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:380
 msgid "Left Ctrl+Left Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:381
 msgid "Left Shift"
 msgstr "Сол Shift"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:382
 msgid "Left Win"
 msgstr "Сол Win"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:383
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:384
 msgid "Left Win (while pressed)"
 msgstr "Сол Alt клавишасы (басылган учурда)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:385
 msgid "Left hand"
 msgstr ""
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:386
 msgid "Left handed Dvorak"
 msgstr ""
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:387
 msgid "Legacy"
-msgstr ""
+msgstr "Legacy"
 
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:388
 msgid "Legacy Wang 724"
 msgstr ""
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:390
 msgid "Legacy key with comma"
 msgstr ""
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:391
 msgid "Legacy key with dot"
 msgstr ""
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:392
 msgid "Less-than/Greater-than"
 msgstr ""
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:393
 msgid "Lithuania"
 msgstr "Литва"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:394
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Access Keyboard"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:395
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:396
 msgid "Logitech Cordless Desktop (alternate option)"
 msgstr "Logitech Cordless Desktop (альтернативдик вариант)"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:397
 msgid "Logitech Cordless Desktop EX110"
 msgstr "Logitech Cordless Desktop EX110"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:398
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "Logitech Cordless Desktop LX-300"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:399
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:400
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:401
 msgid "Logitech Cordless Desktop Pro (alternate option 2)"
 msgstr "Logitech Cordless Desktop Pro (альтернативдик вариант 2)"
 
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:402
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:403
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: ../rules/base.xml.in.h:402
+#: ../rules/base.xml.in.h:404
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr "Logitech G15 extra keys via G15daemon"
 
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:405
 msgid "Logitech Generic Keyboard"
 msgstr "Logitech Generic Keyboard"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:406
 msgid "Logitech Internet 350 Keyboard"
 msgstr "Logitech Internet 350 Keyboard"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:407
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet Keyboard"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:408
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator Keyboard"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:409
 msgid "Logitech Media Elite Keyboard"
 msgstr "Logitech Media Elite Keyboard"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:410
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:411
 msgid "Logitech Ultra-X Keyboard"
 msgstr "Logitech Ultra-X Keyboard"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:412
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "Logitech diNovo Edge Keyboard"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:413
 msgid "Logitech diNovo Keyboard"
 msgstr "Logitech diNovo Keyboard"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:414
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:415
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (Y-RB6 модели)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:416
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:417
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:418
 msgid "Lower Sorbian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:419
 msgid "Lower Sorbian (qwertz)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:420
 msgid "Ltu"
 msgstr "Лит"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:421
 msgid "MESS"
-msgstr ""
+msgstr "MESS"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:422
 msgid "MNE"
-msgstr ""
+msgstr "MNE"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:423
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:424
 msgid "MacBook/MacBook Pro (Intl)"
 msgstr "MacBook/MacBook Pro (Инт.)"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:425
 msgid "Macedonia"
 msgstr "Македония"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:426
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:425
+#: ../rules/base.xml.in.h:427
 msgid "Macintosh Old"
 msgstr "Эски Macintosh"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:428
 msgid "Macintosh, Sun dead keys"
 msgstr "Macintosh, атайын (dead keys) Sun клавишалары менен"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:429
 msgid "Macintosh, eliminate dead keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:430
 msgid "Make CapsLock an additional Backspace"
 msgstr "CapsLock кошумча Боштук клавиша катары колдонуу"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:431
 msgid "Make CapsLock an additional Ctrl"
 msgstr "CapsLock кошумча Ctrl клавиша катары колдонуу"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:432
 msgid "Make CapsLock an additional ESC"
 msgstr "CapsLock кошумча ESC клавиша катары колдонуу"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:433
+msgid "Make CapsLock an additional Hyper"
+msgstr "CapsLock кошумча Hyper клавиша катары колдонуу"
+
+#: ../rules/base.xml.in.h:434
+msgid "Make CapsLock an additional NumLock"
+msgstr "CapsLock кошумча NumLock клавиша катары колдонуу"
+
+#: ../rules/base.xml.in.h:435
+msgid "Make CapsLock an additional Super"
+msgstr "CapsLock кошумча Super клавиша катары колдонуу"
+
+#: ../rules/base.xml.in.h:436
 msgid "Mal"
 msgstr "Мал"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:437
 msgid "Malayalam"
 msgstr "Малайaлам"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:438
 msgid "Malayalam Lalitha"
-msgstr ""
+msgstr "Малайaлам (Lalitha)"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:439
 msgid "Maldives"
 msgstr "Мальдивалар"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:440
 msgid "Malta"
 msgstr "Мальта"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:441
 msgid "Maltese keyboard with US layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:442
 msgid "Mao"
 msgstr "Мао"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:443
 msgid "Maori"
 msgstr "Маори"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:444
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:445
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access Keyboard"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:446
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:447
 msgid "Menu"
-msgstr ""
+msgstr "Menu"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:448
 msgid "Meta is mapped to Left Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:449
 msgid "Meta is mapped to Win keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:450
 msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr "Microsoft Comfort Curve Keyboard 2000"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:451
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet Keyboard"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:452
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, швед"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:453
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:454
 msgid "Microsoft Natural Keyboard Elite"
 msgstr "Microsoft Natural Keyboard Elite"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:455
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:456
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:457
 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:453
+#: ../rules/base.xml.in.h:458
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:459
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office Keyboard"
 
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:460
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:461
 msgid "Miscellaneous compatibility options"
 msgstr ""
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:462
 msgid "Mkd"
 msgstr "Мак"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:463
 msgid "Mlt"
 msgstr "Мальт"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:464
 msgid "Mmr"
 msgstr "Мьянм"
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:465
 msgid "Mng"
 msgstr "Монг"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:466
 msgid "Mongolia"
 msgstr "Монголия"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:467
 msgid "Montenegro"
 msgstr "Черногория"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:468
 msgid "Morocco"
 msgstr "Морокко"
 
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:469
 msgid "Multilingual"
 msgstr "Көп тилдүү"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:470
 msgid "Multilingual, first part"
 msgstr "Көп тилдүү, биринчи бөлүк"
 
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:471
 msgid "Multilingual, second part"
 msgstr "Көп тилдүү, экинчи бөлүк"
 
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:472
 msgid "Myanmar"
 msgstr "Мьянмар"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:473
 msgid "NICOLA-F style Backspace"
 msgstr ""
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:474
 msgid "NLA"
-msgstr ""
+msgstr "NLA"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:475
 msgid "Nativo"
-msgstr ""
+msgstr "Nativo"
 
-#: ../rules/base.xml.in.h:471
+#: ../rules/base.xml.in.h:476
 msgid "Nativo for Esperanto"
-msgstr ""
+msgstr "Nativo эсперанто үчүн"
 
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:477
 msgid "Nativo for USA keyboards"
 msgstr ""
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:478
 msgid "Neo 2"
 msgstr "Neo 2"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:479
 msgid "Nep"
 msgstr "Неп"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:480
 msgid "Nepal"
 msgstr "Непал"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:481
 msgid "Netherlands"
 msgstr "Нидерландия"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:482
+msgid "New phonetic"
+msgstr "Жаңы фонетикалык"
+
+#: ../rules/base.xml.in.h:483
 msgid "Nig"
 msgstr "Нгр"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:484
 msgid "Nigeria"
 msgstr "Нигерия"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:485
 msgid "Nld"
 msgstr "Флам"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:486
 msgid "Non-breakable space character at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:487
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:488
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:489
 msgid "Non-breakable space character at second level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:490
 msgid "Non-breakable space character at third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:491
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:492
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:493
 msgid "Nor"
 msgstr "Нор"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:494
 msgid "Northern Saami"
 msgstr "Түндүк Саами"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:495
 msgid "Northern Saami, eliminate dead keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:496
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:497
 msgid "Norway"
 msgstr "Норвегия"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:498
 msgid "NumLock"
-msgstr ""
+msgstr "NumLock"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:499
 msgid "Numeric keypad delete key behaviour"
 msgstr ""
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:500
 msgid "Numeric keypad keys work as with Mac"
 msgstr ""
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:501
 msgid "Numeric keypad layout selection"
 msgstr ""
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:502
 msgid "OADG 109A"
 msgstr "OADG 109A"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:503
 msgid "OLPC"
-msgstr ""
+msgstr "OLPC"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:504
 msgid "OLPC Dari"
-msgstr ""
+msgstr "OLPC Dari"
 
-#: ../rules/base.xml.in.h:499
-#, fuzzy
+#: ../rules/base.xml.in.h:505
 msgid "OLPC Pashto"
-msgstr "Пуштундук"
+msgstr "OLPC Pashto"
 
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:506
 msgid "OLPC Southern Uzbek"
-msgstr ""
+msgstr "Түштүк-өзбөк OLPC"
 
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:507
 msgid "Occitan"
-msgstr ""
+msgstr "Окситандык"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:508
 msgid "Ogham"
-msgstr ""
+msgstr "Огхам"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:509
 msgid "Ogham IS434"
 msgstr "Огхам IS434"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:510
 msgid "Oriya"
 msgstr "Орийя"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:511
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Ortek MCK-800 MM/Internet keyboard"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:512
 msgid "Ossetian"
 msgstr "Осетиндик"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:513
 msgid "Ossetian, Winkeys"
 msgstr "Осетиндик Windows клавиатурасы"
 
-#: ../rules/base.xml.in.h:508
-#, fuzzy
+#: ../rules/base.xml.in.h:514
 msgid "Ossetian, legacy"
-msgstr "Осетиндик Windows клавиатурасы"
+msgstr "Осетиндик, эскирген"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:515
 msgid "PC-98xx Series"
 msgstr "PC-98xx"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:516
 msgid "Pak"
 msgstr "Пак"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:517
 msgid "Pakistan"
 msgstr "Пакистан"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:518
 msgid "Pashto"
 msgstr "Пуштундук"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:519
 msgid "Pattachote"
 msgstr "Паттачот"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:520
+msgid "Persian, with Persian Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:521
 msgid "Phonetic"
 msgstr "Фонетикалык"
 
-#: ../rules/base.xml.in.h:515
-#, fuzzy
+#: ../rules/base.xml.in.h:522
 msgid "Phonetic Winkeys"
-msgstr "Осетиндик Windows клавиатурасы"
+msgstr "Win клавишалары менен фонетикалык"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:523
 msgid "Pol"
 msgstr "Польск"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:524
 msgid "Poland"
 msgstr "Польша"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:525
 msgid "Polytonic"
 msgstr "Полифоникалык"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:526
 msgid "Portugal"
 msgstr "Португалия"
 
-#: ../rules/base.xml.in.h:520
-msgid "Pro"
-msgstr "Pro"
-
-#: ../rules/base.xml.in.h:521
-msgid "Pro Keypad"
-msgstr "Pro кошумча панели менен"
-
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:527
 msgid "Probhat"
 msgstr "Пробат"
 
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:528
 msgid "Programmer Dvorak"
 msgstr ""
 
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:529
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:530
 msgid "Prt"
 msgstr "Порт"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:531
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:532
 msgid "Right Alt"
 msgstr "Оң Alt"
 
-#: ../rules/base.xml.in.h:528
-#, fuzzy
+#: ../rules/base.xml.in.h:533
 msgid "Right Alt (while pressed)"
-msgstr "Оң Alt клавишасы басылганда убактылуу группаны алмаштырат"
+msgstr "Оң Alt клавишасы (басылган учурда)"
 
-#: ../rules/base.xml.in.h:529
-#, fuzzy
+#: ../rules/base.xml.in.h:534
 msgid "Right Alt key never chooses 3rd level"
-msgstr "3-чү денгээлди тандоо оң Alt клавишанын басылышы менен."
+msgstr "Оң Alt клавишасы эч качан 3-чү денгээлди тандабайт"
 
-#: ../rules/base.xml.in.h:530
-#, fuzzy
+#: ../rules/base.xml.in.h:535
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
-msgstr "3-чү денгээлди тандоо сол Alt клавишанын басылышы менен.Shift жана оң Alt бирге Multi_Key катары амал жасайт"
+msgstr "Оң Alt, Shift жана оң Alt бирге Multi_Key катары амал жасайт"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:536
 msgid "Right Ctrl"
 msgstr "Оң Ctrl"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:537
 msgid "Right Ctrl (while pressed)"
 msgstr "Оң Alt клавишасы (басылган учурда)"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:538
 msgid "Right Ctrl as Right Alt"
 msgstr "Оң Ctrl оң Alt клавишадай амал жасайт"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:539
 msgid "Right Shift"
 msgstr "Оң Shift"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:540
 msgid "Right Win"
 msgstr "Оң Win"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:541
 msgid "Right Win (while pressed)"
 msgstr "Оң Win клавишасы (басылган учурда)"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:542
 msgid "Right hand"
 msgstr ""
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:543
 msgid "Right handed Dvorak"
 msgstr "Dvorak оң колдуу адамдар үчүн"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:544
 msgid "Romania"
 msgstr "Румыния"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:545
 msgid "Romanian keyboard with German letters"
 msgstr "Румындык клавиатура немец ариптери менен"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:546
 msgid "Romanian keyboard with German letters, eliminate dead keys"
 msgstr "Румындык клавиатура немец ариптери менен, атайын (dead keys) клавишаларсыз"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:547
 msgid "Rou"
 msgstr "Рум"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:548
 msgid "Rus"
 msgstr "Рус"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:549
 msgid "Russia"
 msgstr "Россия"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:550
 msgid "Russian"
 msgstr "Орусча"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:551
 msgid "Russian phonetic"
 msgstr "Орусча фонетикалык"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:552
 msgid "Russian phonetic Dvorak"
 msgstr "Орусча фонетикалык Dvorak"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:553
 msgid "Russian phonetic, eliminate dead keys"
 msgstr "Орусча фонетикалык, атайын (dead keys) клавишаларсыз"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:554
 msgid "Russian with Kazakh"
 msgstr "Орусча Казакча менен"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:555
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:556
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:557
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:558
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:559
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:560 ../rules/base.extras.xml.in.h:7
 msgid "SRB"
-msgstr ""
+msgstr "SRB"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:561
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:562
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:563
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:564
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:565
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:566
 msgid "ScrollLock"
-msgstr ""
+msgstr "ScrollLock"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:567
 msgid "Secwepemctsin"
-msgstr ""
+msgstr "Secwepemctsin"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:568
 msgid "Semi-colon on third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:569 ../rules/base.extras.xml.in.h:8
 msgid "Serbia"
 msgstr "Сербия"
 
-#: ../rules/base.xml.in.h:565
-#, fuzzy
+#: ../rules/base.xml.in.h:570
 msgid "Shift cancels CapsLock"
-msgstr "Ctrl жана CapsLock клавишаларды алмаштыруу."
+msgstr "Shift CapsLock амалын очүрөт"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:571
 msgid "Shift does not cancel NumLock, chooses 3d level instead"
 msgstr ""
 
-#: ../rules/base.xml.in.h:567
-#, fuzzy
+#: ../rules/base.xml.in.h:572
 msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Shift клавишасы сандык клавиатурада MS Windows'тогу клавишадай амал жасайт"
+msgstr "Shift сандык клавиатура клавишалары менен MS Windows'тогу клавишадай амал жасайт"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:573
 msgid "Shift+CapsLock"
 msgstr "Shift+CapsLock"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:574
 msgid "Simple"
-msgstr ""
+msgstr "Жөнөкөй"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:575
 msgid "Slovakia"
 msgstr "Словакия"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:576
 msgid "Slovenia"
 msgstr "Словения"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:577
 msgid "South Africa"
 msgstr "Түштүк Африка"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:578
 msgid "Southern Uzbek"
 msgstr "Түштүк өзбөкчө"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:579
 msgid "Spain"
 msgstr "Испания"
 
-#: ../rules/base.xml.in.h:575
-#, fuzzy
+#: ../rules/base.xml.in.h:580
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
-msgstr "Атайын клавишалар (Ctrl+Alt+&lt;клв&gt;) сервер менен долборлонот."
+msgstr "Атайын клавишалар (Ctrl+Alt+&lt;клв&gt;) сервер менен долборлонот"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:581
 msgid "SrL"
 msgstr "ШрЛ"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:582
 msgid "Sri Lanka"
 msgstr "Шри Ланка"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:583
 msgid "Standard"
 msgstr "Стандарттык"
 
-#: ../rules/base.xml.in.h:579
-#, fuzzy
+#: ../rules/base.xml.in.h:584
 msgid "Standard (Cedilla)"
-msgstr "Стандарттык"
-
-#: ../rules/base.xml.in.h:580
-#, fuzzy
-msgid "Standard Phonetic"
-msgstr "Альтернативдүү фонетикалык"
+msgstr "Стандарттык (Седиль)"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:586
 msgid "Standard RSTU"
 msgstr "Стандарттык RSTU"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:588
 msgid "Standard RSTU on Russian layout"
 msgstr "Стандарттык RSTU, орусча"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:589
 msgid "Sun Type 5/6"
 msgstr "Sun Type 5/6"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:590
 msgid "Sun dead keys"
 msgstr "Атайын (dead keys) Sun клавишалар"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:591
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:592
 msgid "Svdvorak"
-msgstr ""
+msgstr "Svdvorak"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:593
 msgid "Svk"
 msgstr "Слов"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:594
 msgid "Svn"
 msgstr "Cловен"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:595
 msgid "Swap Ctrl and CapsLock"
 msgstr "Ctrl жана CapsLock клавишаларды алмаштыруу"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:596
 msgid "Swap ESC and CapsLock"
 msgstr "ESC жана CapsLock клавишаларды алмаштыруу"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:597
 msgid "Swe"
 msgstr "Швед"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:598
 msgid "Sweden"
 msgstr "Швеция"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:599
 msgid "Switzerland"
 msgstr "Швейцария"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:600
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (чөнтөк ПК)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:601
 msgid "Syr"
 msgstr "Асс"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:602
 msgid "Syria"
 msgstr "Сирийдик"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:603
 msgid "Syriac"
 msgstr "Сирийдик"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:604
 msgid "Syriac phonetic"
 msgstr "Сирийдик фонетикалык"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:605
 msgid "TIS-820.2538"
 msgstr "TIS-820.2538"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:606
 msgid "Tajikistan"
 msgstr "Таджикистан"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:607
 msgid "Tamil"
 msgstr "Тамильдик"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:608
 msgid "Tamil TAB Typewriter"
 msgstr "Тамильдик \"Басма машинасы\" TAB"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:609
 msgid "Tamil TSCII Typewriter"
 msgstr "Тамиль TSCII печать машинасы"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:610
 msgid "Tamil Unicode"
 msgstr "Тамиль Unicode"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:611
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:612
 msgid "Tatar"
 msgstr "Татар"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:613
 msgid "Telugu"
 msgstr "Телугу"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:614
 msgid "Tha"
 msgstr "Тай"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:615
 msgid "Thailand"
 msgstr "Тайланд"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:616
 msgid "Tibetan"
 msgstr "Тибет"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:617
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Тибет (ASCII номерлери менен)"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:618
 msgid "Tifinagh"
-msgstr ""
+msgstr "Тифинагдык"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:619
 msgid "Tifinagh Alternative"
-msgstr ""
+msgstr "Тифинагдык альтернативдик"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:620
 msgid "Tifinagh Alternative Phonetic"
-msgstr ""
+msgstr "Тифинагдык альтернативдик фонетикалык"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:621
 msgid "Tifinagh Extended"
-msgstr ""
+msgstr "Тифинагдык кеңейтилген"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:622
 msgid "Tifinagh Extended Phonetic"
-msgstr ""
+msgstr "Тифинагдык кеңейтилген фонетикалык"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:623
 msgid "Tifinagh Phonetic"
-msgstr ""
+msgstr "Тифинагдык фонетикалык"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:624
 msgid "Tilde (~) variant"
 msgstr "Тильда (~) менен вариант"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:625
 msgid "Tjk"
 msgstr "Тадж"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:626
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr ""
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:627
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr ""
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:628
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:625
-#, fuzzy
-msgid "Traditional Phonetic"
-msgstr "Альтернативдүү фонетикалык"
+#: ../rules/base.xml.in.h:629
+msgid "Traditional phonetic"
+msgstr "Традициондук фонетикалык"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:630
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:631
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:632
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:633
 msgid "Tur"
 msgstr "Тур"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:634
 msgid "Turkey"
 msgstr "Турция"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:635
 msgid "Turkmenistan"
 msgstr "Түркменистан"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:636
 msgid "Typewriter"
 msgstr "Басма машинасы"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:637
 msgid "UCW layout (accented letters only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:638
 msgid "US keyboard with Bosnian digraphs"
 msgstr "АКШ клавиатурасы боснийдик диграфтар менен"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:639
 msgid "US keyboard with Bosnian letters"
 msgstr "АКШ клавиатурасы боснийдик ариптер менен"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:640
 msgid "US keyboard with Croatian digraphs"
 msgstr "АКШ клавиатурасы хорваттык диграфтар менен"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:641
 msgid "US keyboard with Croatian letters"
 msgstr "АКШ клавиатурасы хорваттык ариптер менен"
 
-#: ../rules/base.xml.in.h:638
-#, fuzzy
+#: ../rules/base.xml.in.h:642
 msgid "US keyboard with Estonian letters"
-msgstr "АКШ клавиатурасы боснийдик ариптер менен"
+msgstr "АКШ клавиатурасы эстондук ариптер менен"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:643
+msgid "US keyboard with Italian letters"
+msgstr "АКШ клавиатурасы итальяндык ариптер менен"
+
+#: ../rules/base.xml.in.h:644
 msgid "US keyboard with Lithuanian letters"
 msgstr "АКШ клавиатурасы литовдук ариптер менен"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:645
 msgid "US keyboard with Slovenian letters"
 msgstr "АКШ клавиатурасы словендик ариптер менен"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:9
 msgid "USA"
 msgstr "АКШ"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:647
 msgid "Udmurt"
-msgstr ""
+msgstr "Удмурттук"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:648
 msgid "Ukr"
 msgstr "Укр"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:649
 msgid "Ukraine"
 msgstr "Украина"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:650
 msgid "Unicode additions (arrows and math operators)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:651
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:652
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:653
 msgid "United Kingdom"
 msgstr "Англис (Улуу Британия)"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:654
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:655
 msgid "Urdu, Alternative phonetic"
 msgstr "Урду, альтернативдик фонетикалык"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:656
 msgid "Urdu, Phonetic"
 msgstr "Урду, фонетикалык"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:657
 msgid "Urdu, Winkeys"
 msgstr "Урду, Windows клавишалары менен"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:658
 msgid "Use Bosnian digraphs"
 msgstr "Боснийдик диаграфтарды колдонуу"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:659
 msgid "Use Croatian digraphs"
 msgstr "Хорваттык диаграфтарды колдонуу"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:660
 msgid "Use guillemets for quotes"
 msgstr "Француздук тырмакчаларды тырмакчалардай колдонуу"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:661
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Клавиатура индикаторлорду кошумча группаларды көрсөтүү үчүн колдонуу"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:662
 msgid "Using space key to input non-breakable space character"
 msgstr ""
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:663
 msgid "Usual space at any level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:664
 msgid "Uzb"
 msgstr "Өзб"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:665
 msgid "Uzbekistan"
 msgstr "Өзбекистан"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:666
 msgid "Vietnam"
 msgstr "Вьетнам"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:667
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 Internet Keyboard"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:668
 msgid "Vnm"
 msgstr "Вьет"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:669
 msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:670
 msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:671
 msgid "Wang model 724 azerty"
 msgstr "Wang model 724 azerty"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:672
 msgid "Western"
 msgstr "Батыш"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:673
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:674
 msgid "Winkeys"
 msgstr "Windows клавиатурасы"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:675
 msgid "With &lt;\\|&gt; key"
 msgstr "&lt;\\|&gt; клавиша менен"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:676
 msgid "With EuroSign on 5"
 msgstr ""
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:677
 msgid "With guillemets"
 msgstr "Француздук тырмакчалар менен"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:678
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:679
 msgid "Yakut"
-msgstr ""
+msgstr "Якуттук"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:680
 msgid "Yoruba"
 msgstr "Йоруба"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:681
 msgid "Z and ZHE swapped"
 msgstr "З жана Ж орундарын алмаштырган"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:682
 msgid "Zar"
 msgstr "ЮАР"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:683
 msgid "azerty"
 msgstr "azerty"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:684
 msgid "azerty/digits"
 msgstr "azerty/цифры"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:685
 msgid "digits"
 msgstr "сандар"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:686
 msgid "displaced semicolon and quote (obsolete)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:687
 msgid "lyx"
 msgstr "lyx"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:688
 msgid "qwerty"
 msgstr "qwerty"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:689
 msgid "qwerty, extended Backslash"
 msgstr "qwerty, Backslash кеңейтилген функциялары"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:690
 msgid "qwerty/digits"
 msgstr "qwerty/сандар"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:691
 msgid "qwertz"
 msgstr "qwertz"
 
+#: ../rules/base.extras.xml.in.h:1
+msgid "APL"
+msgstr "APL"
+
+#: ../rules/base.extras.xml.in.h:2
+msgid "Atsina"
+msgstr "Атсиндик"
+
+#: ../rules/base.extras.xml.in.h:3
+msgid "Combining accents instead of dead keys"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:4
+msgid "Couer D'alene Salish"
+msgstr "Салишдик кёр-д’ален"
+
+#: ../rules/base.extras.xml.in.h:5
+msgid "International (AltGr Unicode combining)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:6
+msgid "International (AltGr Unicode combining, alternative)"
+msgstr ""
+
+#~ msgid "Pro"
+#~ msgstr "Pro"
+
+#~ msgid "Pro Keypad"
+#~ msgstr "Pro кошумча панели менен"
+
+#, fuzzy
+#~ msgid "Standard Phonetic"
+#~ msgstr "Альтернативдүү фонетикалык"
+
 #~ msgid "(Legacy) Dvorak"
 #~ msgstr "(Эскирген) Dvorak"
 
@@ -2787,9 +2815,6 @@ msgstr "qwertz"
 #~ msgid "Brazilian ABNT2"
 #~ msgstr "Бразилдик ABNT2"
 
-#~ msgid "Caps Lock is Compose."
-#~ msgstr "Caps Lock Compose клавишасы."
-
 #~ msgid "Press Left Alt key to choose 3rd level."
 #~ msgstr "3-чү денгээлди тандоо сол Alt клавишанын басылышы менен."
 
diff --git a/xorg-server/xkbdata.src/po/lt.po b/xorg-server/xkbdata.src/po/lt.po
index b9e9e75d2..a5380123d 100644
--- a/xorg-server/xkbdata.src/po/lt.po
+++ b/xorg-server/xkbdata.src/po/lt.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: xkeyboard-config 1.6.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
 "POT-Creation-Date: 2009-09-15 23:31+0100\n"
-"PO-Revision-Date: 2009-09-27 15:58+0300\n"
+"PO-Revision-Date: 2009-10-03 17:26+0300\n"
 "Last-Translator: Rimas Kudelis <rq@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
 "MIME-Version: 1.0\n"
@@ -2791,6 +2791,10 @@ msgstr "Tarptautinis (unikodo ženklai kombinuojami Lyg3 klavišu)"
 msgid "International (AltGr Unicode combining, alternative)"
 msgstr "Tarptautinis (unikodo ženklai kombinuojami Lyg3 klavišu, alternatyvusis)"
 
+#~| msgid "Right Ctrl as Right Alt"
+#~ msgid "Right Ctrl+Right Shift"
+#~ msgstr "Dešinysis Vald+dešinysis Lyg2"
+
 #~ msgid "Keypad"
 #~ msgstr "Skaitmenų sritis"
 
diff --git a/xorg-server/xkbdata.src/po/ru.po b/xorg-server/xkbdata.src/po/ru.po
index 7765d7d84..d624eafc0 100644
--- a/xorg-server/xkbdata.src/po/ru.po
+++ b/xorg-server/xkbdata.src/po/ru.po
@@ -1,17 +1,17 @@
-# translation of xkeyboard-config-1.6.99.ru.po to Russian
-# Copyright (C) 2002, 2009 Free Software Foundation, Inc.
+# translation of xkeyboard-config-1.8.ru.po to Russian
+# Copyright (C) 2002, 2009, 2010 Free Software Foundation, Inc.
 # Sergey V. Udaltsov<svu@users.sourceforge.net>
 # This file is distributed under the same license as the xkeyboard-config package.
 #
 # Sergey E Kvyato <kvantos@plotinka.ru>, 2006.
 # Nickolay V. Shmyrev <nshmyrev@yandex.ru>, 2006.
-# Yuri Kozlov <yuray@komyakino.ru>, 2009.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 1.6.99\n"
+"Project-Id-Version: xkeyboard-config 1.8\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2009-09-15 23:31+0100\n"
-"PO-Revision-Date: 2009-09-17 20:10+0400\n"
+"POT-Creation-Date: 2010-01-16 18:08+0000\n"
+"PO-Revision-Date: 2010-01-17 09:40+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
 "MIME-Version: 1.0\n"
@@ -361,791 +361,791 @@ msgid "BTC 9116U Mini Wireless Internet and Gaming"
 msgstr "BTC 9116U Mini Wireless Internet and Gaming"
 
 #: ../rules/base.xml.in.h:86
-msgid "Baltic+"
-msgstr "Baltic+"
-
-#: ../rules/base.xml.in.h:87
 msgid "Ban"
 msgstr "Бан"
 
-#: ../rules/base.xml.in.h:88
+#: ../rules/base.xml.in.h:87
 msgid "Bangladesh"
 msgstr "Бангладеш"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:88
 msgid "Bashkirian"
 msgstr "Башкирская"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:89
 msgid "Bel"
 msgstr "Бельг"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:90
 msgid "Belarus"
 msgstr "Белоруссия"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:91
 msgid "Belgium"
 msgstr "Бельгия"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:92
 msgid "BenQ X-Touch"
 msgstr "BenQ X-Touch"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:93
 msgid "BenQ X-Touch 730"
 msgstr "BenQ X-Touch 730"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:94
 msgid "BenQ X-Touch 800"
 msgstr "BenQ X-Touch 800"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:95
 msgid "Bengali"
 msgstr "Бенгальская"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:96
 msgid "Bengali Probhat"
 msgstr "Бенгальская Пробат"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:97
 msgid "Bepo, ergonomic, Dvorak way"
 msgstr "Бепо, эргономичная, похожая на Dvorak"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:98
 msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
 msgstr "Бепо, эргономичная, похожая на Dvorak, только latin-9"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:99
 msgid "Bgr"
 msgstr "Болг"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:100
 msgid "Bhu"
 msgstr "Бут"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:101
 msgid "Bhutan"
 msgstr "Бутан"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:102
 msgid "Biblical Hebrew (Tiro)"
 msgstr "Библейский иврит (Tiro)"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:103
 msgid "Bih"
 msgstr "Босн"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:104
 msgid "Blr"
 msgstr "Бел"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:105
 msgid "Bosnia and Herzegovina"
 msgstr "Босния и Герцеговина"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Обе клавиши Alt, нажатые вместе"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Обе клавиши Ctrl, нажатые вместе"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Обе клавиши Shift, нажатые вместе"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:109
 msgid "Bra"
 msgstr "Браз"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:110
 msgid "Braille"
 msgstr "Брайля"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:111
 msgid "Brazil"
 msgstr "Бразилия"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:112
 msgid "Breton"
 msgstr "Бретонская"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:113
 msgid "Brl"
 msgstr "Brl"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:114
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet Keyboard"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:115
 msgid "Buckwalter"
 msgstr "Buckwalter"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:116
 msgid "Bulgaria"
 msgstr "Болгария"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:117
 msgid "CRULP"
 msgstr "CRULP"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:118
 msgid "Cambodia"
 msgstr "Камбоджа"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:119
 msgid "Can"
 msgstr "Кан"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:120
 msgid "Canada"
 msgstr "Канада"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:121
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:122
 msgid "CapsLock"
 msgstr "CapsLock"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:123
 msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
 msgstr "CapsLock (на первую раскладку), Shift+CapsLock (на последнюю раскладку)"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:124
 msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
 msgstr "CapsLock (пока нажата), Alt+CapsLock выполняет первоначальную функцию capslock"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:125
 msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
 msgstr "CapsLock действует как Shift с блокировкой. Shift приостанавливает действие CapsLock"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:126
 msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
 msgstr "CapsLock действует как Shift с блокировкой. Shift не влияет на CapsLock"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:127
 msgid "CapsLock is disabled"
 msgstr "CapsLock выключен"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:128
 msgid "CapsLock key behavior"
 msgstr "Поведение клавиши CapsLock"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:129
 msgid "CapsLock toggles Shift so all keys are affected"
 msgstr "CapsLock включает Shift, таким образом что, он действует сразу на все клавиши"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:130
 msgid "CapsLock toggles normal capitalization of alphabetic characters"
 msgstr "CapsLock включает обычную капитализацию символов алфавита"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:131
 msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
 msgstr "CapsLock включает внутреннюю капитализацию. Shift приостанавливает действие CapsLock"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:132
 msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
 msgstr "CapsLock включает внутреннюю капитализацию. Shift не влияет на CapsLock"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:133
 msgid "Catalan variant with middle-dot L"
 msgstr "Каталонский вариант с точкой в L посередине"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:134
 msgid "Cedilla"
 msgstr "Седиль"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:135
 msgid "Che"
 msgstr "Швейц"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:136
 msgid "Cherokee"
 msgstr "Чероки"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:137
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:138
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:139
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (альтернативный вариант)"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:140
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:141
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:142
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:143
 msgid "Cherry CyMotion Master XPress"
 msgstr " Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:144
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet Keyboard"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:145
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:146
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:147
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:148
 msgid "China"
 msgstr "Китай"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:149
 msgid "Chuvash"
 msgstr "Чувашия"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:150
 msgid "Chuvash Latin"
 msgstr "Чувашия, Латиница"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:151
 msgid "Classic"
 msgstr "Классическая"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:152
 msgid "Classic Dvorak"
 msgstr "Классическая Dvorak"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:153
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:154
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:155
 msgid "Colemak"
 msgstr "Colemak"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:156
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access Keyboard"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard (13 клавиш)"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 клавиш)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 клавиш)"
 
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:160
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq Keyboard"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:161
 msgid "Compose key position"
 msgstr "Положение клавиши Compose"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:162
 msgid "Congo, Democratic Republic of the"
 msgstr "Конго, Демократическая республика"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Backspace"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:164
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "Control используется в качестве клавиш Alt, Alt используется в качестве клавиш Win"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:165
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "Control используется в качестве клавиш Win (и как обычный Control)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Dobruca-1 Q)"
 msgstr "Крымскотатарская (Dobruca-1 Q)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Dobruca-2 Q)"
 msgstr "Крымскотатарская (Dobruca-2 Q)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Крымскотатарская (турецкая Alt-Q)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:170
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Крымскотатарская (турецкая F)"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:171
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Крымскотатарская (турецкая Q)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:172
 msgid "Croatia"
 msgstr "Хорватия"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:173
 msgid "Ctrl key position"
 msgstr "Положение клавиши Ctrl"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:174
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:175
 msgid "Cyrillic"
 msgstr "Кириллица"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:176
 msgid "Cyrillic with guillemets"
 msgstr "Кириллица с кавычками ёлочками"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:177
 msgid "Cyrillic, Z and ZHE swapped"
 msgstr "Кириллица, З и Ж переставлены местами"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:178
 msgid "Cze"
 msgstr "Чех"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:179
 msgid "Czechia"
 msgstr "Чехия"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:180
 msgid "DOS"
 msgstr "DOS"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:181
 msgid "DRC"
 msgstr "ДРК"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:182
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:183
 msgid "Dan"
 msgstr "Дан"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:184
 msgid "Dead acute"
 msgstr "Спец. символ Dead acute"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:185
 msgid "Dead grave acute"
 msgstr "Спец. символ Dead grave acute"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:186
 msgid "Default numeric keypad keys"
 msgstr "Клавиши цифровой клавиатуры по умолчанию"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:187
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:188
 msgid "Dell 101-key PC"
 msgstr "Dell 101-клавишный PC"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:189
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Ноутбуки Dell Inspiron серий 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:190
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Ноутбуки Dell  Precision серий M"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:191
 msgid "Dell Latitude series laptop"
 msgstr "Ноутбук Dell серии Latitude"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:192
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:193
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:194
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:195
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:196
 msgid "Denmark"
 msgstr "Дания"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:197
 msgid "Deu"
 msgstr "Нем"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:198
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:199
 msgid "Diamond 9801 / 9802 series"
 msgstr "Модели Diamond 9801/9802"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:200
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:201
 msgid "Dvorak (UK Punctuation)"
 msgstr "Дворак (английская расстановка)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:202
 msgid "Dvorak international"
 msgstr "Дворак, международная"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:203
 msgid "Dvorak, Polish quotes on key 1"
 msgstr "Дворак, польские кавычки на клавише 1"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:204
 msgid "Dvorak, Polish quotes on quotemark key"
 msgstr "Дворак, польские кавычки на клавишах с кавычками"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:205
 msgid "E"
 msgstr "E"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:206
 msgid "Eastern"
 msgstr "Восточный"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:207
 msgid "Eliminate dead keys"
 msgstr "Исключить специальные клавиши (dead keys)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:208
 msgid "Enable extra typographic characters"
 msgstr "Включить дополнительные типографские символы"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:209
 msgid "English"
 msgstr "Английская"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:210
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:211
 msgid "Enter on keypad"
 msgstr "Enter на цифровой клавиатуре"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:212
 msgid "Epo"
 msgstr "Эсп"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:213
 msgid "Ergonomic"
 msgstr "Ergonomic"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:214
 msgid "Esp"
 msgstr "Исп"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:215
 msgid "Esperanto"
 msgstr "Эсперанто"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:216
 msgid "Est"
 msgstr "Эст"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:217
 msgid "Estonia"
 msgstr "Эстония"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:218
 msgid "Eth"
 msgstr "Эфи"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:219
 msgid "Ethiopia"
 msgstr "Эфиопия"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:220
 msgid "Evdev-managed keyboard"
 msgstr "Клавиатура, управляемая посредством Evdev"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:221
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:222
 msgid "Ewe"
 msgstr "Эве"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:223
 msgid "Extended"
 msgstr "Расширенная"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:224
 msgid "Extended - Winkeys"
 msgstr "Расширенная, клавиши Win"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:225
 msgid "Extended Backslash"
 msgstr "Расширенные функции Backslash"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:226
 msgid "F-letter (F) variant"
 msgstr "Вариант с F"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:227
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:228
 msgid "Fao"
 msgstr "Фар"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:229
 msgid "Faroe Islands"
 msgstr "Острова Фаро"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:230
 msgid "Fin"
 msgstr "Фин"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:231
 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:235
+#: ../rules/base.xml.in.h:234
 msgid "Four-level key with abstract separators"
 msgstr "Четырёх-уровневая клавиша с абстрактными разделителями"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:235
 msgid "Four-level key with comma"
 msgstr "Четырёх-уровневая клавиша с запятой"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:236
 msgid "Four-level key with dot"
 msgstr "Четырёх-уровневая клавиша с точкой"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:237
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Четырёх-уровневая клавиша с точкой, ограничена latin-9"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:238
 msgid "Four-level key with momayyez"
 msgstr "Четырёх-уровневая клавиша с momayyez"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:239
 msgid "Fra"
 msgstr "Фр"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:240
 msgid "France"
 msgstr "Франция"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:241
 msgid "French"
 msgstr "Французская"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:242
 msgid "French (Macintosh)"
 msgstr "Французская (Macintosh)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:243
 msgid "French (legacy)"
 msgstr "Французская (унаследованная)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:244
 msgid "French Dvorak"
 msgstr "Французская Dvorak"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:245
 msgid "French, Sun dead keys"
 msgstr "Французская, специальные клавиши (dead keys) Sun"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:246
 msgid "French, eliminate dead keys"
 msgstr "Французская, исключить специальные клавиши (dead keys)"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:247
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Ноутбук Fujitsu-Siemens Computers AMILO"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:248
 msgid "Fula"
 msgstr "Фула"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:249
 msgid "GBr"
 msgstr "Брит"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:250
 msgid "Ga"
 msgstr "Га"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:251
 msgid "Generic 101-key PC"
 msgstr "Обычный 101-клавишный ПК"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:252
 msgid "Generic 102-key (Intl) PC"
 msgstr "Обычный 102-клавишный (межд) ПК"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:253
 msgid "Generic 104-key PC"
 msgstr "Обычный 104-клавишный ПК"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:254
 msgid "Generic 105-key (Intl) PC"
 msgstr "Обычный 105-клавишный (межд) ПК"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:255
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:256
 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:258
+#: ../rules/base.xml.in.h:257
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:258
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:259
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:260
 msgid "Geo"
 msgstr "Груз"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:261
 msgid "Georgia"
 msgstr "Грузия"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:262
 msgid "Georgian"
 msgstr "Грузинская"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:263
 msgid "Georgian AZERTY Tskapo"
 msgstr "Грузинская AZERTY Tskapo"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:264
 msgid "German (Macintosh)"
 msgstr "Немецкая (Macintosh)"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:265
 msgid "German, Sun dead keys"
 msgstr "Немецкая, специальные клавиши (dead keys) Sun"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:266
 msgid "German, eliminate dead keys"
 msgstr "Немецкая, исключить специальные клавиши (dead keys)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:267
 msgid "Germany"
 msgstr "Германия"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:268
 msgid "Gha"
 msgstr "Ган"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:269
 msgid "Ghana"
 msgstr "Гана"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:270
 msgid "Gre"
 msgstr "Гре"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:271
 msgid "Greece"
 msgstr "Греция"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:272
 msgid "Group toggle on multiply/divide key"
 msgstr "Переключение групп по клавише умножения/деления"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:273
 msgid "Gui"
 msgstr "Гви"
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:274
 msgid "Guinea"
 msgstr "Гвинея"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:275
 msgid "Gujarati"
 msgstr "Гуджарати"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:276
 msgid "Gurmukhi"
 msgstr "Гурмукхи"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:277
 msgid "Gurmukhi Jhelum"
 msgstr "Гурмукхи Jhelum"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:278
 msgid "Gyration"
 msgstr "Гирашн"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:279
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking Keyboard"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:280
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Happy Hacking Keyboard для Mac"
 
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:281
 msgid "Hausa"
 msgstr "Хауза"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:282
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard"
 
+#: ../rules/base.xml.in.h:283
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard Mini 110 Notebook"
+
 #: ../rules/base.xml.in.h:284
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
@@ -1243,293 +1243,293 @@ msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:308
-msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E, международный"
-
-#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:310
 msgid "ISO Alternate"
 msgstr "Дополнительная ISO"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:311
 msgid "Iceland"
 msgstr "Исландия"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:312
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:313
 msgid "Include dead tilde"
 msgstr "Включить \"специальную\" тильду"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:314
 msgid "Ind"
 msgstr "Инд"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:315
 msgid "India"
 msgstr "Индия"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:316
 msgid "International (AltGr dead keys)"
 msgstr "Международная, AltGr и спец. клавишами ( dead keys)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:317
 msgid "International (with dead keys)"
 msgstr "Международная, со спец. клавишами (dead keys)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:318
 msgid "Inuktitut"
 msgstr "Иннуитская"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:319
 msgid "Iran"
 msgstr "Иран"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:320
 msgid "Iraq"
 msgstr "Ирак"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:321
 msgid "Ireland"
 msgstr "Ирландия"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:322
 msgid "Irl"
 msgstr "Ирл"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:323
 msgid "Irn"
 msgstr "Перс"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:324
 msgid "Irq"
 msgstr "Ирк"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:325
 msgid "Isl"
 msgstr "Исл"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:326
 msgid "Isr"
 msgstr "Ивр"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:327
 msgid "Israel"
 msgstr "Израиль"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:328
 msgid "Ita"
 msgstr "Ит"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:329
 msgid "Italy"
 msgstr "Италия"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:330
 msgid "Japan"
 msgstr "Япония"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:331
 msgid "Japan (PC-98xx Series)"
 msgstr "Japan (PC-98xx Series)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:332
 msgid "Japanese keyboard options"
 msgstr "Настройки японской клавиатуры"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:333
 msgid "Jpn"
 msgstr "Яп"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:334
 msgid "Kalmyk"
 msgstr "Калмыкская"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:335
 msgid "Kana"
 msgstr "Кана"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:336
 msgid "Kana Lock key is locking"
 msgstr "Кана блокируется клавишей Lock"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:337
 msgid "Kannada"
 msgstr "Каннада"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:338
 msgid "Kashubian"
 msgstr "Кашубский"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:339
 msgid "Kaz"
 msgstr "Каз"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:340
 msgid "Kazakh with Russian"
 msgstr "Казахский с Русским"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:341
 msgid "Kazakhstan"
 msgstr "Казахстан"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:342
 msgid "Key sequence to kill the X server"
 msgstr "Комбинация клавиш для прерывания работы X-сервера"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:343
 msgid "Key to choose 3rd level"
 msgstr "Клавиша для выбора 3-го уровня"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:344
 msgid "Key(s) to change layout"
 msgstr "Клавиша(ы) для смены раскладки"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:345
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:346
 msgid "Kgz"
 msgstr "Кир"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:347
 msgid "Khm"
 msgstr "Кхм"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:348
 msgid "Komi"
 msgstr "Коми"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:349
 msgid "Kor"
 msgstr "Кор"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:350
 msgid "Korea, Republic of"
 msgstr "Республика Корея"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:351
 msgid "Ktunaxa"
 msgstr "Кутенай"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:352
 msgid "Kurdish, (F)"
 msgstr "Курдская, (F)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:353
 msgid "Kurdish, Arabic-Latin"
 msgstr "Курдская, Арабско-латинская"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:354
 msgid "Kurdish, Latin Alt-Q"
 msgstr "Курдская, Латиница Alt-Q"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:355
 msgid "Kurdish, Latin Q"
 msgstr "Курдская, Латиница Q"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:356
 msgid "Kyrgyzstan"
 msgstr "Киргизия"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:357
 msgid "LAm"
 msgstr "ЛатАм"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:358
 msgid "LEKP"
 msgstr "LEKP"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:359
 msgid "LEKPa"
 msgstr "LEKPa"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:360
 msgid "Lao"
 msgstr "Лао"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:361
 msgid "Laos"
 msgstr "Лаос"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:362
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Клавиатура для ноутбуков Compaq (например Armada)"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:363
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "\"Интернет\" клавиатура для ноутбуков Compaq (например Presario)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:364
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Ноутбуки eMachines m68xx"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:365
 msgid "Latin"
 msgstr "Латинская"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:366
 msgid "Latin American"
 msgstr "Латиноамериканская"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:367
 msgid "Latin Unicode"
 msgstr "Латинская Юникодная"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:368
 msgid "Latin Unicode qwerty"
 msgstr "Латинская Юникодная qwerty"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:369
 msgid "Latin qwerty"
 msgstr "Латинская qwerty"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:370
 msgid "Latin unicode"
 msgstr "Латинская юникодная"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:371
 msgid "Latin unicode qwerty"
 msgstr "Латинская юникодная qwerty"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:372
 msgid "Latin with guillemets"
 msgstr "Латинская с кавычками ёлочками"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:373
 msgid "Latvia"
 msgstr "Латвия"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:374
 msgid "Lav"
 msgstr "Лат"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:375
 msgid "Left Alt"
 msgstr "Левая клавиша Alt"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:376
 msgid "Left Alt (while pressed)"
 msgstr "Левая клавиша Alt (пока нажата)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:377
 msgid "Left Alt is swapped with Left Win"
 msgstr "Левая клавиша Alt поменяна местами с левой клавишей Win"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:378
 msgid "Left Ctrl"
 msgstr "Левая клавиша Ctrl"
 
+#: ../rules/base.xml.in.h:379
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr "Левый Ctrl (на первую раскладку), Правый Ctrl (на последнюю раскладку)"
+
 #: ../rules/base.xml.in.h:380
 msgid "Left Ctrl+Left Shift"
 msgstr "Левый Ctrl+Левый Shift"
@@ -2164,608 +2164,616 @@ msgid "Right Ctrl as Right Alt"
 msgstr "Правая клавиша Ctrl работает как правая клавиша Alt"
 
 #: ../rules/base.xml.in.h:539
+msgid "Right Ctrl+Right Shift"
+msgstr "Правый Ctrl+Правый Shift"
+
+#: ../rules/base.xml.in.h:540
 msgid "Right Shift"
 msgstr "Правая клавиша Shift"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:541
 msgid "Right Win"
 msgstr "Правая клавиша Win"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:542
 msgid "Right Win (while pressed)"
 msgstr "Правая клавиша Win (пока нажата)"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:543
 msgid "Right hand"
 msgstr "Для правшей"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:544
 msgid "Right handed Dvorak"
 msgstr "Дворак для правшей"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:545
 msgid "Romania"
 msgstr "Румыния"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:546
 msgid "Romanian keyboard with German letters"
 msgstr "Румынская клавиатура с немецкими буквами"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:547
 msgid "Romanian keyboard with German letters, eliminate dead keys"
 msgstr "Румынская клавиатура с немецкими буквами, исключить специальные клавиши (dead keys)"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:548
 msgid "Rou"
 msgstr "Рум"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:549
 msgid "Rus"
 msgstr "Рус"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:550
 msgid "Russia"
 msgstr "Россия"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:551
 msgid "Russian"
 msgstr "Русская"
 
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:552
 msgid "Russian phonetic"
 msgstr "Русская фонетическая"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:553
 msgid "Russian phonetic Dvorak"
 msgstr "Русский фонетический Дворак"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:554
 msgid "Russian phonetic, eliminate dead keys"
 msgstr "Русская фонетическая, исключить специальные клавиши (dead keys)"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:555
 msgid "Russian with Kazakh"
 msgstr "Русская с Казахской"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:556
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:557
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:558
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:559
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:560
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:560 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:7
 msgid "SRB"
 msgstr "SRB"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:562
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:563
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:564
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:565
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:566
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:567
 msgid "ScrollLock"
 msgstr "ScrollLock"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:568
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:569
 msgid "Semi-colon on third level"
 msgstr "Точка с запятой на третьем уровне"
 
-#: ../rules/base.xml.in.h:569 ../rules/base.extras.xml.in.h:8
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:8
 msgid "Serbia"
 msgstr "Сербия"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:571
 msgid "Shift cancels CapsLock"
 msgstr "Shift отменяет CapsLock"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:572
 msgid "Shift does not cancel NumLock, chooses 3d level instead"
 msgstr "Shift не отменяет NumLock, а выбирает третий уровень"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:573
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Клавиша Shift с клавишами цифровой клавиатуры работают также как в MS Windows"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:574
 msgid "Shift+CapsLock"
 msgstr "Shift+CapsLock"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:575
 msgid "Simple"
 msgstr "Простая"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:576
 msgid "Slovakia"
 msgstr "Словакия"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:577
 msgid "Slovenia"
 msgstr "Словения"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:578
 msgid "South Africa"
 msgstr "Южная Африка"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:579
 msgid "Southern Uzbek"
 msgstr "Южно-узбекская"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:580
 msgid "Spain"
 msgstr "Испания"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:581
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Специальные клавиши (Ctrl+Alt+&lt;клв&gt;) обрабатываются сервером"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:582
 msgid "SrL"
 msgstr "ШрЛ"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:583
 msgid "Sri Lanka"
 msgstr "Шри Ланка"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:584
 msgid "Standard"
 msgstr "Стандартная"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:585
 msgid "Standard (Cedilla)"
 msgstr "Стандартная (седиль)"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:587
 msgid "Standard RSTU"
 msgstr "Стандартная RSTU"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:589
 msgid "Standard RSTU on Russian layout"
 msgstr "Стандартная RSTU, русская"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:590
 msgid "Sun Type 5/6"
 msgstr "Sun Type 5/6"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:591
 msgid "Sun dead keys"
 msgstr "Специальные клавиши (dead keys) Sun"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:592
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:593
 msgid "Svdvorak"
 msgstr "Svdvorak"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:594
 msgid "Svk"
 msgstr "Слов"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:595
 msgid "Svn"
 msgstr "Cловен"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:596
 msgid "Swap Ctrl and CapsLock"
 msgstr "Поменять местами клавиши Ctrl и CapsLock"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:597
 msgid "Swap ESC and CapsLock"
 msgstr "Поменять местами клавиши ESC и CapsLock"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:598
 msgid "Swe"
 msgstr "Швед"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:599
 msgid "Sweden"
 msgstr "Швеция"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:600
 msgid "Switzerland"
 msgstr "Швейцария"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:601
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (карманный ПК)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:602
 msgid "Syr"
 msgstr "Асс"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:603
 msgid "Syria"
 msgstr "Сирийская"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:604
 msgid "Syriac"
 msgstr "Сирийская"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:605
 msgid "Syriac phonetic"
 msgstr "Сирийская фонетическая"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:606
 msgid "TIS-820.2538"
 msgstr "TIS-820.2538"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:607
 msgid "Tajikistan"
 msgstr "Таджикистан"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:608
 msgid "Tamil"
 msgstr "Тамильская"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:609
 msgid "Tamil TAB Typewriter"
 msgstr "Тамильская \"Печатная машинка\" TAB"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:610
 msgid "Tamil TSCII Typewriter"
 msgstr "Тамильская \"Печатная машинка\" TSCII"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:611
 msgid "Tamil Unicode"
 msgstr "Тамильская Unicode"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:612
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:613
 msgid "Tatar"
 msgstr "Татарская"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:614
 msgid "Telugu"
 msgstr "Телугу"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:615
 msgid "Tha"
 msgstr "Таи"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:616
 msgid "Thailand"
 msgstr "Таиланд"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:617
 msgid "Tibetan"
 msgstr "Тибетская"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:618
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Тибетская (с цифрами ASCII)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:619
 msgid "Tifinagh"
 msgstr "Тифинагская"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:620
 msgid "Tifinagh Alternative"
 msgstr "Тифинагская альтернативная"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:621
 msgid "Tifinagh Alternative Phonetic"
 msgstr "Тифинагская альтернативная фонетическая"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:622
 msgid "Tifinagh Extended"
 msgstr "Тифинагская расширенная"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:623
 msgid "Tifinagh Extended Phonetic"
 msgstr "Тифинагская расширенная фонетическая"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:624
 msgid "Tifinagh Phonetic"
 msgstr "Тифинагская фонетическая"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:625
 msgid "Tilde (~) variant"
 msgstr "Вариант с тильдой (~)"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:626
 msgid "Tjk"
 msgstr "Тадж"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:627
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "На соответствующую клавишу на клавиатуре Дворак."
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:628
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "На соответствующую клавишу на клавиатуре Qwerty."
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:629
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:630
 msgid "Traditional phonetic"
 msgstr "Традиционная фонетическая"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:631
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:632
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:633
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:634
 msgid "Tur"
 msgstr "Тур"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:635
 msgid "Turkey"
 msgstr "Турция"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:636
 msgid "Turkmenistan"
 msgstr "Туркмения"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:637
 msgid "Typewriter"
 msgstr "Печатная машинка"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:638
+msgid "Typewriter, legacy"
+msgstr "Печатная машинка, устаревшая"
+
+#: ../rules/base.xml.in.h:639
 msgid "UCW layout (accented letters only)"
 msgstr "Раскладка UCW (только символы акцентов)"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:640
 msgid "US keyboard with Bosnian digraphs"
 msgstr "Клавиатура США с боснийскими диграфами"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:641
 msgid "US keyboard with Bosnian letters"
 msgstr "Клавиатура США с боснийскими буквами"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:642
 msgid "US keyboard with Croatian digraphs"
 msgstr "Клавиатура США с хорватскими диграфами"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:643
 msgid "US keyboard with Croatian letters"
 msgstr "Клавиатура США с хорватскими буквами"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:644
 msgid "US keyboard with Estonian letters"
 msgstr "Клавиатура США с эстонскими буквами"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:645
 msgid "US keyboard with Italian letters"
 msgstr "Клавиатура США с итальянскими буквами"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:646
 msgid "US keyboard with Lithuanian letters"
 msgstr "Клавиатура США с литовскими буквами"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:647
 msgid "US keyboard with Slovenian letters"
 msgstr "Клавиатура США со словенскими буквами"
 
-#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:648 ../rules/base.extras.xml.in.h:9
 msgid "USA"
 msgstr "США"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:649
 msgid "Udmurt"
 msgstr "Удмуртская"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:650
 msgid "Ukr"
 msgstr "Укр"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:651
 msgid "Ukraine"
 msgstr "Украина"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:652
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Добавления юникода (стрелки и математические операторы)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:653
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Добавления юникода (стрелки и математические операторы). Математические операторы на уровне по умолчанию"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:654
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:655
 msgid "United Kingdom"
 msgstr "Английская (Великобритания)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:656
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:657
 msgid "Urdu, Alternative phonetic"
 msgstr "Урду, альтернативная фонетическая"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:658
 msgid "Urdu, Phonetic"
 msgstr "Урду, фонетическая"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:659
 msgid "Urdu, Winkeys"
 msgstr "Урду, с клавишами Win"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:660
 msgid "Use Bosnian digraphs"
 msgstr "Использовать боснийские диграфы"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:661
 msgid "Use Croatian digraphs"
 msgstr "Использовать хорватские диграфы"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:662
 msgid "Use guillemets for quotes"
 msgstr "Использовать кавычки ёлочки как кавычки"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:663
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Использовать клавиатурные индикаторы для отображения дополнительных раскладок"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:664
 msgid "Using space key to input non-breakable space character"
 msgstr "Клавиша пробела используется для ввода символа неразрывного пробела"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:665
 msgid "Usual space at any level"
 msgstr "Обычный пробел на любом уровне"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:666
 msgid "Uzb"
 msgstr "Узб"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:667
 msgid "Uzbekistan"
 msgstr "Узбекистан"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:668
 msgid "Vietnam"
 msgstr "Вьетнам"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:669
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 Internet Keyboard"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:670
 msgid "Vnm"
 msgstr "Вьет"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:671
 msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
 msgstr "Wang 724 keypad с добавлениями юникода (стрелки и математические операторы)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:672
 msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Wang 724 keypad с добавлениями юникода (стрелки и математические операторы). Математические операторы на уровне по умолчанию"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:673
 msgid "Wang model 724 azerty"
 msgstr "Wang model 724 azerty"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:674
 msgid "Western"
 msgstr "Западная"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:675
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:676
 msgid "Winkeys"
 msgstr "Клавиши Win"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:677
 msgid "With &lt;\\|&gt; key"
 msgstr "С клавишей &lt;\\|&gt;"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:678
 msgid "With EuroSign on 5"
 msgstr "С знаком Евро к клавише 5"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:679
 msgid "With guillemets"
 msgstr "С кавычками ёлочками"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:680
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:681
 msgid "Yakut"
 msgstr "Якутская"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:682
 msgid "Yoruba"
 msgstr "Йоруба"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:683
 msgid "Z and ZHE swapped"
 msgstr "З и Ж переставлены местами"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:684
 msgid "Zar"
 msgstr "ЮАР"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:685
 msgid "azerty"
 msgstr "azerty"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:686
 msgid "azerty/digits"
 msgstr "azerty/цифры"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:687
 msgid "digits"
 msgstr "цифры"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:688
 msgid "displaced semicolon and quote (obsolete)"
 msgstr "смещённые точка с запятой и кавычка (устарело)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:689
 msgid "lyx"
 msgstr "lyx"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:690
 msgid "qwerty"
 msgstr "qwerty"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:691
 msgid "qwerty, extended Backslash"
 msgstr "qwerty, расширенные функции Backslash"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:692
 msgid "qwerty/digits"
 msgstr "qwerty/цифры"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:693
 msgid "qwertz"
 msgstr "qwertz"
 
diff --git a/xorg-server/xkbdata.src/po/sv.po b/xorg-server/xkbdata.src/po/sv.po
index b12bbec22..2fbb1517b 100644
--- a/xorg-server/xkbdata.src/po/sv.po
+++ b/xorg-server/xkbdata.src/po/sv.po
@@ -1,15 +1,15 @@
 # Swedish messages for xkeyboard-config.
-# Copyright (C) 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010 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, 2009.
+# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 1.6.99\n"
+"Project-Id-Version: xkeyboard-config 1.8\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2009-09-15 23:31+0100\n"
-"PO-Revision-Date: 2009-09-18 10:00+0100\n"
+"POT-Creation-Date: 2010-01-16 18:08+0000\n"
+"PO-Revision-Date: 2010-01-16 21:09+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"
@@ -357,791 +357,791 @@ msgid "BTC 9116U Mini Wireless Internet and Gaming"
 msgstr "BTC 9116U Mini Wireless Internet and Gaming"
 
 #: ../rules/base.xml.in.h:86
-msgid "Baltic+"
-msgstr "Baltisk+"
-
-#: ../rules/base.xml.in.h:87
 msgid "Ban"
 msgstr "Ban"
 
-#: ../rules/base.xml.in.h:88
+#: ../rules/base.xml.in.h:87
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:88
 msgid "Bashkirian"
 msgstr "Basjkiriska"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:89
 msgid "Bel"
 msgstr "Bel"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:90
 msgid "Belarus"
 msgstr "Vitryssland"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:91
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:92
 msgid "BenQ X-Touch"
 msgstr "BenQ X-Touch"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:93
 msgid "BenQ X-Touch 730"
 msgstr "BenQ X-Touch 730"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:94
 msgid "BenQ X-Touch 800"
 msgstr "BenQ X-Touch 800"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:95
 msgid "Bengali"
 msgstr "Bengalisk"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:96
 msgid "Bengali Probhat"
 msgstr "Bengali Probhat"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:97
 msgid "Bepo, ergonomic, Dvorak way"
 msgstr "Bepo, ergonomisk, Dvorak"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:98
 msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
 msgstr "Bepo, ergonomisk, Dvorak, endast latin-9"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:99
 msgid "Bgr"
 msgstr "Bgr"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:100
 msgid "Bhu"
 msgstr "Bhu"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:101
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:102
 msgid "Biblical Hebrew (Tiro)"
 msgstr "Biblisk hebreisk (Tiro)"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:103
 msgid "Bih"
 msgstr "Bih"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:104
 msgid "Blr"
 msgstr "Blr"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:105
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnien och Herzegovina"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Båda Alt-tangenterna tillsammans"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Båda Ctrl-tangenterna tillsammans"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Båda Skift-tangenterna tillsammans"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:109
 msgid "Bra"
 msgstr "Bra"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:110
 msgid "Braille"
 msgstr "Braille"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:111
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:112
 msgid "Breton"
 msgstr "Breton"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:113
 msgid "Brl"
 msgstr "Brl"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:114
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internettangentbord"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:115
 msgid "Buckwalter"
 msgstr "Buckwalter"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:116
 msgid "Bulgaria"
 msgstr "Bulgarien"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:117
 msgid "CRULP"
 msgstr "CRULP"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:118
 msgid "Cambodia"
 msgstr "Cambodia"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:119
 msgid "Can"
 msgstr "Can"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:120
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:121
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:122
 msgid "CapsLock"
 msgstr "CapsLock"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:123
 msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
 msgstr "CapsLock (till första layouten), Skift+CapsLock (till sista layouten)"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:124
 msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
 msgstr "CapsLock (när den trycks ned), Alt+CapsLock gör ursprunglig capslock-åtgärd"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:125
 msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
 msgstr "CapsLock fungerar som Skift med låsning. Skift \"pausar\" CapsLock"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:126
 msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
 msgstr "CapsLock fungerar som Skift med låsning. Skift påverkar inte CapsLock"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:127
 msgid "CapsLock is disabled"
 msgstr "CapsLock är inaktiverad"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:128
 msgid "CapsLock key behavior"
 msgstr "Beteende för CapsLock-tangenten"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:129
 msgid "CapsLock toggles Shift so all keys are affected"
 msgstr "CapsLock växlar Skift så alla tangenter påverkas"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:130
 msgid "CapsLock toggles normal capitalization of alphabetic characters"
 msgstr "CapsLock växlar normalt skiftläge på alfabetiska tecken"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:131
 msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
 msgstr "CapsLock använder intern skiftlägesstyrning. Skift \"pausar\" CapsLock"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:132
 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:134
+#: ../rules/base.xml.in.h:133
 msgid "Catalan variant with middle-dot L"
 msgstr "Katalansk variant med mittenpunkts L"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:134
 msgid "Cedilla"
 msgstr "Cedilj"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:135
 msgid "Che"
 msgstr "Che"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:136
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:137
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:138
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:139
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (alternativ)"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:140
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-hubb"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:141
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:142
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:143
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:144
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internettangentbord"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:145
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:146
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:147
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:148
 msgid "China"
 msgstr "Kina"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:149
 msgid "Chuvash"
 msgstr "Tjuvasjiska"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:150
 msgid "Chuvash Latin"
 msgstr "Tjuvasjiska latin"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:151
 msgid "Classic"
 msgstr "Klassisk"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:152
 msgid "Classic Dvorak"
 msgstr "Klassisk Dvorak"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:153
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:154
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:155
 msgid "Colemak"
 msgstr "Colemak"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:156
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access-tangentbord"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internettangentbord (13 tangenter)"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internettangentbord (18 tangenter)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internettangentbord (7 tangenter)"
 
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:160
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq-tangentbord"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:161
 msgid "Compose key position"
 msgstr "Position för Compose-tangenten"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:162
 msgid "Congo, Democratic Republic of the"
 msgstr "Kongo, Demokratiska republiken"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Backsteg"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:164
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "Control är mappad till Win-tangenterna, Alt-tangenten är mappad till Win-tangenterna"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:165
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "Control är mappad till Win-tangenterna (och de vanliga Ctrl-tangenterna)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Dobruca-1 Q)"
 msgstr "Krimtatariska (Dobruca-1 Q)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Dobruca-2 Q)"
 msgstr "Krimtatariska (Dobruca-2 Q)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Krimtatariska (Turkiska Alt-Q)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:170
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Krimtatariska (Turkiska F)"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:171
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Krimtatariska (Turkiska Q)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:172
 msgid "Croatia"
 msgstr "Kroatien"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:173
 msgid "Ctrl key position"
 msgstr "Position för Ctrl-tangenten"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:174
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Skift"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:175
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:176
 msgid "Cyrillic with guillemets"
 msgstr "Kyrillisk med gåsögon"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:177
 msgid "Cyrillic, Z and ZHE swapped"
 msgstr "Kyrillisk, Z och ZHE utbytta"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:178
 msgid "Cze"
 msgstr "Cze"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:179
 msgid "Czechia"
 msgstr "Tjeckien"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:180
 msgid "DOS"
 msgstr "DOS"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:181
 msgid "DRC"
 msgstr "DRC"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:182
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:183
 msgid "Dan"
 msgstr "Dan"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:184
 msgid "Dead acute"
 msgstr "Stum akut accent"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:185
 msgid "Dead grave acute"
 msgstr "Stum grav och akut accent"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:186
 msgid "Default numeric keypad keys"
 msgstr "Standardtangenter för numeriskt tangentbord"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:187
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:188
 msgid "Dell 101-key PC"
 msgstr "Dell 101-tangenters PC"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:189
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Bärbar Dell Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:190
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Bärbar Dell Precision M series"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:191
 msgid "Dell Latitude series laptop"
 msgstr "Bärbar Dell Latitude-serien"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:192
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:193
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:194
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:195
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB-multimediatangentbord"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:196
 msgid "Denmark"
 msgstr "Danmark"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:197
 msgid "Deu"
 msgstr "Deu"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:198
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa trådlöst skrivbordstangentbord"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:199
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801/9802-serien"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:200
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:201
 msgid "Dvorak (UK Punctuation)"
 msgstr "Dvorak (brittisk-engelska skiljetecken)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:202
 msgid "Dvorak international"
 msgstr "Dvorak internationell"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:203
 msgid "Dvorak, Polish quotes on key 1"
 msgstr "Dvorak, polska citattecken på tangent 1"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:204
 msgid "Dvorak, Polish quotes on quotemark key"
 msgstr "Dvorak, polska citattecken på citattangent"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:205
 msgid "E"
 msgstr "E"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:206
 msgid "Eastern"
 msgstr "Östlig"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:207
 msgid "Eliminate dead keys"
 msgstr "Eliminera stumma tangenter"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:208
 msgid "Enable extra typographic characters"
 msgstr "Aktivera extra typografiska tecken"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:209
 msgid "English"
 msgstr "Engelsk"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:210
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:211
 msgid "Enter on keypad"
 msgstr "Enter på numeriskt tangentbord"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:212
 msgid "Epo"
 msgstr "Epo"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:213
 msgid "Ergonomic"
 msgstr "Ergonomisk"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:214
 msgid "Esp"
 msgstr "Esp"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:215
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:216
 msgid "Est"
 msgstr "Est"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:217
 msgid "Estonia"
 msgstr "Estland"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:218
 msgid "Eth"
 msgstr "Eth"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:219
 msgid "Ethiopia"
 msgstr "Etiopien"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:220
 msgid "Evdev-managed keyboard"
 msgstr "Evdev-hanterat tangentbord"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:221
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:222
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:223
 msgid "Extended"
 msgstr "Utökad"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:224
 msgid "Extended - Winkeys"
 msgstr "Utökat - Windows-tangenter"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:225
 msgid "Extended Backslash"
 msgstr "Utökat omvänt snedstreck"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:226
 msgid "F-letter (F) variant"
 msgstr "F-bokstavs (F) variant"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:227
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:228
 msgid "Fao"
 msgstr "Fao"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:229
 msgid "Faroe Islands"
 msgstr "Färöarna"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:230
 msgid "Fin"
 msgstr "Fin"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:231
 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:235
+#: ../rules/base.xml.in.h:234
 msgid "Four-level key with abstract separators"
 msgstr "Fjärdenivåstangent med abstrakta avgränsare"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:235
 msgid "Four-level key with comma"
 msgstr "Fjärdenivåstangent med komma"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:236
 msgid "Four-level key with dot"
 msgstr "Fjärdenivåstangent med punkt"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:237
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Fjärdenivåstangent med punkt, latin-9-begränsning"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:238
 msgid "Four-level key with momayyez"
 msgstr "Fjärdenivåstangent med momayyez"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:239
 msgid "Fra"
 msgstr "Fra"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:240
 msgid "France"
 msgstr "Frankrike"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:241
 msgid "French"
 msgstr "Fransk"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:242
 msgid "French (Macintosh)"
 msgstr "Fransk (Macintosh)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:243
 msgid "French (legacy)"
 msgstr "Fransk (äldre)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:244
 msgid "French Dvorak"
 msgstr "Fransk Dvorak"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:245
 msgid "French, Sun dead keys"
 msgstr "Fransk, Sun stumma tangenter"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:246
 msgid "French, eliminate dead keys"
 msgstr "Fransk, eliminera stumma tangenter"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:247
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO bärbar dator"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:248
 msgid "Fula"
 msgstr "Fula"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:249
 msgid "GBr"
 msgstr "GBr"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:250
 msgid "Ga"
 msgstr "Ga"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:251
 msgid "Generic 101-key PC"
 msgstr "Allmän 101-tangenters PC"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:252
 msgid "Generic 102-key (Intl) PC"
 msgstr "Allmän 102-tangenters (internationell) PC"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:253
 msgid "Generic 104-key PC"
 msgstr "Allmän 104-tangenters PC"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:254
 msgid "Generic 105-key (Intl) PC"
 msgstr "Allmän 105-tangenters (internationell) PC"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:255
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:256
 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:258
+#: ../rules/base.xml.in.h:257
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:258
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:259
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:260
 msgid "Geo"
 msgstr "Geo"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:261
 msgid "Georgia"
 msgstr "Georgien"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:262
 msgid "Georgian"
 msgstr "Georgisk"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:263
 msgid "Georgian AZERTY Tskapo"
 msgstr "Georgian AZERTY Tskapo"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:264
 msgid "German (Macintosh)"
 msgstr "Tysk (Macintosh)"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:265
 msgid "German, Sun dead keys"
 msgstr "Tysk, Sun stumma tangenter"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:266
 msgid "German, eliminate dead keys"
 msgstr "Tysk, eliminera stumma tangenter"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:267
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:268
 msgid "Gha"
 msgstr "Gha"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:269
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:270
 msgid "Gre"
 msgstr "Gre"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:271
 msgid "Greece"
 msgstr "Grekland"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:272
 msgid "Group toggle on multiply/divide key"
 msgstr "Gruppväxling på multiplicera/dividera-tangent"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:273
 msgid "Gui"
 msgstr "Gui"
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:274
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:275
 msgid "Gujarati"
 msgstr "Gujaratisk"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:276
 msgid "Gurmukhi"
 msgstr "Gurmukhisk"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:277
 msgid "Gurmukhi Jhelum"
 msgstr "Gurmukhi Jhelum"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:278
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:279
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking-tangentbord"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:280
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Happy Hacking-tangentbord för Mac"
 
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:281
 msgid "Hausa"
 msgstr "Hausa"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:282
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internettangentbord"
 
+#: ../rules/base.xml.in.h:283
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Bärbar Hewlett-Packard Mini 110"
+
 #: ../rules/base.xml.in.h:284
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
@@ -1239,295 +1239,295 @@ msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:308
-msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-
-#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:309
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:310
 msgid "ISO Alternate"
 msgstr "ISO-alternativ"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:311
 msgid "Iceland"
 msgstr "Island"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:312
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:313
 msgid "Include dead tilde"
 msgstr "Inkludera dött tilde-tecken"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:314
 msgid "Ind"
 msgstr "Ind"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:315
 msgid "India"
 msgstr "Indien"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:316
 msgid "International (AltGr dead keys)"
 msgstr "Internationell (AltGr med stumma tangenter)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:317
 msgid "International (with dead keys)"
 msgstr "Internationell (med stumma tangenter)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:318
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:319
 msgid "Iran"
 msgstr "Iran"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:320
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:321
 msgid "Ireland"
 msgstr "Irland"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:322
 msgid "Irl"
 msgstr "Irl"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:323
 msgid "Irn"
 msgstr "Irn"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:324
 msgid "Irq"
 msgstr "Irk"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:325
 msgid "Isl"
 msgstr "Isl"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:326
 msgid "Isr"
 msgstr "Isr"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:327
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:328
 msgid "Ita"
 msgstr "Ita"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:329
 msgid "Italy"
 msgstr "Italien"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:330
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:331
 msgid "Japan (PC-98xx Series)"
 msgstr "Japan (PC-98xx-serien)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:332
 msgid "Japanese keyboard options"
 msgstr "Tangentbordsalternativ för japanska"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:333
 msgid "Jpn"
 msgstr "Jpn"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:334
 msgid "Kalmyk"
 msgstr "Kalmyk"
 
 # Även kanaresisk (äldre form)
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:335
 msgid "Kana"
 msgstr "Kana"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:336
 msgid "Kana Lock key is locking"
 msgstr "Kana Lock-tangent låser"
 
 # Även kanaresisk (äldre form)
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:337
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:338
 msgid "Kashubian"
 msgstr "Kashubian"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:339
 msgid "Kaz"
 msgstr "Kaz"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:340
 msgid "Kazakh with Russian"
 msgstr "Kazakisk med ryska"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:341
 msgid "Kazakhstan"
 msgstr "Kazakstan"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:342
 msgid "Key sequence to kill the X server"
 msgstr "Tangentsekvens för att döda X-servern"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:343
 msgid "Key to choose 3rd level"
 msgstr "Tangent för att välja tredje nivå"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:344
 msgid "Key(s) to change layout"
 msgstr "Tangent(er) för att byta layout"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:345
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:346
 msgid "Kgz"
 msgstr "Kgz"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:347
 msgid "Khm"
 msgstr "Khm"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:348
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:349
 msgid "Kor"
 msgstr "Kor"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:350
 msgid "Korea, Republic of"
 msgstr "Korea, Republiken"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:351
 msgid "Ktunaxa"
 msgstr "Ktunaxa"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:352
 msgid "Kurdish, (F)"
 msgstr "Kurdisk, (F)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:353
 msgid "Kurdish, Arabic-Latin"
 msgstr "Kurdisk, Arabisk-Latin"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:354
 msgid "Kurdish, Latin Alt-Q"
 msgstr "Kurdisk, Latin Alt-Q"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:355
 msgid "Kurdish, Latin Q"
 msgstr "Kurdisk, Latin Q"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:356
 msgid "Kyrgyzstan"
 msgstr "Kirgizistan"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:357
 msgid "LAm"
 msgstr "LAm"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:358
 msgid "LEKP"
 msgstr "LEKP"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:359
 msgid "LEKPa"
 msgstr "LEKPa"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:360
 msgid "Lao"
 msgstr "Lao"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:361
 msgid "Laos"
 msgstr "Laos"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:362
 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:364
+#: ../rules/base.xml.in.h:363
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Internettangentbord för bärbar Compaq-dator (t.ex. Presario)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:364
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Bärbar eMachines m68xx"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:365
 msgid "Latin"
 msgstr "Latin"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:366
 msgid "Latin American"
 msgstr "Latin Amerikansk"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:367
 msgid "Latin Unicode"
 msgstr "Latin Unicode"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:368
 msgid "Latin Unicode qwerty"
 msgstr "Latin Unicode qwerty"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:369
 msgid "Latin qwerty"
 msgstr "Latin qwerty"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:370
 msgid "Latin unicode"
 msgstr "Latin unicode"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:371
 msgid "Latin unicode qwerty"
 msgstr "Latin unicode qwerty"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:372
 msgid "Latin with guillemets"
 msgstr "Latin med gåsögon"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:373
 msgid "Latvia"
 msgstr "Lettland"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:374
 msgid "Lav"
 msgstr "Lav"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:375
 msgid "Left Alt"
 msgstr "Vänster alt"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:376
 msgid "Left Alt (while pressed)"
 msgstr "Vänster Alt (då den trycks ned)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:377
 msgid "Left Alt is swapped with Left Win"
 msgstr "Vänster Alt är utbytt med vänster Win-tangent"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:378
 msgid "Left Ctrl"
 msgstr "Vänster Ctrl"
 
+#: ../rules/base.xml.in.h:379
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr "Vänster Ctrl (till första layouten), Höger Ctrl (till sista layouten)"
+
 #: ../rules/base.xml.in.h:380
 msgid "Left Ctrl+Left Shift"
 msgstr "Vänster ctrl+vänster skift"
@@ -2163,608 +2163,616 @@ msgid "Right Ctrl as Right Alt"
 msgstr "Höger Ctrl-tangent fungerar som höger Alt"
 
 #: ../rules/base.xml.in.h:539
+msgid "Right Ctrl+Right Shift"
+msgstr "Höger Ctrl + höger Skift"
+
+#: ../rules/base.xml.in.h:540
 msgid "Right Shift"
 msgstr "Höger skift"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:541
 msgid "Right Win"
 msgstr "Höger Win-tangent"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:542
 msgid "Right Win (while pressed)"
 msgstr "Höger Win-tangent (då den trycks ned)"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:543
 msgid "Right hand"
 msgstr "Högerhänt"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:544
 msgid "Right handed Dvorak"
 msgstr "Högerhänt Dvorak"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:545
 msgid "Romania"
 msgstr "Rumänien"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:546
 msgid "Romanian keyboard with German letters"
 msgstr "Rumänskt tangentbord med tyska bokstäver"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:547
 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:547
+#: ../rules/base.xml.in.h:548
 msgid "Rou"
 msgstr "Rou"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:549
 msgid "Rus"
 msgstr "Rus"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:550
 msgid "Russia"
 msgstr "Ryssland"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:551
 msgid "Russian"
 msgstr "Rysk"
 
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:552
 msgid "Russian phonetic"
 msgstr "Rysk fonetiskt"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:553
 msgid "Russian phonetic Dvorak"
 msgstr "Rysk fonetisk dvorak"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:554
 msgid "Russian phonetic, eliminate dead keys"
 msgstr "Rysk fonetiskt, eliminera stumma tangenter"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:555
 msgid "Russian with Kazakh"
 msgstr "Ryska med kazakiska"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:556
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:557
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:558
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:559
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:560
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:560 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:561 ../rules/base.extras.xml.in.h:7
 msgid "SRB"
 msgstr "SRB"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:562
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:563
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:564
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:565
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:566
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:567
 msgid "ScrollLock"
 msgstr "ScrollLock"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:568
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:569
 msgid "Semi-colon on third level"
 msgstr "Semikolon på tredje nivå"
 
-#: ../rules/base.xml.in.h:569 ../rules/base.extras.xml.in.h:8
+#: ../rules/base.xml.in.h:570 ../rules/base.extras.xml.in.h:8
 msgid "Serbia"
 msgstr "Serbien"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:571
 msgid "Shift cancels CapsLock"
 msgstr "Skift avbryter CapsLock"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:572
 msgid "Shift does not cancel NumLock, chooses 3d level instead"
 msgstr "Skift avbryter inte NumLock, väljer tredje nivån istället"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:573
 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:573
+#: ../rules/base.xml.in.h:574
 msgid "Shift+CapsLock"
 msgstr "Skift+CapsLock"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:575
 msgid "Simple"
 msgstr "Enkel"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:576
 msgid "Slovakia"
 msgstr "Slovakien"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:577
 msgid "Slovenia"
 msgstr "Slovenien"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:578
 msgid "South Africa"
 msgstr "Sydafrika"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:579
 msgid "Southern Uzbek"
 msgstr "Södra Uzbekistan"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:580
 msgid "Spain"
 msgstr "Spanien"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:581
 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:581
+#: ../rules/base.xml.in.h:582
 msgid "SrL"
 msgstr "SrL"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:583
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:584
 msgid "Standard"
 msgstr "Standard"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:585
 msgid "Standard (Cedilla)"
 msgstr "Standard (Cedilj)"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:587
 msgid "Standard RSTU"
 msgstr "Standard RSTU"
 
 #. RSTU 2019-91
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:589
 msgid "Standard RSTU on Russian layout"
 msgstr "Standard RSTU på rysk layout"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:590
 msgid "Sun Type 5/6"
 msgstr "Sun Type 5/6"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:591
 msgid "Sun dead keys"
 msgstr "Sun stumma tangenter"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:592
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:593
 msgid "Svdvorak"
 msgstr "Svdvorak"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:594
 msgid "Svk"
 msgstr "Svk"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:595
 msgid "Svn"
 msgstr "Svn"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:596
 msgid "Swap Ctrl and CapsLock"
 msgstr "Byt Ctrl och CapsLock"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:597
 msgid "Swap ESC and CapsLock"
 msgstr "Byt ESC och CapsLock"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:598
 msgid "Swe"
 msgstr "Swe"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:599
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:600
 msgid "Switzerland"
 msgstr "Schweiz"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:601
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:602
 msgid "Syr"
 msgstr "Syr"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:603
 msgid "Syria"
 msgstr "Syrien"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:604
 msgid "Syriac"
 msgstr "Syrisk"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:605
 msgid "Syriac phonetic"
 msgstr "Syrisk fonetisk"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:606
 msgid "TIS-820.2538"
 msgstr "TIS-820.2538"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:607
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:608
 msgid "Tamil"
 msgstr "Tamilsk"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:609
 msgid "Tamil TAB Typewriter"
 msgstr "Tamil TAB Typewriter"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:610
 msgid "Tamil TSCII Typewriter"
 msgstr "Tamil TSCII Typewriter"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:611
 msgid "Tamil Unicode"
 msgstr "Tamilisk Unicode"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:612
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:613
 msgid "Tatar"
 msgstr "Tatar"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:614
 msgid "Telugu"
 msgstr "Telugo"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:615
 msgid "Tha"
 msgstr "Tha"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:616
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:617
 msgid "Tibetan"
 msgstr "Tibetisk"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:618
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibetisk (med ASCII-taltecken)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:619
 msgid "Tifinagh"
 msgstr "Tifinagh"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:620
 msgid "Tifinagh Alternative"
 msgstr "Tifinagh alternativ"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:621
 msgid "Tifinagh Alternative Phonetic"
 msgstr "Tifinagh alternativ fonetisk"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:622
 msgid "Tifinagh Extended"
 msgstr "Tifinagh utökad"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:623
 msgid "Tifinagh Extended Phonetic"
 msgstr "Tifinagh utökad fonetisk"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:624
 msgid "Tifinagh Phonetic"
 msgstr "Tifinagh fonetisk"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:625
 msgid "Tilde (~) variant"
 msgstr "Tilde (~) variant"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:626
 msgid "Tjk"
 msgstr "Tjk"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:627
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Till motsvarande tangent på ett Dvorak-tangentbord."
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:628
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Till motsvarande tangent på ett Qwerty-tangentbord."
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:629
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:630
 msgid "Traditional phonetic"
 msgstr "Traditionell fonetisk"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:631
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access-tangentbord"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:632
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:633
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:634
 msgid "Tur"
 msgstr "Tur"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:635
 msgid "Turkey"
 msgstr "Turkiet"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:636
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:637
 msgid "Typewriter"
 msgstr "Skrivmaskin"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:638
+msgid "Typewriter, legacy"
+msgstr "Skrivmaskin, äldre"
+
+#: ../rules/base.xml.in.h:639
 msgid "UCW layout (accented letters only)"
 msgstr "UCW-layout (endast bokstäver med accenter)"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:640
 msgid "US keyboard with Bosnian digraphs"
 msgstr "USA-tangentbord med bosniska digrafer"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:641
 msgid "US keyboard with Bosnian letters"
 msgstr "USA-tangentbord med bosniska bokstäver"
 
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:642
 msgid "US keyboard with Croatian digraphs"
 msgstr "USA-tangentbord med kroatiska digrafer"
 
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:643
 msgid "US keyboard with Croatian letters"
 msgstr "USA-tangentbord med kroatiska bokstäver"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:644
 msgid "US keyboard with Estonian letters"
 msgstr "USA-tangentbord med estniska bokstäver"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:645
 msgid "US keyboard with Italian letters"
 msgstr "USA-tangentbord med italienska bokstäver"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:646
 msgid "US keyboard with Lithuanian letters"
 msgstr "USA-tangentbord med litauiska bokstäver"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:647
 msgid "US keyboard with Slovenian letters"
 msgstr "USA-tangentbord med slovenska bokstäver"
 
-#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:9
+#: ../rules/base.xml.in.h:648 ../rules/base.extras.xml.in.h:9
 msgid "USA"
 msgstr "USA"
 
-#: ../rules/base.xml.in.h:647
+#: ../rules/base.xml.in.h:649
 msgid "Udmurt"
 msgstr "Udmurt"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:650
 msgid "Ukr"
 msgstr "Ukr"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:651
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:652
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Unicode-tillägg (pilar och matematikoperatorer)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:653
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Unicode-tillägg (pilar och matematikoperatorer). Matematikoperatorer på standardnivå"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:654
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:655
 msgid "United Kingdom"
 msgstr "Storbritannien"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:656
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:655
+#: ../rules/base.xml.in.h:657
 msgid "Urdu, Alternative phonetic"
 msgstr "Urdu, alternativ fonetisk"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:658
 msgid "Urdu, Phonetic"
 msgstr "Urdu, fonetisk"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:659
 msgid "Urdu, Winkeys"
 msgstr "Urdu, Win-tangenter"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:660
 msgid "Use Bosnian digraphs"
 msgstr "Använd bosniska digrafer"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:661
 msgid "Use Croatian digraphs"
 msgstr "Använd kroatiska digrafer"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:662
 msgid "Use guillemets for quotes"
 msgstr "Använd gåsögon för citattecken"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:663
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Använd tangentbordslampa för att visa alternativ layout"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:664
 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:663
+#: ../rules/base.xml.in.h:665
 msgid "Usual space at any level"
 msgstr "Vanligt blanksteg på alla nivåer"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:666
 msgid "Uzb"
 msgstr "Uzb"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:667
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:668
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:669
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 internettangentbord"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:670
 msgid "Vnm"
 msgstr "Vnm"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:671
 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:670
+#: ../rules/base.xml.in.h:672
 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:671
+#: ../rules/base.xml.in.h:673
 msgid "Wang model 724 azerty"
 msgstr "Wang modell 724 azerty"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:674
 msgid "Western"
 msgstr "Västlig"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:675
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:676
 msgid "Winkeys"
 msgstr "Win-tangenter"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:677
 msgid "With &lt;\\|&gt; key"
 msgstr "Med &lt;\\|&gt;-tangent"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:678
 msgid "With EuroSign on 5"
 msgstr "Med eurotecknet till tangenten 5"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:679
 msgid "With guillemets"
 msgstr "Med gåsögon"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:680
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internettangentbord"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:681
 msgid "Yakut"
 msgstr "Jakutiska"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:682
 msgid "Yoruba"
 msgstr "Yoruba"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:683
 msgid "Z and ZHE swapped"
 msgstr "Z och ZHE utbytta"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:684
 msgid "Zar"
 msgstr "Zar"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:685
 msgid "azerty"
 msgstr "azerty"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:686
 msgid "azerty/digits"
 msgstr "azerty/siffror"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:687
 msgid "digits"
 msgstr "siffror"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:688
 msgid "displaced semicolon and quote (obsolete)"
 msgstr "flyttat semikolon och citattecken (föråldrat)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:689
 msgid "lyx"
 msgstr "lyx"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:690
 msgid "qwerty"
 msgstr "qwerty"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:691
 msgid "qwerty, extended Backslash"
 msgstr "qwerty, utökat omvänt snedstreck"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:692
 msgid "qwerty/digits"
 msgstr "qwerty/siffror"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:693
 msgid "qwertz"
 msgstr "qwertz"
 
@@ -2792,6 +2800,12 @@ msgstr "Internationell (AltGr med kombinerad Unicode)"
 msgid "International (AltGr Unicode combining, alternative)"
 msgstr "Internationell (AltGr med kombinerad Unicode, alternativ)"
 
+#~ msgid "Baltic+"
+#~ msgstr "Baltisk+"
+
+#~ msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+#~ msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
 #~ msgid "Keypad"
 #~ msgstr "Knappsats"
 
diff --git a/xorg-server/xkbdata.src/po/zh_CN.po b/xorg-server/xkbdata.src/po/zh_CN.po
index c249e207c..cacbf435c 100644
--- a/xorg-server/xkbdata.src/po/zh_CN.po
+++ b/xorg-server/xkbdata.src/po/zh_CN.po
@@ -9,7 +9,7 @@ msgstr ""
 "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"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/xorg-server/xkbdata.src/rules/Makefile.in b/xorg-server/xkbdata.src/rules/Makefile.in
index 583a1ce8f..1af7ed573 100644
--- a/xorg-server/xkbdata.src/rules/Makefile.in
+++ b/xorg-server/xkbdata.src/rules/Makefile.in
@@ -118,6 +118,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -353,9 +354,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  rules/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  rules/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  rules/Makefile
+	  $(AUTOMAKE) --foreign  rules/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/rules/base.lists.part b/xorg-server/xkbdata.src/rules/base.lists.part
index d1927c537..27f081f8a 100644
--- a/xorg-server/xkbdata.src/rules/base.lists.part
+++ b/xorg-server/xkbdata.src/rules/base.lists.part
@@ -11,6 +11,9 @@
 // Microsoft models (using MS geometry)
 ! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose
 
+// Nokia devices and keyboards
+! $nokiamodels = nokiasu8w nokiarx44 nokiarx51
+
 // PC geometries - they have special geometry but symbols are mostly pc105
 ! $pcgeometries = latitude
 
@@ -24,7 +27,7 @@
 ! $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
+! $macvendorlayouts = ch de dk fi fr gb is it latam nl no pt se us
 
 ! $azerty = be fr
 ! $qwertz = al cz de hr hu ro si sk 
@@ -66,7 +69,7 @@
               silvercrest \
               sk1300 sk2500 sk6200 sk7100 \
               sven sven303 symplon \
-              toshiba_s3000 trust trustda \
+              tm2030USB toshiba_s3000 trust trustda \
               unitekkb1925 yahoo
 
 // all layouts with 3rd and 4th groups
diff --git a/xorg-server/xkbdata.src/rules/base.m_g.part b/xorg-server/xkbdata.src/rules/base.m_g.part
index a925bfa8d..2ee139d20 100644
--- a/xorg-server/xkbdata.src/rules/base.m_g.part
+++ b/xorg-server/xkbdata.src/rules/base.m_g.part
@@ -5,6 +5,8 @@
   latitude	=	dell(latitude)
   flexpro	=	keytronic(FlexPro)
   hp6000	=	hp(omnibook)
+  hpmini110	=	hp(mini110)
+  hpdv5		=	hp(dv5)
   omnikey101	=	northgate(omnikey101)
  $pcmodels	=	pc(%m)
  $pcgeometries	=	pc(%m)
@@ -19,4 +21,5 @@
  $macs		=	macintosh(macintosh)
   hhk		=	hhk(basic)
   kinesis	=	kinesis(model100)
+ $nokiamodels	=	nokia(%m)
   *		=       pc(pc104)
diff --git a/xorg-server/xkbdata.src/rules/base.m_k.part b/xorg-server/xkbdata.src/rules/base.m_k.part
index 30534f715..dd0c391d6 100644
--- a/xorg-server/xkbdata.src/rules/base.m_k.part
+++ b/xorg-server/xkbdata.src/rules/base.m_k.part
@@ -6,6 +6,7 @@
   sun6euro	=	sun(type6tuv_usb)
   pc98		=	xfree98(pc98)
   evdev		=	evdev
+ $nokiamodels	=	evdev
   olpc		=	evdev
   macintosh_hhk	=	macintosh(hhk)
   macintosh_old	=	macintosh(old)
diff --git a/xorg-server/xkbdata.src/rules/base.m_s.part b/xorg-server/xkbdata.src/rules/base.m_s.part
index 13621e79c..a032e0a8f 100644
--- a/xorg-server/xkbdata.src/rules/base.m_s.part
+++ b/xorg-server/xkbdata.src/rules/base.m_s.part
@@ -42,6 +42,8 @@
   targa_v811    =       +inet(media_nav_acpi_common)
   thinkpad      =       +inet(media_nav_common)
   thinkpadz60   =       +inet(thinkpad60)
+  tm2030USB-102 =       +inet(media_nav_acpi_common)
+  tm2030USB-106 =       +inet(media_nav_acpi_common)
   trust_slimline =      +inet(media_nav_acpi_common)
   vsonku306     =       +inet(microsoftprooem)
   $inetkbds     =       +inet(%m)
diff --git a/xorg-server/xkbdata.src/rules/base.m_t.part b/xorg-server/xkbdata.src/rules/base.m_t.part
index 4548d2694..d67750cce 100644
--- a/xorg-server/xkbdata.src/rules/base.m_t.part
+++ b/xorg-server/xkbdata.src/rules/base.m_t.part
@@ -1,2 +1,3 @@
   $macs		=	complete+numpad(mac)
+  $nokiamodels	=	complete+nokia
   *		=	complete
diff --git a/xorg-server/xkbdata.src/rules/base.ml1_s.part b/xorg-server/xkbdata.src/rules/base.ml1_s.part
index 6a0787d21..6d5f57004 100644
--- a/xorg-server/xkbdata.src/rules/base.ml1_s.part
+++ b/xorg-server/xkbdata.src/rules/base.ml1_s.part
@@ -6,5 +6,7 @@
   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])
+  nokiarx51	cz(qwerty)		=	nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty)
+  nokiarx51	*			=	nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l[1]%_v[1])
  $thinkpads	br			=	pc+%l[1](thinkpad)
   *		*			=	pc+%l[1]%(v[1])
diff --git a/xorg-server/xkbdata.src/rules/base.ml_s.part b/xorg-server/xkbdata.src/rules/base.ml_s.part
index c5fed0bed..1c16b6b7a 100644
--- a/xorg-server/xkbdata.src/rules/base.ml_s.part
+++ b/xorg-server/xkbdata.src/rules/base.ml_s.part
@@ -21,6 +21,10 @@
   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
  $macs		en_US			=	pc+macintosh_vndr/us(extended)
  $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
+  nokiarx44	*			=	nokia_vndr/rx-44(%l)
+  nokiarx51	cz(qwerty)		=	nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty)
+  nokiarx51	*			=	nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l%_v)
+  nokiasu8w	*			=	nokia_vndr/su-8w(%l)
   olpc		$olpclayouts		=	olpc+%l%(m)
   olpc		*			=	olpc+%l%(v)
  $thinkpads   	br			=	pc+br(thinkpad)
diff --git a/xorg-server/xkbdata.src/rules/base.mlv_s.part b/xorg-server/xkbdata.src/rules/base.mlv_s.part
index df4eef24d..1eecc55c0 100644
--- a/xorg-server/xkbdata.src/rules/base.mlv_s.part
+++ b/xorg-server/xkbdata.src/rules/base.mlv_s.part
@@ -1,3 +1,4 @@
   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)
+  nokiarx51	cz		qwerty		=	nokia_vndr/rx-51(cz_qwerty)
diff --git a/xorg-server/xkbdata.src/rules/base.o_s.part b/xorg-server/xkbdata.src/rules/base.o_s.part
index f9290dae7..47bfa004f 100644
--- a/xorg-server/xkbdata.src/rules/base.o_s.part
+++ b/xorg-server/xkbdata.src/rules/base.o_s.part
@@ -18,6 +18,7 @@
   grp:alts_toggle	=	+group(alts_toggle)
   grp:ctrl_shift_toggle	=	+group(ctrl_shift_toggle)
   grp:lctrl_lshift_toggle	=	+group(lctrl_lshift_toggle)
+  grp:rctrl_rshift_toggle	=	+group(rctrl_rshift_toggle)
   grp:caps_toggle	=	+capslock(grouplock)
   grp:caps_switch       =       +capslock(groupshift)
   grp:shift_caps_toggle	=	+group(shift_caps_toggle)
@@ -37,6 +38,7 @@
   grp:rctrl_toggle	=	+group(rctrl_toggle)
   grp:lalt_toggle	=	+group(lalt_toggle)
   grp:sclk_toggle	=	+group(sclk_toggle)
+  grp:lctrl_rctrl_switch	=	+group(lctrl_rctrl_switch)
   lv3:switch		=	+level3(switch)
   lv3:ralt_switch	=	+level3(ralt_switch)
   lv3:ralt_switch_multikey	=	+level3(ralt_switch_multikey)
@@ -66,6 +68,7 @@
   compose:lwin		=	+compose(lwin)
   compose:rwin		=	+compose(rwin)
   compose:menu		=	+compose(menu)
+  compose:lctrl		=	+compose(lctrl)
   compose:rctrl		=	+compose(rctrl)
   compose:caps		=	+compose(caps)
   compose:102		=	+compose(102)
diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in
index f43e651bb..24bfc2d6c 100644
--- a/xorg-server/xkbdata.src/rules/base.xml.in
+++ b/xorg-server/xkbdata.src/rules/base.xml.in
@@ -554,6 +554,13 @@
     </model>
     <model>
       <configItem>
+        <name>hpmini110</name>
+        <_description>Hewlett-Packard Mini 110 Notebook</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>rapidaccess</name>
         <_description>IBM Rapid Access</_description>
         <vendor>IBM</vendor>
@@ -575,13 +582,6 @@
     </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>
@@ -1277,6 +1277,7 @@
           <configItem>
             <name>rus</name>
             <_description>Russian phonetic</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
           </configItem>
         </variant>
         <variant>
@@ -3018,12 +3019,6 @@
             <_description>LEKPa</_description>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>balticplus</name>
-            <_description>Baltic+</_description>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3250,6 +3245,12 @@
             <languageList><iso639Id>rus</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>dvp</name>
+            <_description>Programmer Dvorak</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3407,6 +3408,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>typewriter-legacy</name>
+            <_description>Typewriter, legacy</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>tt</name>
             <_description>Tatar</_description>
             <languageList><iso639Id>tat</iso639Id></languageList>
@@ -3705,6 +3712,12 @@
       <variantList>
         <variant>
           <configItem>
+            <name>legacy</name>
+            <_description>Legacy</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>de_nodeadkeys</name>
             <_description>German, eliminate dead keys</_description>
           </configItem>
@@ -4408,6 +4421,12 @@
       </option>
       <option>
         <configItem>
+          <name>grp:lctrl_rctrl_switch</name>
+          <_description>Left Ctrl (to first layout), Right Ctrl (to last layout)</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>grp:alt_caps_toggle</name>
           <_description>Alt+CapsLock</_description>
         </configItem>
@@ -4444,6 +4463,12 @@
       </option>
       <option>
         <configItem>
+          <name>grp:rctrl_rshift_toggle</name>
+          <_description>Right Ctrl+Right Shift</_description>
+        </configItem>
+      </option>      
+      <option>
+        <configItem>
           <name>grp:ctrl_alt_toggle</name>
           <_description>Alt+Ctrl</_description>
         </configItem>
@@ -4940,6 +4965,12 @@
       </option>
       <option>
         <configItem>
+          <name>compose:lctrl</name>
+          <_description>Left Ctrl</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>compose:rctrl</name>
           <_description>Right Ctrl</_description>
         </configItem>
diff --git a/xorg-server/xkbdata.src/rules/bin/Makefile.in b/xorg-server/xkbdata.src/rules/bin/Makefile.in
index 097cf8013..6ead57d6c 100644
--- a/xorg-server/xkbdata.src/rules/bin/Makefile.in
+++ b/xorg-server/xkbdata.src/rules/bin/Makefile.in
@@ -95,6 +95,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -174,9 +175,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  rules/bin/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  rules/bin/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  rules/bin/Makefile
+	  $(AUTOMAKE) --foreign  rules/bin/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.in b/xorg-server/xkbdata.src/rules/compat/Makefile.in
index f78214247..ea7160cb4 100644
--- a/xorg-server/xkbdata.src/rules/compat/Makefile.in
+++ b/xorg-server/xkbdata.src/rules/compat/Makefile.in
@@ -97,6 +97,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -186,9 +187,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  rules/compat/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  rules/compat/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  rules/compat/Makefile
+	  $(AUTOMAKE) --foreign  rules/compat/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/rules/evdev.xml.in b/xorg-server/xkbdata.src/rules/evdev.xml.in
index f43e651bb..24bfc2d6c 100644
--- a/xorg-server/xkbdata.src/rules/evdev.xml.in
+++ b/xorg-server/xkbdata.src/rules/evdev.xml.in
@@ -554,6 +554,13 @@
     </model>
     <model>
       <configItem>
+        <name>hpmini110</name>
+        <_description>Hewlett-Packard Mini 110 Notebook</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>rapidaccess</name>
         <_description>IBM Rapid Access</_description>
         <vendor>IBM</vendor>
@@ -575,13 +582,6 @@
     </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>
@@ -1277,6 +1277,7 @@
           <configItem>
             <name>rus</name>
             <_description>Russian phonetic</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
           </configItem>
         </variant>
         <variant>
@@ -3018,12 +3019,6 @@
             <_description>LEKPa</_description>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>balticplus</name>
-            <_description>Baltic+</_description>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3250,6 +3245,12 @@
             <languageList><iso639Id>rus</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>dvp</name>
+            <_description>Programmer Dvorak</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3407,6 +3408,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>typewriter-legacy</name>
+            <_description>Typewriter, legacy</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>tt</name>
             <_description>Tatar</_description>
             <languageList><iso639Id>tat</iso639Id></languageList>
@@ -3705,6 +3712,12 @@
       <variantList>
         <variant>
           <configItem>
+            <name>legacy</name>
+            <_description>Legacy</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>de_nodeadkeys</name>
             <_description>German, eliminate dead keys</_description>
           </configItem>
@@ -4408,6 +4421,12 @@
       </option>
       <option>
         <configItem>
+          <name>grp:lctrl_rctrl_switch</name>
+          <_description>Left Ctrl (to first layout), Right Ctrl (to last layout)</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>grp:alt_caps_toggle</name>
           <_description>Alt+CapsLock</_description>
         </configItem>
@@ -4444,6 +4463,12 @@
       </option>
       <option>
         <configItem>
+          <name>grp:rctrl_rshift_toggle</name>
+          <_description>Right Ctrl+Right Shift</_description>
+        </configItem>
+      </option>      
+      <option>
+        <configItem>
           <name>grp:ctrl_alt_toggle</name>
           <_description>Alt+Ctrl</_description>
         </configItem>
@@ -4940,6 +4965,12 @@
       </option>
       <option>
         <configItem>
+          <name>compose:lctrl</name>
+          <_description>Left Ctrl</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>compose:rctrl</name>
           <_description>Right Ctrl</_description>
         </configItem>
diff --git a/xorg-server/xkbdata.src/rules/extras/Makefile.in b/xorg-server/xkbdata.src/rules/extras/Makefile.in
index 3d3b1e53a..335c9fe3b 100644
--- a/xorg-server/xkbdata.src/rules/extras/Makefile.in
+++ b/xorg-server/xkbdata.src/rules/extras/Makefile.in
@@ -97,6 +97,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -184,9 +185,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  rules/extras/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  rules/extras/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  rules/extras/Makefile
+	  $(AUTOMAKE) --foreign  rules/extras/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/semantics/Makefile.in b/xorg-server/xkbdata.src/semantics/Makefile.in
index c44b79cfe..2ebad20e9 100644
--- a/xorg-server/xkbdata.src/semantics/Makefile.in
+++ b/xorg-server/xkbdata.src/semantics/Makefile.in
@@ -112,6 +112,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -190,9 +191,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  semantics/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  semantics/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  semantics/Makefile
+	  $(AUTOMAKE) --foreign  semantics/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/symbols/Makefile.am b/xorg-server/xkbdata.src/symbols/Makefile.am
index 472a39922..d22d6c39b 100644
--- a/xorg-server/xkbdata.src/symbols/Makefile.am
+++ b/xorg-server/xkbdata.src/symbols/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras
 
 symbolsdir = $(xkb_base)/symbols
 dist_symbols_DATA = \
diff --git a/xorg-server/xkbdata.src/symbols/Makefile.in b/xorg-server/xkbdata.src/symbols/Makefile.in
index 45c080daf..7cac7aa82 100644
--- a/xorg-server/xkbdata.src/symbols/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/Makefile.in
@@ -124,6 +124,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -181,7 +182,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 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 extras
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras
 symbolsdir = $(xkb_base)/symbols
 dist_symbols_DATA = \
 ad af al \
@@ -231,9 +232,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  symbols/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  symbols/Makefile
+	  $(AUTOMAKE) --foreign  symbols/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/symbols/altwin b/xorg-server/xkbdata.src/symbols/altwin
index d0154f2f3..4463fe06c 100644
--- a/xorg-server/xkbdata.src/symbols/altwin
+++ b/xorg-server/xkbdata.src/symbols/altwin
@@ -77,8 +77,7 @@ xkb_symbols "alt_super_win" {
 
 partial modifier_keys 
 xkb_symbols "swap_lalt_lwin" {
-    key <LALT> {	[ 	Super_L			]	};
+    key <LALT> { type[Group1] = "ONE_LEVEL",
+                 symbols[Group1] = [ Super_L ] };
     key <LWIN> {	[	Alt_L,	Meta_L		]	};
-    modifier_map Mod1 { <LWIN> };
-    modifier_map Mod4 { <LALT> };
 };
diff --git a/xorg-server/xkbdata.src/symbols/ch b/xorg-server/xkbdata.src/symbols/ch
index 3a7646f80..a0a2621a9 100644
--- a/xorg-server/xkbdata.src/symbols/ch
+++ b/xorg-server/xkbdata.src/symbols/ch
@@ -16,7 +16,7 @@ xkb_symbols "basic" {
     key <AE04> { [          4,   ccedilla                           ] };
     key <AE05> { [          5,    percent                           ] };
     key <AE06> { [          6,  ampersand,      notsign             ] };
-    key <AE07> { [          7,      slash,    brokenbar             ] };
+    key <AE07> { [          7,      slash,          bar             ] };
     key <AE08> { [          8,  parenleft,         cent             ] };
     key <AE09> { [          9, parenright                           ] };
     key <AE10> { [          0,      equal                           ] };
@@ -42,6 +42,14 @@ xkb_symbols "basic" {
 };
 
 partial alphanumeric_keys 
+xkb_symbols "legacy" {
+    include "ch(basic)"
+
+    name[Group1]= "Switzerland - Legacy";
+    key <AE07> { [          7,      slash,    brokenbar             ] };
+};
+
+partial alphanumeric_keys 
 xkb_symbols "de" {
     include "ch(basic)"
 };
diff --git a/xorg-server/xkbdata.src/symbols/compose b/xorg-server/xkbdata.src/symbols/compose
index 521d93eb9..3bedb3315 100644
--- a/xorg-server/xkbdata.src/symbols/compose
+++ b/xorg-server/xkbdata.src/symbols/compose
@@ -28,6 +28,11 @@ xkb_symbols "rctrl" {
 };
 
 partial modifier_keys
+xkb_symbols "lctrl" {
+    key <LCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
 xkb_symbols "caps" {
     replace key <CAPS> { type="TWO_LEVEL", [ Multi_key, Multi_key ] };
 };
diff --git a/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in
index 6a4f87404..59d530e54 100644
--- a/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -180,9 +181,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/digital_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  symbols/digital_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  symbols/digital_vndr/Makefile
+	  $(AUTOMAKE) --foreign  symbols/digital_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/symbols/extras/Makefile.in b/xorg-server/xkbdata.src/symbols/extras/Makefile.in
index e00e6e91e..8ba3d24d7 100644
--- a/xorg-server/xkbdata.src/symbols/extras/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/extras/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -180,9 +181,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/extras/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  symbols/extras/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  symbols/extras/Makefile
+	  $(AUTOMAKE) --foreign  symbols/extras/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in
index 2680b63b6..ec4357e2b 100644
--- a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/fujitsu_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  symbols/fujitsu_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  symbols/fujitsu_vndr/Makefile
+	  $(AUTOMAKE) --foreign  symbols/fujitsu_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/symbols/group b/xorg-server/xkbdata.src/symbols/group
index 1b23e31c2..f39b05159 100644
--- a/xorg-server/xkbdata.src/symbols/group
+++ b/xorg-server/xkbdata.src/symbols/group
@@ -120,6 +120,19 @@ xkb_symbols "lctrl_lshift_toggle" {
     key <LCTL>	{	[	Control_L,	ISO_Next_Group ]	};
 };
 
+// using the group(rctrl_rshift_toggle) map, pressing:
+//     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 "rctrl_rshift_toggle" {
+    key <RTSH> {
+    type[Group1]="PC_CONTROL_LEVEL2",
+    symbols[Group1]= [ Shift_R, ISO_Next_Group ]
+    };
+    key <RCTL>  {   [   Control_R,  ISO_Next_Group ]    };
+};
+
 // using the group(shift_caps_toggle) map, pressing:
 //     Shift+Caps Lock toggles group
 partial modifier_keys
@@ -155,6 +168,22 @@ xkb_symbols "win_menu_switch" {
     };
 };
 
+// using the group(lctrl_rctrl_switch) map, pressing:
+// Left Control selects the first group
+// Right Control selects the last group
+partial modifier_keys
+xkb_symbols "lctrl_rctrl_switch" {
+    virtual_modifiers AltGr;
+    key <LCTL> {
+        virtualMods= AltGr,
+        symbols[Group1] = [ ISO_First_Group ]
+    };
+    key <RCTL> {
+        virtualMods= AltGr,
+        symbols[Group1] = [ 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
diff --git a/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in
index 61fa05a1d..25b97d2d8 100644
--- a/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/hp_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  symbols/hp_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  symbols/hp_vndr/Makefile
+	  $(AUTOMAKE) --foreign  symbols/hp_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/symbols/inet b/xorg-server/xkbdata.src/symbols/inet
index f6cd6ac91..89e802e98 100644
--- a/xorg-server/xkbdata.src/symbols/inet
+++ b/xorg-server/xkbdata.src/symbols/inet
@@ -32,6 +32,7 @@ xkb_symbols "media_common" {
     key <I2E>   {       [ XF86AudioLowerVolume  ] };	
     key <I30>   {       [ XF86AudioRaiseVolume  ] };
     key <K5A>   {       [ XF86Eject             ] };
+    key <K6C>   {       [ XF86Eject             ] };
 };
 
 // popular web navigation combination
@@ -429,7 +430,6 @@ xkb_symbols "btc9019u" {
     include "inet(media_nav_acpi_common)"
     key <FK17> {	[ XF86Search		]	};
     key <I02>  {	[ XF86HomePage		]	};
-    key <K6C>  {	[ XF86Eject		]	};
 };
 
 // Cherry Blue Line
@@ -1722,7 +1722,6 @@ xkb_symbols "cymotionlinux" {
     key <I3C>	{	[	XF86Cut			]	};
     key <I78>	{	[	XF86Copy		]	};
     key <K65>	{	[	XF86Paste		]	};
-    key <K6C>	{	[	XF86Eject		]	};
     key <K75>	{	[	XF86ScrollUp		]	};
     key <XFER>	{	[	XF86AudioMedia		]	};
 };
diff --git a/xorg-server/xkbdata.src/symbols/lt b/xorg-server/xkbdata.src/symbols/lt
index d535da7d3..5956ace48 100644
--- a/xorg-server/xkbdata.src/symbols/lt
+++ b/xorg-server/xkbdata.src/symbols/lt
@@ -160,9 +160,9 @@ xkb_symbols "ibm" {
     include "level3(ralt_switch)"
 };
 
-// LEKP, LEKPa and Baltic+ layouts 1.0 for Linux.
+// LEKP and LEKPa layouts 1.0
 // Copyright (c) 2007 Tautrimas Pajarskas
-// For more info go to http://lekp.info
+// For more info visit http://lekp.info
 //
 // LEKP and LEKPa layouts are licensed under the Creative Commons
 // Attribution-Noncommercial-Share Alike 3.0 License.
@@ -292,29 +292,3 @@ xkb_symbols "lekpa" {
     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/macintosh_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am
index d409eff93..8a4ca9fc4 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am
@@ -2,7 +2,7 @@ symbolsdir = $(xkb_base)/symbols/macintosh_vndr
 
 dist_symbols_DATA = \
 apple ch de dk \
-es fi fr \
+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
index 801f8ab0d..e4e5eb4e2 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -166,7 +167,7 @@ xkb_rules_symlink = @xkb_rules_symlink@
 symbolsdir = $(xkb_base)/symbols/macintosh_vndr
 dist_symbols_DATA = \
 apple ch de dk \
-es fi fr \
+fi fr \
 gb is it \
 latam nl no pt \
 se us
@@ -183,9 +184,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/macintosh_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  symbols/macintosh_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  symbols/macintosh_vndr/Makefile
+	  $(AUTOMAKE) --foreign  symbols/macintosh_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/es b/xorg-server/xkbdata.src/symbols/macintosh_vndr/es
deleted file mode 100644
index 61f12498f..000000000
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/es
+++ /dev/null
@@ -1,6 +0,0 @@
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-    include "es"
-    name[Group1]= "Spain - Mac";
-};
diff --git a/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in
index 6f96e6797..6a481e118 100644
--- a/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/nec_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  symbols/nec_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  symbols/nec_vndr/Makefile
+	  $(AUTOMAKE) --foreign  symbols/nec_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/symbols/nokia_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/nokia_vndr/Makefile.am
new file mode 100644
index 000000000..71200ec4d
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/nokia_vndr/Makefile.am
@@ -0,0 +1,6 @@
+symbolsdir = $(xkb_base)/symbols/nokia_vndr
+
+dist_symbols_DATA = \
+rx-44 \
+rx-51 \
+su-8w
diff --git a/xorg-server/xkbdata.src/symbols/nokia_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/nokia_vndr/Makefile.in
new file mode 100644
index 000000000..8f508f285
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/nokia_vndr/Makefile.in
@@ -0,0 +1,356 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+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/nokia_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@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+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 = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+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_URL = @PACKAGE_URL@
+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_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+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@
+builddir = @builddir@
+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@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+symbolsdir = $(xkb_base)/symbols/nokia_vndr
+dist_symbols_DATA = \
+rx-44 \
+rx-51 \
+su-8w
+
+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 ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  symbols/nokia_vndr/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  symbols/nokia_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
+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)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    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-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+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
+
+.MAKE: install-am install-strip
+
+.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-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am 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
+
+# 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/nokia_vndr/rx-44 b/xorg-server/xkbdata.src/symbols/nokia_vndr/rx-44
new file mode 100644
index 000000000..515b69eef
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/nokia_vndr/rx-44
@@ -0,0 +1,303 @@
+partial alphanumeric_keys
+xkb_symbols "us" {
+    name[Group1] = "U.S. English";
+    
+    include "nokia_vndr/rx-44(base)"
+
+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
+    key <AC03>	{	[	d,		D,		at,		at		]	};
+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
+    key <AC05>	{	[	g,		G,		backslash,	backslash	]	};
+    key <AC06>	{	[	h,		H,		slash,		slash		]	};
+    key <AC07>	{	[	j,		J,		parenleft,	parenleft	]	};
+    key <AC08>	{	[	k,		K,		parenright,	parenright	]	};
+    key <AC09>	{	[	l,		L,		asterisk,	asterisk	]	};
+    key <AC11>  {       [       apostrophe,     question,       question,	question	]	};
+
+    key <AB01>	{	[	z,		Z,		yen,		yen		]	};
+    key <AB02>	{	[	x,		X,		asciicircum,	asciicircum	]	};
+    key <AB03>	{	[	c,		C,		asciitilde,	asciitilde	]	};
+    key <AB04>	{	[	v,		V,		percent,	percent		]	};
+    key <AB05>	{	[	b,		B,		ampersand,	ampersand	]	};
+    key <AB06>	{	[	n,		N,		dollar,		dollar		]	};
+    key <AB07>	{	[	m,		M,		EuroSign,	EuroSign	]	};
+    key <AC10>  {       [       semicolon,      colon,          sterling,	sterling	]	};
+    key <AE11>  {       [       minus,          underscore,     underscore,	underscore	]	};
+    key <AE12>  {       [       plus,           equal,          equal,		equal		]	};
+
+    key <AB08>  {       [       comma,          less,           comma,		less		]	};
+    key <AB09>  {       [       period,         greater,        period,		greater		]	};
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "fisenoda" {
+    name[Group1] = "Finnish/Swedish/Norwegian/Danish";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
+    key <AC03>	{	[	d,		D,		at,		at		]	};
+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
+    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};
+    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
+    key <AC07>	{	[	j,		J,		slash,		slash		]	};
+    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
+    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
+    key <AC11>  {       [       aring,          Aring,          question,	question	]	};
+
+    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};
+    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};
+    key <AB03>	{	[	c,		C,		percent,	percent		]	};
+    key <AB04>	{	[	v,		V,		ampersand,	ampersand	]	};
+    key <AB05>	{	[	b,		B,		plus,		plus		]	};
+    key <AB06>	{	[	n,		N,		less,		less		]	};
+    key <AB07>	{	[	m,		M,		greater,	greater		]	};
+    key <AC10>  {       type="EIGHT_LEVEL", [       oslash,     Oslash,		equal,		equal,		odiaeresis,		Odiaeresis,	equal,		equal		]       };
+    key <AE11>  {       type="EIGHT_LEVEL", [       ae,		AE,		apostrophe,	apostrophe,	adiaeresis,		Adiaeresis,	apostrophe,	apostrophe	]       };
+    key <AE12>  {       [       minus,          underscore,     underscore,	underscore	]       };
+
+    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]       };
+    key <AB09>  {       [       period,         colon,          period,		colon		]       };
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "ptes" {
+    name[Group1] = "Portuguese/Spanish";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
+    key <AC03>	{	[	d,		D,		at,		at		]	};
+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
+    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};
+    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
+    key <AC07>	{	[	j,		J,		slash,		slash		]	};
+    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
+    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
+    key <AC11>  {       [       dead_acute,     dead_grave,     dead_diaeresis,	dead_diaeresis	]	};
+
+    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};
+    key <AB02>	{	[	x,		X,		percent,	percent 	]	};
+    key <AB03>	{	[	c,		C,		ampersand,	ampersand	]	};
+    key <AB04>	{	[	v,		V,		exclamdown,	exclamdown	]	};
+    key <AB05>	{	[	b,		B,		apostrophe,	apostrophe	]	};
+    key <AB06>	{	[	n,		N,		plus,		plus		]	};
+    key <AB07>	{	[	m,		M,		equal,		equal		]	};
+    key <AC10>  {       [       ccedilla,       Ccedilla,       questiondown,	questiondown	]	};
+    key <AE11>  {       [       ntilde,         Ntilde,         question,	question	]	};
+    key <AE12>  {       [       dead_tilde,     dead_circumflex, dead_circumflex, dead_circumflex ]	};
+
+    key <AB08>  {       [	comma,		semicolon,	minus,		minus		]	};
+    key <AB09>  {       [	period,		colon,		underscore,	underscore	]	};
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "fr" {
+    name[Group1] = "French";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AD01>	{	[	a,		A,		1,              1               ]	};
+    key <AD02>	{	[	z,		Z,		2,              2               ]	};
+
+    key <AC01>	{	[	q,		Q,		at,             at              ]	};
+    key <AC02>	{	[	s,		S,		percent,        percent         ]	};
+    key <AC03>	{	[	d,		D,		ecircumflex,    Ecircumflex	]	};
+    key <AC04>	{	[	f,		F,		eacute,  	Eacute          ]	};
+    key <AC05>	{	[	g,		G,		egrave,    	Egrave          ]	};
+    key <AC06>	{	[	h,		H,		oe,             OE      	]	};
+    key <AC07>	{	[	j,		J,		parenleft,      parenleft   	]	};
+    key <AC08>	{	[	k,		K,		parenright,     parenright	]	};
+    key <AC09>	{	[	l,		L,		agrave,         Agrave      	]	};
+    key <AC11>  {       [       m,              M,              ugrave,         Ugrave          ]       };
+
+    key <AB01>	{	[	w,		w,		EuroSign,       EuroSign	]	};
+    key <AB02>	{	[	x,		X,		numbersign,     numbersign 	]	};
+    key <AB03>	{	[	c,		C,		ccedilla,       Ccedilla	]	};
+    key <AB04>	{	[	v,		V,		plus,           plus	        ]	};
+    key <AB05>	{	[	b,		B,		equal,          equal   	]	};
+    key <AB06>	{	[	n,		N,		quotedbl,       quotedbl	]	};
+    key <AB07>	{	[	comma,		question,       backslash,      backslash	]	};
+    key <AC10>  {       [       semicolon,      period,         minus,          minus           ]       };
+    key <AE11>  {       [       colon,          slash,          underscore,     underscore      ]       };
+    key <AE12>  {       [       apostrophe,     apostrophe,     mu,             mu              ]       };
+
+    key <AB08>  {       [       less,		greater,	less,		greater		]	};
+    key <AB09>  {       [       exclam,		section,	asterisk,	asterisk        ]       };
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "de" {
+    name[Group1] = "German";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AD06>	{	[	z,		Z,		6,		6		]	};
+
+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
+    key <AC03>	{	[	d,		D,		at,		at		]	};
+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
+    key <AC05>	{	[	g,		G,		percent,	percent    	]	};
+    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
+    key <AC07>	{	[	j,		J,		slash,		slash	  	]	};
+    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
+    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
+    key <AC11>  {	[       udiaeresis,     Udiaeresis,     question,	question	]       };
+
+    key <AB01>	{	[	y,		Y,		EuroSign,	EuroSign	]	};
+    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};
+    key <AB03>	{	[	c,		C,		asterisk,	asterisk	]	};
+    key <AB04>	{	[	v,		V,		ampersand,	ampersand	]	};
+    key <AB05>	{	[	b,		B,		plus,		plus		]	};
+    key <AB06>	{	[	n,		N,		less,		less		]	};
+    key <AB07>	{	[	m,		M,		greater,	greater		]	};
+    key <AC10>  {	[       odiaeresis,     Odiaeresis,     equal,		equal		]       };
+    key <AE11>  {	[       adiaeresis,     Adiaeresis,     apostrophe,	apostrophe	]       };
+    key <AE12>  {	[       minus,          underscore,     ssharp,		ssharp		]       };
+
+    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]	};
+    key <AB09>  {       [       period,         colon,          period,		colon		]	};
+};
+
+
+// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons.
+partial alphanumeric_keys
+xkb_symbols "ru" {
+    name[Group1] = "Russian";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AD01>	{	type="EIGHT_LEVEL", [	q,			Q,			1,			1,			Cyrillic_shorti,	Cyrillic_SHORTI,	1,			1			]	};
+    key <AD02>	{	type="EIGHT_LEVEL", [	w,			W,			2,			2,			Cyrillic_tse,	Cyrillic_TSE,	2,			2			]	};
+    key <AD03>	{	type="EIGHT_LEVEL", [	e,			E,			3,			3,			Cyrillic_u,	Cyrillic_U,	3,			3			]	};
+    key <AD04>	{	type="EIGHT_LEVEL", [	r,			R,			4,			4,			Cyrillic_ka,	Cyrillic_KA,	4,			4			]	};
+    key <AD05>	{	type="EIGHT_LEVEL", [	t,			T,			5,			5,			Cyrillic_ie,	Cyrillic_IE,	5,			5			]	};
+    key <AD06>	{	type="EIGHT_LEVEL", [	y,			Y,			6,			6,			Cyrillic_en,	Cyrillic_EN,	6,			6			]	};
+    key <AD07>	{	type="EIGHT_LEVEL", [	u,			U,			7,			7,			Cyrillic_ghe,	Cyrillic_GHE,	7,			7			]	};
+    key <AD08>	{	type="EIGHT_LEVEL", [	i,			I,			8,			8,			Cyrillic_sha,	Cyrillic_SHA,	8,			8			]	};
+    key <AD09>	{	type="EIGHT_LEVEL", [	o,			O,			9,			9,			Cyrillic_shcha,	Cyrillic_SHCHA,	9,			9			]	};
+    key <AD10>	{	type="EIGHT_LEVEL", [	p,			P,			0,			0,			Cyrillic_ze,	Cyrillic_ZE,	0,			0			]	};
+
+    key <AC01>	{	type="EIGHT_LEVEL", [	a,			A,			exclam,			exclam,			Cyrillic_ef,	Cyrillic_EF,	exclam,			exclam			]	};
+    key <AC02>	{	type="EIGHT_LEVEL", [	s,			S,			quotedbl,		quotedbl,		Cyrillic_yeru,	Cyrillic_YERU,	quotedbl,		quotedbl		]	};
+    key <AC03>	{	type="EIGHT_LEVEL", [	d,			D,			at,			at,			Cyrillic_ve,	Cyrillic_VE,	at,			at			]	};
+    key <AC04>	{	type="EIGHT_LEVEL", [	f,			F,			numbersign,		numbersign,		Cyrillic_a,	Cyrillic_A,	numbersign,		numbersign		]	};
+    key <AC05>	{	type="EIGHT_LEVEL", [	g,			G,			backslash,		backslash,		Cyrillic_pe,	Cyrillic_PE,	backslash,		backslash		]	};
+    key <AC06>	{	type="EIGHT_LEVEL", [	h,			H,			slash,			slash,			Cyrillic_er,	Cyrillic_ER,	slash,			slash			]	};
+    key <AC07>	{	type="EIGHT_LEVEL", [	j,			J,			parenleft,		parenleft,		Cyrillic_o,	Cyrillic_O,	parenleft,		parenleft		]	};
+    key <AC08>	{	type="EIGHT_LEVEL", [	k,			K,			parenright,		parenright,		Cyrillic_el,	Cyrillic_EL,	parenright,		parenright		]	};
+    key <AC09>	{	type="EIGHT_LEVEL", [	l,			L,			colon,			colon,			Cyrillic_de,	Cyrillic_DE,	colon,			colon			]	};
+    key <AC11>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		semicolon,		semicolon,		Cyrillic_zhe,	Cyrillic_ZHE,	semicolon,		semicolon		]	};
+
+    key <AB01>	{	type="EIGHT_LEVEL", [	z,			Z,			underscore,		underscore,		Cyrillic_ya,	Cyrillic_YA,	minus,			minus			]	};
+    key <AB02>	{	type="EIGHT_LEVEL", [	x,			X,			percent,		percent,		Cyrillic_che,	Cyrillic_CHE,	percent,		percent			]	};
+    key <AB03>	{	type="EIGHT_LEVEL", [	c,			C,			0x1002116,		0x1002116,		Cyrillic_es,	Cyrillic_ES,	0x1002116,		0x1002116		]	};
+    key <AB04>	{	type="EIGHT_LEVEL", [	v,			V,			equal,			equal,			Cyrillic_em,	Cyrillic_EM,	equal,			equal			]	};
+    key <AB05>	{	type="EIGHT_LEVEL", [	b,			B,			ampersand,		ampersand,		Cyrillic_i,	Cyrillic_I,	ampersand,		ampersand		]	};
+    key <AB06>	{	type="EIGHT_LEVEL", [	n,			N,			asterisk,		asterisk,		Cyrillic_te,	Cyrillic_TE,	asterisk,		asterisk		]	};
+    key <AB07>	{	type="EIGHT_LEVEL", [	m,			M,			apostrophe,		apostrophe,		Cyrillic_softsign,	Cyrillic_SOFTSIGN,	apostrophe,		apostrophe		]	};
+    key <AC10>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		minus,			minus,			Cyrillic_be,	Cyrillic_BE,	minus,			minus			]	};
+    key <AE11>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		question,		question,		Cyrillic_yu,	Cyrillic_YU,	question,		question		]	};
+    key <AE12>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		Cyrillic_hardsign,	Cyrillic_HARDSIGN,	Cyrillic_ha,	Cyrillic_HA,	Cyrillic_hardsign,	Cyrillic_HARDSIGN	]	};
+
+    key <AB08>	{	type="EIGHT_LEVEL", [	period,			comma,			period,			comma,			period,		comma,		period,			comma			]	};
+    key <AB09>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		Cyrillic_io,		Cyrillic_IO,		Cyrillic_e,	Cyrillic_E,	Cyrillic_io,		Cyrillic_IO		]	};
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "it" {
+    name[Group1] = "Italian";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
+    key <AC03>	{	[	d,		D,		at,		at		]	};
+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
+    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};
+    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
+    key <AC07>	{	[	j,		J,		slash,		slash		]	};
+    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
+    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
+    key <AC11>  {       [       apostrophe,     question,       igrave,         Igrave		]       };
+
+    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};
+    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};
+    key <AB03>	{	[	c,		C,		ampersand,	ampersand	]	};
+    key <AB04>	{	[	v,		V,		equal,		equal		]	};
+    key <AB05>	{	[	b,		B,		less,		less		]	};
+    key <AB06>	{	[	n,		N,		greater,	greater		]	};
+    key <AB07>	{	[	m,		M,		plus,		plus		]	};
+    key <AC10>  {       [       eacute,         Eacute,         ograve,         Ograve          ]       };
+    key <AE11>  {       [       egrave,         Egrave,         agrave,         Agrave          ]       };
+    key <AE12>  {       [       minus,          underscore,     ugrave,         Ugrave          ]       };
+
+    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]       };
+    key <AB09>  {       [       period,         colon,          period,		colon		]       };
+};
+
+partial default alphanumeric_keys
+xkb_symbols "base" {
+    key <AD01>	{	[	q,			Q,			1,			1			]	};
+    key <AD02>	{	[	w,			W,			2,			2			]	};
+    key <AD03>	{	[	e,			E,			3,			3			]	};
+    key <AD04>	{	[	r,			R,			4,			4			]	};
+    key <AD05>	{	[	t,			T,			5,			5			]	};
+    key <AD06>	{	[	y,			Y,			6,			6			]	};
+    key <AD07>	{	[	u,			U,			7,			7			]	};
+    key <AD08>	{	[	i,			I,			8,			8			]	};
+    key <AD09>	{	[	o,			O,			9,			9			]	};
+    key <AD10>	{	[	p,			P,			0,			0			]	};
+    key <BKSP>	{	[	BackSpace,		BackSpace,		BackSpace,		BackSpace		]	};
+
+    // broken UI spec.
+    key <RTRN>	{	[	KP_Enter,		KP_Enter,		KP_Enter,		KP_Enter		]	};
+
+    key <COMP>	{	[	Multi_key,		Multi_key,		Multi_key,		Multi_key		]	};
+    key <LFSH>	{	[	Shift_L,		Shift_L,		Shift_L,		Shift_L			]	};
+    key <FN>	{	[	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift	]	};
+    key <SPCE>	{	[	space,			space,			space,			space			]	};
+    key <RCTL>	{	[	Control_R,		Control_R,		Control_R,		Control_R		]	};
+    key <TAB>	{	[	Tab,			Tab,			Tab,			Tab			]	};
+
+    modifier_map Shift { Shift_L };
+    modifier_map Mod5 { ISO_Level3_Shift };
+    modifier_map Control { Control_R };
+
+    key <KPEN>	{	[	Return		]	};
+    key <UP>	{	[	Up		]	};
+    key <DOWN>	{	[	Down		]	};
+    key <LEFT>	{	[	Left		]	};
+    key <RGHT>	{	[	Right		]	};
+
+    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		]	};
+
+    // generated from the headset, must always be in the map.
+    key <I29>  {	[	XF86Phone	]	};
+};
diff --git a/xorg-server/xkbdata.src/symbols/nokia_vndr/rx-51 b/xorg-server/xkbdata.src/symbols/nokia_vndr/rx-51
new file mode 100644
index 000000000..fd98fbf28
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/nokia_vndr/rx-51
@@ -0,0 +1,491 @@
+default partial alphanumeric_keys
+xkb_symbols "common" {
+    include "nokia_vndr/rx-51(common_keys)"
+    include "nokia_vndr/rx-51(modifiers)"
+
+    // This section should not be included by any other section.
+    // It's referenced only once by rule file to allow multiple layout configurations.
+
+    // More than one layout at the same time could be set for instance as follows:
+    // setxkbmap -rules evdev \
+    //           -model nokiarx51 \
+    //           -option grp:ctrl_shift_toggle \
+    //           -layout us,cz \
+    //           -variant ",qwerty"
+
+    // Notice the similarity:
+    //   "pc+us+cz(qwerty):2+grp:XYZ" vs.
+    //   "nokia_vndr/rx-51(common)+nokia_vndr/rx-51(us)+nokia_vndr/rx-51(cz_qwerty):2+grp:XYZ"
+    // where XYZ is one of xkb_symbols section usually located in file symbols/group.
+
+    // Bear in mind that option XYZ could replace current keys configuration!!!
+
+    // For instance using symbols/group(ctrl_shift_toggle) redefines LCTL and LFSH keys
+    // which may disallow opening of virtual symbol table (Multi_key).
+    // Fortunately the Multi_key is defined in 3rd and 4th level a ctrl_shift_toggle
+    // redefines first two levels only. But RX-51 has not right Ctrl nor Shift therefore
+    // pressing Ctrl+Shift will switch to previous layout, not to the next one.
+
+    // For RX-51 device there is a lot of restrictions if more than one layout is
+    // is configured at the same time because some modifiers and special cases are
+    // handled by hildon layer (especially with eight-level layout):
+    //  - settings may be done from terminal only (GUI doesn't and won't support it)
+    //  - virtual symbol table is not updated according to current layout
+    //  - for unknown reasons the eight-level layout (nordic,ru) works properly
+    //    only if it's configured as first layout (e.g. "ru,us,cz" not "us,cz,ru")
+    //    otherwise it's not possible to access levels 5-8
+    //  - Ctrl+Space related problems:
+    //     - If eight-level layout is used as first layout one of eight-level layouts has to
+    //       be also chosen in GUI - otherwise the Ctrl+Space "switch" is disabled
+    //     - Ctrl+Space has no effect if only four-level layouts are chosen
+    //       (don't forget the layout configured in GUI - despite of it's not reachable)
+    //     - a few keys in 2nd layer could be mixed with other layouts when Ctrl+Space is "turned on" (why?)
+    //       in case eight- and four-level layouts are configured simultaneously
+    //     - Ctrl+Space is "turned on" by default and has to be "turned off" for four-level layouts
+    //       in case eight- and four-level layouts are configured simultaneously
+    //     - four-level layout on first place doesn't work at all when Ctrl+Space is "turned on"
+    //       in case the 2nd, 3rd or 4th layout is eight-level layout
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+partial alphanumeric_keys
+xkb_symbols "us" {
+    include "nokia_vndr/rx-51(english_base)"
+    include "nokia_vndr/rx-51(arrows_4btns)"
+
+    name[Group1] = "U.S. English";
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "pl" {
+    include "nokia_vndr/rx-51(english_base)"
+    include "nokia_vndr/rx-51(arrows_4btns)"
+
+    name[Group1] = "Polish";
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "fise" {
+    include "nokia_vndr/rx-51(nordic_base)"
+    include "nokia_vndr/rx-51(arrows_2btns)"
+
+    name[Group1] = "Finnish/Swedish";
+
+    // 2. row
+    key <AB09>	{ [	odiaeresis,	Odiaeresis,	exclam,		exclam		] };
+    key <UP>	{ [	adiaeresis,	Adiaeresis,	question,	question	] };
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "dano" {
+    include "nokia_vndr/rx-51(nordic_base)"
+    include "nokia_vndr/rx-51(arrows_2btns)"
+
+    name[Group1] = "Danish/Norwegian";
+
+    // 2. row
+    key <AB09>	{ [	oslash,		Oslash,		exclam,		exclam		] };
+    key <UP>	{ [	ae,		AE,		question,	question	] };
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "nordic" {
+    include "nokia_vndr/rx-51(nordic_base)"
+    include "nokia_vndr/rx-51(arrows_2btns)"
+
+    name[Group1] = "Danish/Finnish/Norwegian/Swedish";
+
+    key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
+
+    // 2. row
+    key <AB09>	{ [	odiaeresis,	Odiaeresis,	exclam,		exclam,		oslash,		Oslash,		exclam,		exclam		] };
+    key <UP>	{ [	adiaeresis,	Adiaeresis,	question,	question,	ae,		AE,		question,	question	] };
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "ptes" {
+    include "nokia_vndr/rx-51(english_base)"
+    include "nokia_vndr/rx-51(arrows_2btns)"
+
+    name[Group1] = "Portuguese/Spanish";
+
+    // 1. row
+    key <AB08>	{ [	dead_acute,	dead_acute,	dead_grave,	dead_grave	] };
+
+    // 2. row
+    key <AC05>	{ [	g,		G,		exclamdown,	exclamdown	] };
+    key <AC06>	{ [	h,		H,		exclam,		exclam		] };
+    key <AC07>	{ [	j,		J,		questiondown,	questiondown	] };
+    key <AC08>	{ [	k,		K,		question,	question	] };
+    key <AC09>	{ [	l,		L,		dead_diaeresis,	dead_diaeresis	] };
+    key <AB09>	{ [	ntilde,		Ntilde,		dead_tilde,	dead_tilde	] };
+    key <UP>	{ [	ccedilla,	Ccedilla,	dead_circumflex,dead_circumflex	] };
+
+    // 3. row
+    key <AB01>	{ [	z,		Z,		parenleft,	parenleft	] };
+    key <AB02>	{ [	x,		X,		parenright,	parenright 	] };
+    key <AB03>	{ [	c,		C,		slash,		slash		] };
+    key <AB04>	{ [	v,		V,		quotedbl,	quotedbl	] };
+    key <AB05>	{ [	b,		B,		apostrophe,	apostrophe	] };
+    key <AB06>	{ [	n,		N,		colon,		colon		] };
+    key <AB07>	{ [	m,		M,		semicolon,	semicolon	] };
+    key <LEFT>	{ [	period,		comma,		comma,		comma		] };
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "fr" {
+    include "nokia_vndr/rx-51(english_base)"
+    include "nokia_vndr/rx-51(arrows_2btns)"
+
+    name[Group1] = "French";
+
+    // 1. row
+    key <AD01>	{ [	a,		A,		1,		1		] };
+    key <AD02>	{ [	z,		Z,		2,		2		] };
+    key <AB08>	{ [	agrave,		Agrave,		ccedilla,	Ccedilla	] };
+
+    // 2. row
+    key <AC01>	{ [	q,		Q,		asterisk,	asterisk	] };
+    key <AC02>	{ [	s,		S,		plus,		plus		] };
+    key <AC03>	{ [	d,		D,		numbersign,	numbersign	] };
+    key <AC04>	{ [	f,		F,		minus,  	minus		] };
+    key <AC05>	{ [	g,		G,		underscore,	underscore	] };
+    key <AC06>	{ [	h,		H,		exclam,		exclam		] };
+    key <AC07>	{ [	j,		J,		question,	question	] };
+    key <AC08>	{ [	k,		K,		colon,		colon		] };
+    key <AC09>	{ [	l,		L,		dead_circumflex,dead_circumflex	] };
+    key <AB09>	{ [	m,		M,		ugrave,		Ugrave		] };
+    key <UP>	{ [	eacute,		Eacute,		egrave,		Egrave		] };
+
+    // 3. row
+    key <AB01>	{ [	w,		W,		EuroSign,       EuroSign	] };
+    key <AB03>	{ [	c,		C,		parenleft,	parenleft	] };
+    key <AB04>	{ [	v,		V,		parenright,	parenright	] };
+    key <AB05>	{ [	b,		B,		slash,		slash		] };
+    key <AB07>	{ [	comma,		comma,		apostrophe,	apostrophe	] };
+    key <LEFT>	{ [	semicolon,	period,		period,		period		] };
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "de" {
+    include "nokia_vndr/rx-51(english_base)"
+    include "nokia_vndr/rx-51(arrows_2btns)"
+
+    name[Group1] = "German";
+
+    // 1. row
+    key <AD06>	{ [	z,		Z,		6,		6		] };
+    key <AB08>	{ [	udiaeresis,	Udiaeresis,	ssharp,		ssharp		] };
+
+    // 2. row
+    key <AC08>	{ [	k,		K,		semicolon,	semicolon	] };
+    key <AC09>	{ [	l,		L,		colon,		colon		] };
+    key <AB09>	{ [	odiaeresis,	Odiaeresis,	exclam,		exclam		] };
+    key <UP>	{ [	adiaeresis,	Adiaeresis,	question,	question	] };
+
+    // 3. row
+    key <AB01>	{ [	y,		Y,		EuroSign,	EuroSign	] };
+    key <AB03>	{ [	c,		C,		equal,		equal		] };
+    key <LEFT>	{ [	period,		comma,		comma,		comma		] };
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "ch" {
+    include "nokia_vndr/rx-51(english_base)"
+    include "nokia_vndr/rx-51(arrows_2btns)"
+
+    name[Group1] = "Swiss";
+
+    // 1. row
+    key <AD06>	{ [	z,		Z,		6,		6		] };
+    key <AB08>	{ [	udiaeresis,	Udiaeresis,	egrave,		Egrave		] };
+
+    // 2. row
+    key <AC06>	{ [	h,		H,		equal,		equal		] };
+    key <AC07>	{ [	j,		J,		parenleft,	parenleft	] };
+    key <AC08>	{ [	k,		K,		parenright,	parenright	] };
+    key <AC09>	{ [	l,		L,		colon,		colon		] };
+    key <AB09>	{ [	odiaeresis,	Odiaeresis,	eacute,		Aacute		] };
+    key <UP>	{ [	adiaeresis,	Adiaeresis,	agrave,		Agrave		] };
+
+    // 3. row
+    key <AB01>	{ [	y,		Y,		question,	question	] };
+    key <AB02>	{ [	x,		X,		exclam,		exclam		] };
+    key <AB03>	{ [	c,		C,		ccedilla,	Ccedilla	] };
+    key <LEFT>	{ [	period,		comma,		comma,		comma		] };
+};
+
+
+
+// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons.
+partial alphanumeric_keys
+xkb_symbols "ru" {
+    include "nokia_vndr/rx-51(english_base)"
+    include "nokia_vndr/rx-51(arrows_2btns)"
+
+    name[Group1] = "Russian";
+
+    key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
+
+    // 1. row
+    key <AD01>	{ [	q,		Q,		1,			1,			Cyrillic_shorti,	Cyrillic_SHORTI,	1,			1			] };
+    key <AD02>	{ [	w,		W,		2,			2,			Cyrillic_tse,		Cyrillic_TSE,		2,			2			] };
+    key <AD03>	{ [	e,		E,		3,			3,			Cyrillic_u,		Cyrillic_U,		3,			3			] };
+    key <AD04>	{ [	r,		R,		4,			4,			Cyrillic_ka,		Cyrillic_KA,		4,			4			] };
+    key <AD05>	{ [	t,		T,		5,			5,			Cyrillic_ie,		Cyrillic_IE,		5,			5			] };
+    key <AD06>	{ [	y,		Y,		6,			6,			Cyrillic_en,		Cyrillic_EN,		6,			6			] };
+    key <AD07>	{ [	u,		U,		7,			7,			Cyrillic_ghe,		Cyrillic_GHE,		7,			7			] };
+    key <AD08>	{ [	i,		I,		8,			8,			Cyrillic_sha,		Cyrillic_SHA,		8,			8			] };
+    key <AD09>	{ [	o,		O,		9,			9,			Cyrillic_shcha,		Cyrillic_SHCHA,		9,			9			] };
+    key <AD10>	{ [	p,		P,		0,			0,			Cyrillic_ze,		Cyrillic_ZE,		0,			0			] };
+    key <AB08>  { [	Cyrillic_ha,	Cyrillic_HA,	Cyrillic_hardsign,	Cyrillic_HARDSIGN,	Cyrillic_ha,		Cyrillic_HA,		Cyrillic_hardsign,	Cyrillic_HARDSIGN	] };
+
+    // 2. row
+    key <AC01>	{ [	a,		A,		asterisk,		asterisk,		Cyrillic_ef,		Cyrillic_EF,		asterisk,		asterisk		] };
+    key <AC02>	{ [	s,		S,		plus,			plus,			Cyrillic_yeru,		Cyrillic_YERU,		plus,			plus			] };
+    key <AC03>	{ [	d,		D,		numbersign,		numbersign,		Cyrillic_ve,		Cyrillic_VE,		numbersign,		numbersign		] };
+    key <AC04>	{ [	f,		F,		minus,			minus,			Cyrillic_a,		Cyrillic_A,		minus,			minus			] };
+    key <AC05>	{ [	g,		G,		underscore,		underscore,		Cyrillic_pe,		Cyrillic_PE,		underscore,		underscore		] };
+    key <AC06>	{ [	h,		H,		exclam,			exclam,			Cyrillic_er,		Cyrillic_ER,		exclam,			exclam			] };
+    key <AC07>	{ [	j,		J,		question,		question,		Cyrillic_o,		Cyrillic_O,		question,		question		] };
+    key <AC08>	{ [	k,		K,		semicolon,		semicolon,		Cyrillic_el,		Cyrillic_EL,		semicolon,		semicolon		] };
+    key <AC09>	{ [	l,		L,		colon,			colon,			Cyrillic_de,		Cyrillic_DE,		colon,			colon			] };
+    key <AB09>	{ [	comma,		comma,		comma,			comma,			Cyrillic_zhe,		Cyrillic_ZHE,		comma,			comma			] };
+    key <UP>	{ [	period,		period,		period,			period,			Cyrillic_e,		Cyrillic_E,		period,			period			] };
+
+    // 3. row
+    key <AB01>	{ [	z,		Z,		dollar,			dollar,			Cyrillic_ya,		Cyrillic_YA,		dollar,			dollar			] };
+    key <AB02>	{ [	x,		X,		EuroSign,		EuroSign,		Cyrillic_che,		Cyrillic_CHE,		EuroSign,		EuroSign		] };
+    key <AB03>	{ [	c,		C,		slash,			slash,			Cyrillic_es,		Cyrillic_ES,		slash,			slash			] };
+    key <AB04>	{ [	v,		V,		parenleft,		parenleft,		Cyrillic_em,		Cyrillic_EM,		parenleft,		parenleft		] };
+    key <AB05>	{ [	b,		B,		parenright,		parenright,		Cyrillic_i,		Cyrillic_I,		parenright,		parenright		] };
+    key <AB06>	{ [	n,		N,		quotedbl,		quotedbl,		Cyrillic_te,		Cyrillic_TE,		quotedbl,		quotedbl		] };
+    key <AB07>	{ [	m,		M,		apostrophe,		apostrophe,		Cyrillic_softsign,	Cyrillic_SOFTSIGN,	apostrophe,		apostrophe		] };
+    key <LEFT>	{ [	Cyrillic_be,	Cyrillic_BE,	Cyrillic_yu,		Cyrillic_YU,		Cyrillic_be,		Cyrillic_BE,		Cyrillic_yu,		Cyrillic_YU		] };
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "it" {
+    include "nokia_vndr/rx-51(english_base)"
+    include "nokia_vndr/rx-51(arrows_2btns)"
+
+    name[Group1] = "Italian";
+
+    // 1. row
+    key <AB08>	{ [	egrave,		Egrave,		eacute,		Eacute		] };
+
+    // 2. row
+    key <AC06>	{ [	h,		H,		semicolon,	semicolon	] };
+    key <AC07>	{ [	j,		J,		colon,		colon		] };
+    key <AC08>	{ [	k,		K,		exclam,		exclam		] };
+    key <AC09>	{ [	l,		L,		question,	question	] };
+    key <AB09>	{ [	ograve,		Ograve,		igrave,		Igrave		] };
+    key <UP>	{ [	agrave,		Agrave,		ugrave,		Ugrave		] };
+
+    // 3. row
+    key <AB01>	{ [	z,		Z,		EuroSign,	EuroSign	] };
+    key <AB02>	{ [	x,		X,		parenleft,	parenleft	] };
+    key <AB03>	{ [	c,		C,		parenright,	parenright	] };
+    key <LEFT>	{ [	period,		comma,		comma,		comma		] };
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "cz" {
+    include "nokia_vndr/rx-51(english_base)"
+    include "nokia_vndr/rx-51(arrows_2btns)"
+
+    name[Group1] = "Czech";
+
+    // 1. row
+    key <AD06>	{ [	z,		Z,		6,		6		] };
+    key <AB08>	{ [	dead_acute,	dead_acute,	sterling,	sterling	] };
+
+    // 2. row
+    key <AC08>	{ [	k,		K,		semicolon,	semicolon	] };
+    key <AC09>	{ [	l,		L,		colon,		colon		] };
+    key <AB09>	{ [	uring,		Uring,		EuroSign,	EuroSign	] };
+    key <UP>	{ [	dead_caron,	dead_caron,	dollar,		dollar		] };
+
+    // 3. row
+    key <AB01>	{ [	y,		Y,		equal,		equal		] };
+    key <AB02>	{ [	x,		X,		slash,		slash		] };
+    key <AB03>	{ [	c,		C,		backslash,	backslash	] };
+    key <AB04>	{ [	v,		V,		apostrophe,	apostrophe	] };
+    key <AB05>	{ [	b,		B,		quotedbl,	quotedbl	] };
+    key <AB06>	{ [	n,		N,		exclam,		exclam		] };
+    key <AB07>	{ [	m,		M,		question,	question	] };
+    key <LEFT>	{ [	period,		comma,		comma,		comma		] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "cz_qwerty" {
+    include "nokia_vndr/rx-51(cz)"
+
+    name[Group1] = "Czech - qwerty";
+
+    // Do not use the layout "cz_qwerty" directly if it is the only layout and compat rules enabled.
+    // There is one compat rule that converts "cz_qwerty" to "pc+cz(qwerty)" which is not correct for RX-51.
+    // Use either the layout "cz(qwerty)" or the general "cz" with variant "qwerty".
+
+    // 1. row
+    key <AD06>	{ [	y,		Y,		6,		6		] };
+
+    // 3. row
+    key <AB01>	{ [	z,		Z,		percent,	percent		] };
+};
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+
+partial hidden alphanumeric_keys
+xkb_symbols "nordic_base" {
+    include "nokia_vndr/rx-51(english_base)"
+
+    // 1. row
+    key <AB08>	{ [	aring,		Aring,		equal,		equal		] };
+
+    // 2. row
+    key <AC08>	{ [	k,		K,		semicolon,	semicolon	] };
+    key <AC09>	{ [	l,		L,		colon,		colon		] };
+
+    // 3. row
+    key <AB01>	{ [	z,		Z,		EuroSign,	EuroSign	] };
+    key <AB03>	{ [	c,		C,		sterling,	sterling	] };
+    key <LEFT>	{ [	period,		comma,		comma,		comma		] };
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "english_base" {
+
+    // 1. row
+    key <AD01>	{ [	q,		Q,		1,		1		] };
+    key <AD02>	{ [	w,		W,		2,		2		] };
+    key <AD03>	{ [	e,		E,		3,		3		] };
+    key <AD04>	{ [	r,		R,		4,		4		] };
+    key <AD05>	{ [	t,		T,		5,		5		] };
+    key <AD06>	{ [	y,		Y,		6,		6		] };
+    key <AD07>	{ [	u,		U,		7,		7		] };
+    key <AD08>	{ [	i,		I,		8,		8		] };
+    key <AD09>	{ [	o,		O,		9,		9		] };
+    key <AD10>	{ [	p,		P,		0,		0		] };
+    key <AB08>	{ [	comma,		semicolon,	equal,		equal		] };
+
+    // 2. row
+    key <AC01>	{ [	a,		A,		asterisk,	asterisk	] };
+    key <AC02>	{ [	s,		S,		plus,		plus		] };
+    key <AC03>	{ [	d,		D,		numbersign,	numbersign	] };
+    key <AC04>	{ [	f,		F,		minus,		minus		] };
+    key <AC05>	{ [	g,		G,		underscore,	underscore	] };
+    key <AC06>	{ [	h,		H,		parenleft,	parenleft	] };
+    key <AC07>	{ [	j,		J,		parenright,	parenright	] };
+    key <AC08>	{ [	k,		K,		ampersand,	ampersand	] };
+    key <AC09>	{ [	l,		L,		exclam,		exclam		] };
+    key <AB09>	{ [	period,		colon,		question,	question	] };
+
+    // 3. row
+    key <AB01>	{ [	z,		Z,		sterling,	sterling	] };
+    key <AB02>	{ [	x,		X,		dollar,		dollar		] };
+    key <AB03>	{ [	c,		C,		EuroSign,	EuroSign	] };
+    key <AB04>	{ [	v,		V,		slash,		slash		] };
+    key <AB05>	{ [	b,		B,		backslash,	backslash	] };
+    key <AB06>	{ [	n,		N,		quotedbl,	quotedbl	] };
+    key <AB07>	{ [	m,		M,		apostrophe,	apostrophe	] };
+    key <SPCE>	{ [	space,		space,		at,		at		] };
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "common_keys" {
+    // all other common keys
+
+    key <BKSP>	{ [	BackSpace	] };
+    key <TAB>	{ [	Tab		] };
+
+    // broken UI spec.
+    key <RTRN>	{ [	KP_Enter	] };
+
+    key <KPEN>	{ [	Return		] };
+    key <ESC>	{ [	Escape		] };
+
+    key <FK01>	{ [	F1	] };
+    key <FK02>	{ [	F2	] };
+    key <FK03>	{ [	F3	] };
+    key <FK04>	{ [	F4	] };
+    key <FK05>	{ [	F5	] };
+    key <FK06>	{ [	F6	] };
+
+    // Swap +/- keys intentionally. The VOL+/VOL- keys are located physically
+    // on left/right and up/down in landscape/portrait orientation. This does
+    // not feel natural for the user and therefore we want the VOL+/VOL- keys
+    // map to -/+.
+    //
+    // The only exception is an active call in portrait mode where we want to
+    // use the real meanings of the keys. This special case and management of
+    // +/- keys in general is handled in maemo-statusmenu-volume.
+    key <FK07>	{ [	F8	] };
+    key <FK08>	{ [	F7	] };
+
+    key <FK09>	{ [	F9	] };
+    key <FK10>	{ [	F10	] };
+    key <FK11>	{ [	F11	] };
+};
+
+partial hidden alphanumeric_keys modifier_keys
+xkb_symbols "modifiers" {
+    // Shift switches between current level and level+1
+    key <LFSH>	{
+	type[Group1] = "ONE_LEVEL",
+	symbols[Group1] = [	Shift_L	]
+    };
+    modifier_map Shift { Shift_L };
+
+    // Fn+Ctrl virtual symbol table (Multi_key)
+    // Ctrl+Space switches between 1st and 5th level (hardcoded in hildon)
+    key <LCTL>	{
+	type[Group1] = "FOUR_LEVEL",
+	symbols[Group1] = [	Control_L,	Control_L,	Multi_key,	Multi_key	]
+    };
+    modifier_map Control { Control_L };
+
+    // Fn key (right alt) switches to 3rd level
+    include "level3(ralt_switch)"
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "arrows_2btns" {
+    // rx-51 specific arrows mapping
+    // normal 2nd level must not be enumerated to allow text selection with Shift key
+    key <DOWN>	{ type[Group1] = "PC_FN_LEVEL2", symbols[Group1] = [	Left,	Up	] };
+    key <RGHT>	{ type[Group1] = "PC_FN_LEVEL2", symbols[Group1] = [	Right,	Down	] };
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "arrows_4btns" {
+    // standard arrows mapping
+    // normal 2nd level must not be enumerated to allow text selection with Shift key
+    key <UP>	{ type[Group1] = "ONE_LEVEL", symbols[Group1] = [	Up	] };
+    key <LEFT>	{ type[Group1] = "ONE_LEVEL", symbols[Group1] = [	Left	] };
+    key <DOWN>	{ type[Group1] = "ONE_LEVEL", symbols[Group1] = [	Down	] };
+    key <RGHT>	{ type[Group1] = "ONE_LEVEL", symbols[Group1] = [	Right	] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/nokia_vndr/su-8w b/xorg-server/xkbdata.src/symbols/nokia_vndr/su-8w
new file mode 100644
index 000000000..6962aa971
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/nokia_vndr/su-8w
@@ -0,0 +1,484 @@
+partial alphanumeric_keys default
+xkb_symbols "no" {
+    name[Group1]= "Norwegian/Danish";
+
+    include "nokia_vndr/su-8w(base)"
+
+    key <AE01> { [ 1,            exclam,         dead_circumflex                       ] };
+    key <AE02> { [ 2,            quotedbl,       at                                    ] };
+    key <AE03> { [ 3,            numbersign,     EuroSign                              ] };
+    key <AE04> { [ 4,            currency,       dollar                                ] };
+    key <AE05> { [ 5,            percent,        sterling                              ] };
+    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> { [ dead_acute,   dead_grave,     backslash                             ] };
+
+    key <AD01> { [ q,            Q,              dead_circumflex                       ] };
+    key <AD02> { [ w,            W,              at                                    ] };
+    key <AD03> { [ e,            E,              EuroSign                              ] };
+    key <AD04> { [ r,            R,              dollar                                ] };
+    key <AD05> { [ t,            T,              sterling                              ] };
+    key <AD06> { [ y,            Y                                                     ] };
+    key <AD07> { [ u,            U,              braceleft                             ] };
+    key <AD08> { [ i,            I,              bracketleft                           ] };
+    key <AD09> { [ o,            O,              bracketright                          ] };
+    key <AD10> { [ p,            P,              braceright                            ] };
+    key <AD11> { [ aring,        Aring                                                 ] };
+    key <AD12> { [ ssharp,       ssharp,         backslash                             ] };
+
+    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> { [ oslash,       Ooblique                                              ] };
+    key <AC11> { [ ae,           AE                                                    ] };
+
+    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,        semicolon,      less                                  ] };
+    key <AB09> { [ period,       colon,          greater                               ] };
+    key <AB10> { [ minus,        underscore,     dead_diaeresis                        ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "no_nodeadkeys" {
+    name[Group1] = "Norwegian/Danish (no dead keys)";
+
+    include "nokia_vndr/su-8w(no)"
+
+    key <AE01> { [ 1,            exclam,         asciicircum                           ] };
+    key <AE12> { [ acute,        grave,          backslash                             ] };
+    key <AD01> { [ q,            Q,              asciicircum                           ] };
+};
+
+partial alphanumeric_keys default
+xkb_symbols "dk" {
+    include "nokia_vndr/su-8w(no)"
+};
+
+partial alphanumeric_keys default
+xkb_symbols "dk_nodeadkeys" {
+    include "nokia_vndr/su-8w(no_nodeadkeys)"
+};
+
+
+
+partial alphanumeric_keys default
+xkb_symbols "de" {
+    name[Group1]= "German";
+    include "nokia_vndr/su-8w(base)"
+
+    key <AE01> { [ 1,            exclam,         dead_circumflex                       ] };
+    key <AE02> { [ 2,            quotedbl,       at                                    ] };
+    key <AE03> { [ 3,            numbersign,     EuroSign                              ] };
+    key <AE04> { [ 4,            currency,       dollar                                ] };
+    key <AE05> { [ 5,            percent,        sterling                              ] };
+    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> { [ dead_acute,   dead_grave,     backslash                             ] };
+
+    key <AD01> { [ q,            Q,              dead_circumflex                       ] };
+    key <AD02> { [ w,            W,              at                                    ] };
+    key <AD03> { [ e,            E,              EuroSign                              ] };
+    key <AD04> { [ r,            R,              dollar                                ] };
+    key <AD05> { [ t,            T,              sterling                              ] };
+    key <AD06> { [ z,            Z                                                     ] };
+    key <AD07> { [ u,            U,              braceleft                             ] };
+    key <AD08> { [ i,            I,              bracketleft                           ] };
+    key <AD09> { [ o,            O,              bracketright                          ] };
+    key <AD10> { [ p,            P,              braceright                            ] };
+    key <AD11> { [ udiaeresis,   Udiaeresis                                            ] };
+    key <AD12> { [ ssharp,       ssharp,         backslash                             ] };
+
+    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> { [ odiaeresis,   Odiaeresis                                            ] };
+    key <AC11> { [ adiaeresis,   Adiaeresis                                            ] };
+
+    key <AB01> { [ y,            Y                                                     ] };
+    key <AB02> { [ x,            X                                                     ] };
+    key <AB03> { [ c,            C                                                     ] };
+    key <AB04> { [ v,            V                                                     ] };
+    key <AB05> { [ b,            B                                                     ] };
+    key <AB06> { [ n,            N                                                     ] };
+    key <AB07> { [ m,            M                                                     ] };
+    key <AB08> { [ comma,        semicolon,      less                                  ] };
+    key <AB09> { [ period,       colon,          greater                               ] };
+    // XXX Inexplicably, the diaeresis is dead on other layouts, but not
+    //     German.  Go figure.
+    key <AB10> { [ minus,        underscore,     diaeresis                             ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "de_nodeadkeys" {
+    name[Group1] = "German (no dead keys)";
+
+    include "nokia_vndr/su-8w(de)"
+
+    key <AE01> { [ 1,            exclam,         asciicircum                           ] };
+    key <AE12> { [ acute,        grave,          backslash                             ] };
+    key <AD01> { [ q,            Q,              asciicircum                           ] };
+};
+
+
+
+partial alphanumeric_keys default
+xkb_symbols "se" {
+    name[Group1]= "Finnish/Swedish";
+
+    include "nokia_vndr/su-8w(base)"
+
+    key <AE01> { [ 1,            exclam,         dead_circumflex                       ] };
+    key <AE02> { [ 2,            quotedbl,       at                                    ] };
+    key <AE03> { [ 3,            numbersign,     EuroSign                              ] };
+    key <AE04> { [ 4,            currency,       dollar                                ] };
+    key <AE05> { [ 5,            percent,        sterling                              ] };
+    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> { [ dead_acute,   dead_grave,     backslash                             ] };
+
+    key <AD01> { [ q,            Q,              dead_circumflex                       ] };
+    key <AD02> { [ w,            W,              at                                    ] };
+    key <AD03> { [ e,            E,              EuroSign                              ] };
+    key <AD04> { [ r,            R,              dollar                                ] };
+    key <AD05> { [ t,            T,              sterling                              ] };
+    key <AD06> { [ y,            Y                                                     ] };
+    key <AD07> { [ u,            U,              braceleft                             ] };
+    key <AD08> { [ i,            I,              bracketleft                           ] };
+    key <AD09> { [ o,            O,              bracketright                          ] };
+    key <AD10> { [ p,            P,              braceright                            ] };
+    key <AD11> { [ aring,        Aring                                                 ] };
+    key <AD12> { [ ssharp,       ssharp,         backslash                             ] };
+
+    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> { [ odiaeresis,   Odiaeresis                                            ] };
+    key <AC11> { [ adiaeresis,   Adiaeresis                                            ] };
+
+    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,        semicolon,      less                                  ] };
+    key <AB09> { [ period,       colon,          greater                               ] };
+    key <AB10> { [ minus,        underscore,     dead_diaeresis                        ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "se_nodeadkeys" {
+    name[Group1] = "Finnish/Swedish (no dead keys)";
+
+    include "nokia_vndr/su-8w(se)"
+
+    key <AE01> { [ 1,            exclam,         asciicircum                           ] };
+    key <AE12> { [ acute,        grave,          backslash                             ] };
+    key <AD01> { [ q,            Q,              asciicircum                           ] };
+    key <AB10> { [ minus,        underscore,     diaeresis                             ] };
+};
+
+partial alphanumeric_keys default
+xkb_symbols "fi" {
+    include "nokia_vndr/su-8w(se)"
+};
+
+xkb_symbols "fi_nodeadkeys" {
+    include "nokia_vndr/su-8w(se_nodeadkeys)"
+};
+
+
+
+// Russian layout on first two levels, US layout on third and fourth.
+partial alphanumeric_keys default
+xkb_symbols "ru" {
+    name[Group1]= "Russian";
+
+    include "nokia_vndr/su-8w(base)"
+
+    // XXX Would be nice if this actually generated a tilde.
+    key <TLDE> { [ Cyrillic_io,          Cyrillic_IO,          grave                        ] };
+    key <AE01> { [ 1,                    exclam,               exclam,        exclam        ] };
+    key <AE02> { [ 2,                    at,                   quotedbl,      at            ] };
+    key <AE03> { [ 3,                    numbersign,           numbersign,    numbersign    ] };
+    key <AE04> { [ 4,                    dollar,               currency,      dollar        ] };
+    key <AE05> { [ 5,                    percent,              percent,       percent       ] };
+    key <AE06> { [ 6,                    dead_circumflex,      ampersand,     asciicircum   ] };
+    key <AE07> { [ 7,                    ampersand,            slash,         ampersand     ] };
+    key <AE08> { [ 8,                    asterisk,             parenleft,     asterisk      ] };
+    key <AE09> { [ 9,                    parenleft,            parenright,    parenleft     ] };
+    key <AE10> { [ 0,                    parenright,           equal,         parenright    ] };
+    key <AE11> { [ minus,                underscore,           plus,          question      ] };
+    key <AE12> { [ equal,                plus,                 equal,         plus          ] };
+
+    key <AD01> { [ Cyrillic_shorti,      Cyrillic_SHORTI,      q,             Q             ] };
+    key <AD02> { [ Cyrillic_tse,         Cyrillic_TSE,         w,             W             ] };
+    key <AD03> { [ Cyrillic_u,           Cyrillic_U,           e,             E             ] };
+    key <AD04> { [ Cyrillic_ka,          Cyrillic_KA,          r,             R             ] };
+    key <AD05> { [ Cyrillic_ie,          Cyrillic_IE,          t,             T             ] };
+    key <AD06> { [ Cyrillic_en,          Cyrillic_EN,          y,             Y             ] };
+    key <AD07> { [ Cyrillic_ghe,         Cyrillic_GHE,         u,             U             ] };
+    key <AD08> { [ Cyrillic_sha,         Cyrillic_SHA,         i,             I             ] };
+    key <AD09> { [ Cyrillic_shcha,       Cyrillic_SHCHA,       o,             O             ] };
+    key <AD10> { [ Cyrillic_ze,          Cyrillic_ZE,          p,             P             ] };
+    key <AD11> { [ Cyrillic_ha,          Cyrillic_HA,          bracketleft,   braceleft     ] };
+    key <AD12> { [ Cyrillic_hardsign,    Cyrillic_HARDSIGN,    bracketright,  braceright    ] };
+
+    key <AC01> { [ Cyrillic_ef,          Cyrillic_EF,          a,             A             ] };
+    key <AC02> { [ Cyrillic_yeru,        Cyrillic_YERU,        s,             S             ] };
+    key <AC03> { [ Cyrillic_ve,          Cyrillic_VE,          d,             D             ] };
+    key <AC04> { [ Cyrillic_a,           Cyrillic_A,           f,             F             ] };
+    key <AC05> { [ Cyrillic_pe,          Cyrillic_PE,          g,             G             ] };
+    key <AC06> { [ Cyrillic_er,          Cyrillic_ER,          h,             H             ] };
+    key <AC07> { [ Cyrillic_o,           Cyrillic_O,           j,             J             ] };
+    key <AC08> { [ Cyrillic_el,          Cyrillic_EL,          k,             K             ] };
+    key <AC09> { [ Cyrillic_de,          Cyrillic_DE,          l,             L             ] };
+    key <AC10> { [ Cyrillic_zhe,         Cyrillic_ZHE,         semicolon,     colon         ] };
+    key <AC11> { [ Cyrillic_e,           Cyrillic_E,           apostrophe,    quotedbl      ] };
+
+    key <AB01> { [ Cyrillic_ya,          Cyrillic_YA,          z,             Z             ] };
+    key <AB02> { [ Cyrillic_che,         Cyrillic_CHE,         x,             X             ] };
+    key <AB03> { [ Cyrillic_es,          Cyrillic_ES,          c,             C             ] };
+    key <AB04> { [ Cyrillic_em,          Cyrillic_EM,          v,             V             ] };
+    key <AB05> { [ Cyrillic_i,           Cyrillic_I,           b,             B             ] };
+    key <AB06> { [ Cyrillic_te,          Cyrillic_TE,          n,             N             ] };
+    key <AB07> { [ Cyrillic_softsign,    Cyrillic_SOFTSIGN,    m,             M             ] };
+    key <AB08> { [ Cyrillic_be,          Cyrillic_BE,          comma,         less          ] };
+    key <AB09> { [ Cyrillic_yu,          Cyrillic_YU,          period,        greater       ] };
+    key <AB10> { [ slash,                question,             slash,         question      ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "ru_nodeadkeys" {
+    name[Group1] = "Russian - no dead keys";
+
+    include "nokia_vndr/su-8w(ru)"
+
+    key <AE06> { [ 6,                    asciicircum,          ampersand,     asciicircum   ] };
+};
+
+
+
+partial alphanumeric_keys default
+xkb_symbols "us" {
+    name[Group1]= "U.S. English - International";
+    
+    include "nokia_vndr/su-8w(base)"
+
+    // I can't believe it's not us(intl).
+    key <AE01> { [ 1,            exclam,         exclamdown                            ] };
+    key <AE02> { [ 2,            at,             twosuperior                           ] };
+    key <AE03> { [ 3,            numbersign                                            ] };
+    key <AE04> { [ 4,            dollar,         currency                              ] };
+    key <AE05> { [ 5,            percent,        EuroSign                              ] };
+    key <AE06> { [ 6,            asciicircum,    onequarter                            ] };
+    key <AE07> { [ 7,            ampersand,      onehalf                               ] };
+    key <AE08> { [ 8,            asterisk,       threequarters                         ] };
+    key <AE09> { [ 9,            parenleft,      leftsinglequotemark                   ] };
+    key <AE10> { [ 0,            parenright,     rightsinglequotemark                  ] };
+    key <AE11> { [ minus,        underscore,     yen                                   ] };
+    key <AE12> { [ equal,        plus,           multiply                              ] };
+
+    key <AD01> { [ q,            Q,              adiaeresis,           Adiaeresis      ] };
+    key <AD02> { [ w,            W,              aring,                Aring           ] };
+    key <AD03> { [ e,            E,              eacute,               Eacute          ] };
+    key <AD04> { [ r,            R,              registered                            ] };
+    key <AD05> { [ t,            T,              thorn,                THORN           ] };
+    key <AD06> { [ y,            Y,              udiaeresis,           Udiaeresis      ] };
+    key <AD07> { [ u,            U,              uacute,               Uacute          ] };
+    key <AD08> { [ i,            I,              iacute,               Iacute          ] };
+    key <AD09> { [ o,            O,              oacute,               Oacute          ] };
+    key <AD10> { [ p,            P,              odiaeresis,           Odiaeresis      ] };
+    key <AD11> { [ bracketleft,  braceleft,      guillemotleft                         ] };
+    key <AD12> { [ bracketright, braceright,     guillemotright                        ] };
+
+    key <AC01> { [ a,            A,              aacute,               Aacute          ] };
+    key <AC02> { [ s,            S,              ssharp,               section         ] };
+    key <AC03> { [ d,            D,              eth,                  ETH             ] };
+    key <AC04> { [ f,            F                                                     ] };
+    key <AC05> { [ g,            G                                                     ] };
+    key <AC06> { [ h,            H                                                     ] };
+    key <AC07> { [ j,            J                                                     ] };
+    key <AC08> { [ k,            K                                                     ] };
+    key <AC09> { [ l,            L,              oslash,               Ooblique        ] };
+    key <AC10> { [ semicolon,    colon,          paragraph,            degree          ] };
+    // XXX Not entirely sure if fourth level is quotedbl or diaeresis.
+    //     The former makes a lot more sense.
+    key <AC11> { [ dead_acute,   dead_diaeresis, apostrophe,           quotedbl        ] };
+
+    key <AB01> { [ z,            Z,              ae,                   AE              ] };
+    key <AB02> { [ x,            X                                                     ] };
+    key <AB03> { [ c,            C,              copyright                             ] };
+    key <AB04> { [ v,            V                                                     ] };
+    key <AB05> { [ b,            B                                                     ] };
+    key <AB06> { [ n,            N,              ntilde,               Ntilde          ] };
+    key <AB07> { [ m,            M,              mu                                    ] };
+    key <AB08> { [ comma,        less,           ccedilla,             Ccedilla        ] };
+    key <AB09> { [ period,       greater                                               ] };
+    key <AB10> { [ slash,        question,       questiondown                          ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "us_nodeadkeys" {
+    name[Group1] = "U.S. English - no dead keys";
+
+    include "nokia_vndr/su-8w(us_intl)"
+
+    // XXX Not entirely sure if second level is quotedbl or diaeresis.
+    //     The former makes a lot more sense.
+    key <AC10> { [ apostrophe,    quotedbl,       dead_acute,           dead_diaeresis ] };
+};
+
+
+
+partial default alphanumeric_keys
+xkb_symbols "base" {
+    // forked from from pc(pc105); madness.
+    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			]	};
+
+    key <BKSP> { [ BackSpace ] };
+
+    key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
+    key <RTRN> {	[ Return	]	};
+    // we don't ever generate this key, but the VKB needs it always.
+    key <KPEN> {        [ KP_Enter      ]       };
+    // generated from the headset, must always be in the map.
+    key <I29>  {        [ XF86Phone     ]       };
+
+    key <CAPS> {	[ Caps_Lock	]	};
+
+    key <NMLK> {	[ Num_Lock, Pointer_EnableKeys		]	};
+
+    key <LFSH> {	[ Shift_L	]	};
+    key <LCTL> {	[ Control_L	]	};
+    key <LALT> {	[ Alt_L,	Meta_L		]	};
+    key <LWIN> {	[ Super_L			]	};
+
+    key <RTSH> {	[ Shift_R	]	};
+    key <RCTL> {	[ Control_R	]	};
+    key <RALT> {	[ Alt_R,	Meta_R		]	};
+    key <RWIN> {	[ Super_R			]	};
+
+    key <MENU> {	[ Menu			]	};
+
+    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> { [ F11 ] };
+    key <FK11> { [ F10 ] };
+    key <FK12> { [ F12 ] };
+
+    // 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> };
+
+    key  <INS> {        [  Insert               ]       };
+    key <DELE> {        [  Delete               ]       };
+    key  <END> {        [  End                  ]       };
+    key   <UP> {	[  Up			]	};
+    key <LEFT> {	[  Left			]	};
+    key <DOWN> {	[  Down			]	};
+    key <RGHT> {	[  Right		]	};
+
+    // True for all layouts (except for ru).
+    key <TLDE> { [ grave, asterisk, asciitilde ] };
+
+    // SU-8W uses 140 for Home, not the normal keycode.  Very useful.
+    key <HOME> {        [       NoSymbol                ]       };
+    // Ditto LWIN/RWIN and Page Up/Page Down.
+    key <PGUP> {        [       none                ]       };
+    key <PGDN> {        [       NoSymbol                ]       };
+
+    // The LWIN & RWIN keys correspond to the 'select left' and
+    // 'select right' keys.
+    key <LWIN> {	[	Prior		]	};
+    key <RWIN> {	[	Next		]	};
+
+    // <FRNT> = 140 ~ <I140>
+    key <FRNT> {	[	Home			]	};
+    // <PROP> = 138 ~ <I138>
+    key <PROP> {	[	Menu			]	};
+    key <I163> {	[	XF86Mail		]	};
+
+    // Power button.
+    key <I5E> {         [       Execute                 ]       };
+};
diff --git a/xorg-server/xkbdata.src/symbols/pc b/xorg-server/xkbdata.src/symbols/pc
index 9f3da6640..a359b8023 100644
--- a/xorg-server/xkbdata.src/symbols/pc
+++ b/xorg-server/xkbdata.src/symbols/pc
@@ -32,13 +32,11 @@ xkb_symbols "pc105" {
     key <LCTL> {	[ Control_L	]	};
 
     key <LWIN> {	[ Super_L			]	};
-    modifier_map Mod4   { <LWIN> };
 
     key <RTSH> {	[ Shift_R	]	};
     key <RCTL> {	[ Control_R	]	};
 
     key <RWIN> {	[ Super_R			]	};
-    modifier_map Mod4   { <RWIN> };
 
     key <MENU> {	[ Menu			]	};
 
@@ -47,6 +45,7 @@ xkb_symbols "pc105" {
     modifier_map Lock   { Caps_Lock, ISO_Lock };
     modifier_map Control{ Control_L, Control_R };
     modifier_map Mod2   { Num_Lock };
+    modifier_map Mod4   { Super_L, Super_R };
 
     //  Fake keys for virtual<->real modifiers mapping 
     key <LVL3> {	[ ISO_Level3_Shift	]	};
diff --git a/xorg-server/xkbdata.src/symbols/pl b/xorg-server/xkbdata.src/symbols/pl
index 6eb8b1c56..9ac908779 100644
--- a/xorg-server/xkbdata.src/symbols/pl
+++ b/xorg-server/xkbdata.src/symbols/pl
@@ -135,6 +135,81 @@ xkb_symbols "dvorak_altquotes" {
     key <AE01> { [	    1,	exclam, doublelowquotemark, rightdoublequotemark	]	};
 };
 
+// Polish Programmer Dvorak keymap  by Michal Nazarewicz <mina86@mina86.com>
+// based on Programmer Dvorak  by Roland Kaufmann <rlndkfmn at gmail dot com>
+//      and Polish Dvorak keymaps  by Rafal Rzepecki <divide@users.sf.net
+//      and latin(basic)
+//
+// * 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.
+// * Polish diacritics on AltGr+"acelnosxz" (same as in basic pl(basic)).
+// * Aditionaly, zacute on AltGr+"v" so that both zacute and zabovedot
+//   next to each other same as in pl(basic).
+// * Polish open and close quotes on AltGr+& (same location as in
+//   pl(dvp_altquotes)).
+// * English open quote on AltGr+k (same location as in latin(basic))
+// * English/Polish close quote on AltGr+b (similar location as in
+//   latin(basic) but moved right because AltGr+x is taken for zacute).
+// * Polish open and close quote on AltGr+j.
+//
+// Those rules overwrite only the following rules from us(dvp):
+// * ccedilla on AltGr+c
+// * aring on Alt+a
+// * oslash/Ooblique on Alt+o
+// * ae on Alt+e
+// * ntilde on Alt+n
+//
+partial alphanumeric_keys
+xkb_symbols "dvp" {
+    include "us(dvp)"
+
+    name[Group1] = "Poland - Programmer Dvorak";
+
+    //             Unmodified    Shift           AltGr            Shift+AltGr
+    // symbols row, left side
+    key <AE01> { [ ampersand,    percent,        doublelowquotemark, rightdoublequotemark ] };
+
+    // symbols row, right side
+
+    // upper row, left side
+
+    // // upper row, right side
+    key <AD08> { [ c,            C,              cacute,          Cacute     ] };
+    key <AD10> { [ l,            L,              lstroke,         Lstroke    ] };
+
+    // home row, left side
+    key <AC01> { [ a,            A,              aogonek,         Aogonek    ], type[Group1] = "EIGHT_LEVEL_ALPHABETIC" };
+    key <AC02> { [ o,            O,              oacute,          Oacute     ] };
+    key <AC03> { [ e,            E,              eogonek,         Eogonek    ] };
+
+    // home row, right side
+    key <AC09> { [ n,            N,              nacute,          Nacute     ] };
+    key <AC10> { [ s,            S,              sacute,          Sacute     ] };
+    key <AC11> { [ minus,        underscore,     hyphen                      ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+    key <BKSL> { [ backslash,    bar                                         ] };
+
+    // lower row, left side
+    key <AB03> { [ j,            J,              doublelowquotemark, rightdoublequotemark ] };
+    key <AB04> { [ k,            K,              leftdoublequotemark, leftsinglequotemark ] };
+    key <AB05> { [ x,            X,              zacute,          Zacute     ] };
+
+    // lower row, right side
+    key <AB06> { [ b,            B,              rightdoublequotemark, rightsinglequotemark ] };
+    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
+};
+
+
 partial alphanumeric_keys
 xkb_symbols "csb" {
 
diff --git a/xorg-server/xkbdata.src/symbols/ru b/xorg-server/xkbdata.src/symbols/ru
index 6bc48940f..dee1f718f 100644
--- a/xorg-server/xkbdata.src/symbols/ru
+++ b/xorg-server/xkbdata.src/symbols/ru
@@ -132,6 +132,27 @@ xkb_symbols "typewriter" {
 };
 
 partial alphanumeric_keys
+xkb_symbols "typewriter-legacy" {
+    include "ru(common)"
+    name[Group1]= "Russia - Typewriter, legacy";
+    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";
diff --git a/xorg-server/xkbdata.src/symbols/se b/xorg-server/xkbdata.src/symbols/se
index 9b32fd6b3..6e24202a7 100644
--- a/xorg-server/xkbdata.src/symbols/se
+++ b/xorg-server/xkbdata.src/symbols/se
@@ -28,7 +28,7 @@ xkb_symbols "se" {
 
     key <SPCE>	{ [     space,      space,        space, nobreakspace ]	};
 
-    key <LSGT> { [ less,	greater,		bar,	bar ] };
+    key <LSGT>  { [      less,     greater,         bar,    brokenbar ] };
     include "kpdl(comma)"
 
     include "level3(ralt_switch)"
diff --git a/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in
index 0af827346..7d0718b52 100644
--- a/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/sgi_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  symbols/sgi_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  symbols/sgi_vndr/Makefile
+	  $(AUTOMAKE) --foreign  symbols/sgi_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in
index 52cd9085f..a86a8516a 100644
--- a/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/sony_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  symbols/sony_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  symbols/sony_vndr/Makefile
+	  $(AUTOMAKE) --foreign  symbols/sony_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in
index 8db5fff20..c5a5dc6b6 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -184,9 +185,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/sun_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  symbols/sun_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  symbols/sun_vndr/Makefile
+	  $(AUTOMAKE) --foreign  symbols/sun_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/cs b/xorg-server/xkbdata.src/symbols/sun_vndr/cs
index e487ba096..ed46dcf7c 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/cs
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/cs
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 
 xkb_symbols "type5" {
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/cz b/xorg-server/xkbdata.src/symbols/sun_vndr/cz
index e487ba096..ed46dcf7c 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/cz
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/cz
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 
 xkb_symbols "type5" {
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/de b/xorg-server/xkbdata.src/symbols/sun_vndr/de
index a80de66b5..230e0ca29 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/de
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/de
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 
 
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/dk b/xorg-server/xkbdata.src/symbols/sun_vndr/dk
index 15f8603bc..87c099781 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/dk
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/dk
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 
 xkb_symbols "type4" {
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/es b/xorg-server/xkbdata.src/symbols/sun_vndr/es
index e863d6a97..fc2b4420b 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/es
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/es
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 
 partial
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/fi b/xorg-server/xkbdata.src/symbols/sun_vndr/fi
index 2c524180e..84756d4a1 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/fi
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/fi
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 
 xkb_symbols "basic" {
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/fr b/xorg-server/xkbdata.src/symbols/sun_vndr/fr
index 3517eed27..7aa23a71b 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/fr
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/fr
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 // NOTE:
 // These are the French keyboard symbols
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/gb b/xorg-server/xkbdata.src/symbols/sun_vndr/gb
index d2c21124d..3cb25fc1d 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/gb
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/gb
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 xkb_symbols "type4" {
     include "sun_vndr/us(type4basic)"
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/gr b/xorg-server/xkbdata.src/symbols/sun_vndr/gr
index cce87510b..ba781752b 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/gr
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/gr
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 
 xkb_symbols "type5" {
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/hu b/xorg-server/xkbdata.src/symbols/sun_vndr/hu
index 62eb551d9..f14a72fab 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/hu
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/hu
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 // $TOG: hu /main/2 1997/06/13 06:25:05 kaleb $
 default partial alphanumeric_keys 
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/it b/xorg-server/xkbdata.src/symbols/sun_vndr/it
index 6f42aa109..9be87ced9 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/it
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/it
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 xkb_symbols "type4" {
 
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/jp b/xorg-server/xkbdata.src/symbols/sun_vndr/jp
index dd06b8bd1..b3a6859bf 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/jp
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/jp
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 // $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
 //
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ko b/xorg-server/xkbdata.src/symbols/sun_vndr/ko
index ba26c5159..acc568f6b 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/ko
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/ko
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 //
 // Korean layout for a Type 4 Sun keyboard
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/lt b/xorg-server/xkbdata.src/symbols/sun_vndr/lt
index e9840a10e..8a8d54a64 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/lt
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/lt
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 // $TOG: hu /main/2 1997/06/13 06:25:05 kaleb $
 default partial alphanumeric_keys 
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/lv b/xorg-server/xkbdata.src/symbols/sun_vndr/lv
index 442242e53..cb5f97c6f 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/lv
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/lv
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 
 default partial alphanumeric_keys 
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/nl b/xorg-server/xkbdata.src/symbols/sun_vndr/nl
index 0feb57be7..f6564d132 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/nl
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/nl
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 xkb_symbols "type4" {
     include "sun_vndr/us(type4basic)"
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/no b/xorg-server/xkbdata.src/symbols/sun_vndr/no
index 471e5e13d..aad44cc20 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/no
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/no
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 
 xkb_symbols "type4" {
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/pl b/xorg-server/xkbdata.src/symbols/sun_vndr/pl
index 7c5362020..deb58190d 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/pl
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/pl
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 
 xkb_symbols "type5" {
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/pt b/xorg-server/xkbdata.src/symbols/sun_vndr/pt
index 8fdf8549d..a88c68270 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/pt
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/pt
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 xkb_symbols "type4" {
     //this is a Portugal4 keyboard
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ru b/xorg-server/xkbdata.src/symbols/sun_vndr/ru
index 97bd42df4..101cad72d 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/ru
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/ru
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 
 xkb_symbols "basic" {
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/se b/xorg-server/xkbdata.src/symbols/sun_vndr/se
index 38e530afa..3daf12525 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/se
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/se
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 xkb_symbols "type4" {
     key <BKSL> { [ section, onehalf	]			};
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/solaris b/xorg-server/xkbdata.src/symbols/sun_vndr/solaris
index 11a738143..c99f04f3e 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/solaris
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/solaris
@@ -3,29 +3,23 @@
 // 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.
+// 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 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.
+// The above copyright notice and this permission notice (including the next
+// paragraph) shall be included in all copies or substantial portions of 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.
+// 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.
 //
 //-------------------------------------------------------------------------
 //
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/sw b/xorg-server/xkbdata.src/symbols/sun_vndr/sw
index 11a1b4774..ecf52fc9d 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/sw
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/sw
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 xkb_symbols "type4de" {
     include "sun_vndr/us(type4basic)"
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tr b/xorg-server/xkbdata.src/symbols/sun_vndr/tr
index f70396e0e..7e6d4bf74 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/tr
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/tr
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 xkb_symbols "basic" {
    include "sun_vndr/tr(type6Q)"
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tuv b/xorg-server/xkbdata.src/symbols/sun_vndr/tuv
index cda512ecc..d047f33b8 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/tuv
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/tuv
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 // $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
 //
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tw b/xorg-server/xkbdata.src/symbols/sun_vndr/tw
index 212c9fb57..736c242eb 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/tw
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/tw
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 //
 // Taiwanese layout for a Type 4 Sun keyboard
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/us b/xorg-server/xkbdata.src/symbols/sun_vndr/us
index 41670f018..f85cec950 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/us
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/us
@@ -3,29 +3,23 @@
 // 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.
+// 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 (including the next
+// paragraph) 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.
 //
 // $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
 // Sun: @(#)us	1.5	03/04/21 SMI
@@ -89,6 +83,8 @@ xkb_symbols "sunbasic" {
     key <NMLK> { [ Num_Lock, Pointer_EnableKeys	] };
     key <SPCE> { [ space                        ] };
 
+    key <BKSP> {         [       BackSpace ] };
+
     // 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
diff --git a/xorg-server/xkbdata.src/symbols/symbols.dir b/xorg-server/xkbdata.src/symbols/symbols.dir
index 2479c1640..3318a0cf2 100644
--- a/xorg-server/xkbdata.src/symbols/symbols.dir
+++ b/xorg-server/xkbdata.src/symbols/symbols.dir
@@ -1,129 +1,248 @@
--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----- amk----- de(neo)
---p----- a------- de(mac)
---p----- a------- de(mac_nodeadkeys)
---p----- a------- de(dsb)
---p----- a------- de(dsb_qwertz)
---p----- a------- de(qwerty)
--------- -------- extras/rs(combiningkeys)
---p----- a------- extras/us(intl-unicode)
---p----- a------- extras/us(alt-intl-unicode)
---p----- a------- extras/us(ats)
---p----- a------- extras/us(crd)
---p----- am------ extras/apl(common)
---p----- am------ extras/apl(unified)
--dp----- am------ extras/apl(sax)
---p----- am------ extras/apl(apl2)
---p----- am------ extras/apl(aplplusII)
---p----- am------ extras/apl(aplx)
--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----- -------- ro(crh_f)
---p----- -------- ro(crh_alt)
---p----- -------- ro(crh_dobruca1)
---p----- -------- ro(crh_dobruca2)
---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(oss)
---p----- a------- be(oss_frbe)
---p----- a------- be(oss_latin9)
---p----- a------- be(oss_Sundeadkeys)
---p----- a------- be(oss_sundeadkeys)
---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------- 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)
+-dp----- -m------ terminate(ctrl_alt_bksp)
+-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(bre)
+--p----- a------- fr(oci)
+--p----- a------- fr(mac)
+--p----- a------- fr(geo)
 -dp----- a------- ng(basic)
 --p----- a------- ng(yoruba)
 --p----- a------- ng(igbo)
 --p----- a------- ng(hausa)
 --p----- a------- ng(olpc)
+-dp----- a------- np(basic)
+--p----- a------- np(olpc)
+-dp----- a------- nl(basic)
+--p----- a------- nl(std)
+--p----- a------- nl(Sundeadkeys)
+--p----- a------- nl(sundeadkeys)
+--p----- a------- nl(mac)
+-dp----- a------- ad(basic)
+-dp----- a------- ua(unicode)
+--p----- a------- ua(legacy)
+--p----- a------- ua(winkeys)
+--p----- a------- ua(typewriter)
+--p----- a------- ua(phonetic)
+--p----- a------- ua(rstu)
+--p----- a------- ua(rstu_ru)
+--p----- a------- ua(homophonic)
+--p----- -------- ua(crh)
+--p----- -------- ua(crh_f)
+--p----- -------- ua(crh_alt)
+-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(latlevel3)
+h-p----- a------- rs(cyrlevel3)
+--p----- a------- rs(latinunicode)
+--p----- a------- rs(latinyz)
+--p----- a------- rs(latinunicodeyz)
+-------- -------- rs(alternatequotes)
+-------- -------- rs(latinalternatequotes)
+-dp----- a------- nokia_vndr/rx-51(common)
+--p----- a------- nokia_vndr/rx-51(us)
+--p----- a------- nokia_vndr/rx-51(pl)
+--p----- a------- nokia_vndr/rx-51(fise)
+--p----- a------- nokia_vndr/rx-51(dano)
+--p----- a------- nokia_vndr/rx-51(nordic)
+--p----- a------- nokia_vndr/rx-51(ptes)
+--p----- a------- nokia_vndr/rx-51(fr)
+--p----- a------- nokia_vndr/rx-51(de)
+--p----- a------- nokia_vndr/rx-51(ch)
+--p----- a------- nokia_vndr/rx-51(ru)
+--p----- a------- nokia_vndr/rx-51(it)
+--p----- a------- nokia_vndr/rx-51(cz)
+--p----- a------- nokia_vndr/rx-51(cz_qwerty)
+h-p----- a------- nokia_vndr/rx-51(nordic_base)
+h-p----- a------- nokia_vndr/rx-51(english_base)
+h-p----- a------- nokia_vndr/rx-51(common_keys)
+h-p----- am------ nokia_vndr/rx-51(modifiers)
+h-p----- a------- nokia_vndr/rx-51(arrows_2btns)
+h-p----- a------- nokia_vndr/rx-51(arrows_4btns)
+-dp----- a------- nokia_vndr/su-8w(no)
+--p----- a------- nokia_vndr/su-8w(no_nodeadkeys)
+--p----- a------- nokia_vndr/su-8w(dk)
+--p----- a------- nokia_vndr/su-8w(dk_nodeadkeys)
+--p----- a------- nokia_vndr/su-8w(de)
+--p----- a------- nokia_vndr/su-8w(de_nodeadkeys)
+--p----- a------- nokia_vndr/su-8w(se)
+--p----- a------- nokia_vndr/su-8w(se_nodeadkeys)
+--p----- a------- nokia_vndr/su-8w(fi)
+-------- -------- nokia_vndr/su-8w(fi_nodeadkeys)
+--p----- a------- nokia_vndr/su-8w(ru)
+--p----- a------- nokia_vndr/su-8w(ru_nodeadkeys)
+--p----- a------- nokia_vndr/su-8w(us)
+--p----- a------- nokia_vndr/su-8w(us_nodeadkeys)
+--p----- a------- nokia_vndr/su-8w(base)
+--p----- a------- nokia_vndr/rx-44(us)
+--p----- a------- nokia_vndr/rx-44(fisenoda)
+--p----- a------- nokia_vndr/rx-44(ptes)
+--p----- a------- nokia_vndr/rx-44(fr)
+--p----- a------- nokia_vndr/rx-44(de)
+--p----- a------- nokia_vndr/rx-44(ru)
+--p----- a------- nokia_vndr/rx-44(it)
+-dp----- a------- nokia_vndr/rx-44(base)
+-dp----- a------- cd(basic)
+-dp----- a------- epo(basic)
+--p----- a------- epo(legacy)
+--p----- -------- epo(qwerty)
+--p----- -------- epo(dvorak)
+-dp----- a------- tj(basic)
+-------- -------- tj(legacy)
 -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------- ch(basic)
+--p----- a------- ch(legacy)
+--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)
+-dp----- am------ pc(pc105)
+h-p----- a------- pc(function)
+h-p----- a------- pc(editing)
+-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(dvp)
+--p----- a------- pl(csb)
+--p----- a------- pl(ru_phonetic_dvorak)
+-dp----- a------- th(basic)
+--p----- a------- th(pat)
+--p----- a------- th(tis)
+--p----- a------- th(olpc)
+-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------- iq(basic)
+--p----- a------- iq(ku)
+--p----- a------- iq(ku_f)
+--p----- a------- iq(ku_alt)
+--p----- a------- iq(ku_ara)
+-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----- --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)
+--p----- --k----- kpdl(semi)
+-dp----- a------- il(basic)
+--p----- a------- il(lyx)
+--p----- a------- il(phonetic)
+--p----- a------- il(biblical)
+-dp----- a------- sn(basic)
+-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_keyboard_with_numerals)
+--p----- a------- in(tam_TSCII)
+--p----- a------- in(tam_TAB)
+--p----- a------- in(tel)
+--p----- a------- in(urd-phonetic)
+--p----- a------- in(urd-phonetic3)
+--p----- a------- in(urd-winkeys)
+--p----- a------- in(guru)
+--p----- a------- in(jhelum)
+--p----- a------- in(olpc)
+--p----- a------- in(hin-wx)
 -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----- a------- hr(basic)
+--p----- a------- hr(us)
+--p----- a------- hr(alternatequotes)
+--p----- a------- hr(unicode)
+--p----- a------- hr(unicodeus)
+-dp----- a------- by(basic)
+--p----- a------- by(legacy)
+--p----- a------- by(latin)
+-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)
+--p----- -------- tr(crh)
+--p----- -------- tr(crh_f)
+--p----- -------- tr(crh_alt)
+-dp----- a------- gn(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)
+--p----- a------- es(deadtilde)
+-dp----- a------- cz(basic)
+-------- -------- cz(bksl)
+--p----- a------- cz(qwerty)
+-------- -------- cz(qwerty_bksl)
+--p----- a---g--- cz(ucw)
+-dp----- a------- bd(basic)
+-------- -------- bd(probhat)
+-dp----- a------- kh(basic)
+--p----- a------- kh(olpc)
 -dp----- -------- hu(basic)
 --p----- -------- hu(standard)
 --p----- -------- hu(nodeadkeys)
@@ -152,23 +271,50 @@ 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------- ir(pes)
+--p----- a------- ir(pes_keypad)
+h-p----- a------- ir(pes_part_basic)
+h-p----- a------- ir(pes_part_ext)
+h-p----- a------- ir(pes_part_keypad)
+--p----- a------- ir(ku)
+--p----- a------- ir(ku_f)
+--p----- a------- ir(ku_alt)
+--p----- a------- ir(ku_ara)
+-dp----- a------- mt(basic)
+--p----- a------- mt(us)
+-------- -------- sgi_vndr/jp(jp106)
+-------- -------- sgi_vndr/jp(alternate106)
+-dp----- a------- pk(urd-phonetic)
+--p----- a------- pk(urd-crulp)
+--p----- a------- pk(urd-nla)
+--p----- a------- pk(ara)
+--p----- a------- pk(olpc)
+-------- -------- sun_vndr/fr(type4)
+-------- -------- sun_vndr/fr(type5)
+-------- -------- sun_vndr/fr(type6)
+-------- -------- sun_vndr/nl(type4)
+-------- -------- sun_vndr/tuv(type4basic)
+-------- -------- sun_vndr/tuv(type4)
+-------- -------- sun_vndr/tuv(type5basic)
+-------- -------- sun_vndr/tuv(type5)
+-------- -------- sun_vndr/pl(type5)
+-------- -------- sun_vndr/no(type4)
+-------- -------- sun_vndr/no(type5)
+-------- -------- sun_vndr/usb(sun_usb)
 -dp----- a------- sun_vndr/lt(type5)
+-------- -------- sun_vndr/tr(basic)
+-------- -------- sun_vndr/tr(type6Q)
+-------- -------- sun_vndr/tr(type6F)
+--p----- -------- sun_vndr/es(type4)
+--p----- -------- sun_vndr/es(type5)
+--p----- -------- sun_vndr/es(type6)
+-------- -------- sun_vndr/cz(type5)
+-dp----- a------- sun_vndr/hu(type5)
+-------- -------- sun_vndr/sw(type4de)
+-------- -------- sun_vndr/sw(type4fr)
+-------- -------- sun_vndr/sw(type5fr)
+-------- -------- sun_vndr/sw(type5de)
+-------- -------- sun_vndr/gr(type5)
 -------- -------- sun_vndr/jp(basic)
 -------- -------- sun_vndr/jp(type4)
 -------- -------- sun_vndr/jp(type5)
@@ -178,30 +324,18 @@ h-p----- a------- hu(def_common)
 -------- -------- 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)
+-------- -------- sun_vndr/dk(type4)
+-------- -------- sun_vndr/dk(type5)
+-------- -------- sun_vndr/pt(type4)
+-------- -------- sun_vndr/pt(type5)
+--p----- -------- sun_vndr/pt(type6)
+-------- -------- sun_vndr/cs(type5)
 h------- -------- sun_vndr/us(sunbasic)
 h------- -------- sun_vndr/us(left_funkeys)
 h------- -------- sun_vndr/us(volumekeys)
@@ -217,31 +351,53 @@ h------- -------- sun_vndr/us(volumekeys)
 -------- -------- 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/de(type4)
+-dp----- -------- sun_vndr/solaris(defaults)
+--p----- -------- sun_vndr/solaris(keynames)
+--p----- -------- sun_vndr/solaris(xf86keynames)
 -------- -------- 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/tw(type4)
+-------- -------- sun_vndr/tw(type5)
+--p----- -------- sun_vndr/tw(type6)
 -------- -------- 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)
+-dp----- a------- sun_vndr/lv(type5)
+-------- -------- sun_vndr/ko(type4)
+-------- -------- sun_vndr/ko(type5)
+--p----- -------- sun_vndr/ko(type6)
+-------- -------- sun_vndr/fi(basic)
+-dp----- a------- ro(basic)
+--p----- a------- ro(cedilla)
+--p----- a------- ro(std)
+--p----- a------- ro(std_cedilla)
+--p----- a------- ro(winkeys)
+--p----- -------- ro(crh_f)
+--p----- -------- ro(crh_alt)
+--p----- -------- ro(crh_dobruca1)
+--p----- -------- ro(crh_dobruca2)
+-dp----- a------- mm(basic)
+-dp----- a------- ee(basic)
+--p----- a------- ee(nodeadkeys)
+--p----- a------- ee(dvorak)
+--p----- a------- ee(us)
+hdp----- -m------ capslock(capslock)
+h-p----- -m------ capslock(shiftlock)
+h-p----- -m------ capslock(grouplock)
+h-p----- -m------ capslock(swapescape)
+h-p----- -m------ capslock(groupshift)
+h-p----- -m------ capslock(escape)
+h-p----- -m------ capslock(backspace)
+h-p----- -m------ capslock(super)
+h-p----- -m------ capslock(hyper)
+h-p----- -m------ capslock(none)
+h-p----- -m------ capslock(numlock)
+-dp----- a------- is(basic)
+--p----- a------- is(Sundeadkeys)
+--p----- a------- is(nodeadkeys)
+--p----- a------- is(mac)
+--p----- a------- is(dvorak)
 -d------ -------- br(abnt2)
 --p----- a------- br(nodeadkeys)
 --p----- a------- br(thinkpad)
@@ -250,85 +406,69 @@ h------- -------- sun_vndr/us(volumekeys)
 --p----- a------- br(nativo)
 --p----- a------- br(nativo-us)
 --p----- a------- br(nativo-epo)
--dp----- -------- typo(base)
--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)
---p----- --k----- kpdl(semi)
--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(ctrl_alt_win)
---p----- -m------ altwin(meta_win)
---p----- -m------ altwin(left_meta_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)
---p----- a------- bg(bas_phonetic)
-h-p----- a------- bg(latin)
--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------- sn(basic)
--dp----- -m------ terminate(ctrl_alt_bksp)
--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(latlevel3)
-h-p----- a------- rs(cyrlevel3)
---p----- a------- rs(latinunicode)
---p----- a------- rs(latinyz)
---p----- a------- rs(latinunicodeyz)
--------- -------- rs(alternatequotes)
--------- -------- rs(latinalternatequotes)
+-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------- mao(basic)
+-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)
 -dp----- a------- jp(106)
 h-p----- a------- jp(common)
 --p----- a------- jp(OADG109A)
 --p----- a------- jp(kana)
 --p----- a------- jp(nicola_f_bs)
+-d------ a------- kr(kr106)
+-------- a------- kr(kr104)
+h-p----- ---f---- kr(koreankeys)
+h-p----- ---f---- kr(koreankeys_raltctl)
+-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)
+-d------ -------- xfree68_vndr/ataritt(us)
+-------- -------- xfree68_vndr/ataritt(de)
+-d------ -------- xfree68_vndr/amiga(usa1)
+-dp----- a------- gb(basic)
+--p----- a------- gb(intl)
+--p----- a------- gb(extd)
+--p----- a------- gb(colemak)
+--p----- a------- gb(dvorak)
+--p----- a------- gb(dvorakukp)
+--p----- a------- gb(mac)
+--p----- -------- eurosign(e)
+--p----- -------- eurosign(2)
+--p----- -------- eurosign(4)
+--p----- -------- eurosign(5)
+-dp----- -------- typo(base)
+-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)
+--p----- -m------ level3(enter_switch)
+--p----- --kf---- srvr_ctrl(xfree86)
+--p----- --k----- srvr_ctrl(stdkeypad)
+--p----- ---f---- srvr_ctrl(fkey2vt)
+--p----- --kf---- srvr_ctrl(no_srvr_keys)
 h-p----- --k----- keypad(overlay)
 h-p----- --k----- keypad(overlay1)
 h-p----- --k----- keypad(overlay2)
@@ -352,168 +492,72 @@ hdp----- --k----- keypad(x11)
 --p----- --k----- keypad(ops)
 --p----- --k----- keypad(hex)
 --p----- --k----- keypad(atm)
--dp----- a------- hr(basic)
---p----- a------- hr(us)
---p----- a------- hr(alternatequotes)
---p----- a------- hr(unicode)
---p----- a------- hr(unicodeus)
--dp----- a------- brai(home_row)
---p----- a------- brai(left_hand)
---p----- a------- brai(right_hand)
-h-p----- --k----- brai(keypad)
--dp----- a------- latam(basic)
---p----- a------- latam(Sundeadkeys)
---p----- a------- latam(sundeadkeys)
---p----- a------- latam(nodeadkeys)
---p----- a------- latam(deadtilde)
--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(unicode)
---p----- a------- ua(legacy)
---p----- a------- ua(winkeys)
---p----- a------- ua(typewriter)
---p----- a------- ua(phonetic)
---p----- a------- ua(rstu)
---p----- a------- ua(rstu_ru)
---p----- a------- ua(homophonic)
---p----- -------- ua(crh)
---p----- -------- ua(crh_f)
---p----- -------- ua(crh_alt)
--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)
--dp----- a------- by(basic)
---p----- a------- by(legacy)
---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)
---p----- -m------ level3(enter_switch)
+-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----- a------- dk(basic)
+--p----- a------- dk(nodeadkeys)
+--p----- a------- dk(mac)
+--p----- a------- dk(mac_nodeadkeys)
+--p----- a------- dk(dvorak)
+-dp----- a------- cn(basic)
+--p----- a------- cn(tib)
+--p----- a------- cn(tib_asciinum)
+-dp----- a------- uz(cyrillic)
+--p----- a------- uz(latin)
+--p----- -------- uz(crh)
+--p----- -------- uz(crh_f)
+--p----- -------- uz(crh_alt)
+-dp----- a------- sk(basic)
+-------- -------- sk(bksl)
+--p----- a------- sk(qwerty)
+-------- -------- sk(qwerty_bksl)
+-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------- mk(basic)
+--p----- a------- mk(nodeadkeys)
+-dp----- a------- mn(basic)
+--p----- a------- mn(olpc)
+--p----- -m------ altwin(meta_alt)
+--p----- -m------ altwin(ctrl_win)
+--p----- -m------ altwin(ctrl_alt_win)
+--p----- -m------ altwin(meta_win)
+--p----- -m------ altwin(left_meta_win)
+--p----- -m------ altwin(hyper_win)
+--p----- -m------ altwin(menu)
+--p----- -m------ altwin(alt_super_win)
+--p----- -m------ altwin(swap_lalt_lwin)
 -------- 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(extd)
---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_keyboard_with_numerals)
---p----- a------- in(tam_TSCII)
---p----- a------- in(tam_TAB)
---p----- a------- in(tel)
---p----- a------- in(urd-phonetic)
---p----- a------- in(urd-phonetic3)
---p----- a------- in(urd-winkeys)
---p----- a------- in(guru)
---p----- a------- in(jhelum)
---p----- a------- in(olpc)
---p----- a------- in(hin-wx)
---p----- -m------ shift(breaks_caps)
--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)
+-d------ -------- macintosh_vndr/fr(extended)
+-------- -------- macintosh_vndr/fr(nodeadkeys)
+-dp----- a------- macintosh_vndr/nl(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----- a------- macintosh_vndr/no(basic)
+--p----- a------- macintosh_vndr/no(nodeadkeys)
+-dp----- a------- macintosh_vndr/is(basic)
+--p----- a------- macintosh_vndr/is(nodeadkeys)
+-dp----- a------- macintosh_vndr/gb(basic)
+-dp----- a------- macintosh_vndr/se(basic)
+--p----- a------- macintosh_vndr/se(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----- -m------ macintosh_vndr/apple(extended)
 --p----- -m------ macintosh_vndr/apple(laptop)
 --p----- -m------ macintosh_vndr/apple(laptop_bad_switch)
@@ -521,35 +565,17 @@ h-p----- -m------ level3(ralt_switch_for_alts_toggle)
 --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)
+-dp----- a------- macintosh_vndr/de(basic)
+--p----- a------- macintosh_vndr/de(Sundeadkeys)
+--p----- a------- macintosh_vndr/de(sundeadkeys)
+--p----- a------- macintosh_vndr/de(nodeadkeys)
 -------- -------- 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)
---p----- -------- tr(crh)
---p----- -------- tr(crh_f)
---p----- -------- tr(crh_alt)
--dp----- a------- tj(basic)
--------- -------- tj(legacy)
--dp----- a------- mao(basic)
+-dp----- a------- macintosh_vndr/latam(basic)
+-dp----- a------- macintosh_vndr/fi(basic)
+--p----- a------- macintosh_vndr/fi(nodeadkeys)
+--p----- -m------ level5(rctrl_switch)
 -dp----- a------- pt(basic)
 --p----- a------- pt(Sundeadkeys)
 --p----- a------- pt(sundeadkeys)
@@ -560,14 +586,94 @@ h------- -------- macintosh_vndr/us(oldmac)
 --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----- a------- ge(basic)
+--p----- a------- ge(qwerty)
+--p----- a------- ge(ergonomic)
+--p----- a------- ge(mess)
+--p----- a------- ge(ru)
+--p----- a------- ge(os)
+-------- -------- sony_vndr/us(nwp5461)
+-dp----- am------ za(basic)
+-------- -------- hp_vndr/us(hil)
+-------- -------- extras/rs(combiningkeys)
+--p----- am------ extras/apl(common)
+--p----- am------ extras/apl(unified)
+-dp----- am------ extras/apl(sax)
+--p----- am------ extras/apl(apl2)
+--p----- am------ extras/apl(aplplusII)
+--p----- am------ extras/apl(aplx)
+--p----- a------- extras/us(intl-unicode)
+--p----- a------- extras/us(alt-intl-unicode)
+--p----- a------- extras/us(ats)
+--p----- a------- extras/us(crd)
+-dp----- a------- ie(basic)
+--p----- a------- ie(CloGaelach)
+--p----- a------- ie(UnicodeExpert)
+--p----- a------- ie(ogam)
+--p----- a------- ie(ogam_is434)
+--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(rctrl_rshift_toggle)
+--p----- -m------ group(shift_caps_toggle)
+--p----- -m------ group(shift_caps_switch)
+--p----- -m------ group(win_menu_switch)
+--p----- -m------ group(lctrl_rctrl_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)
+--p----- -m------ group(alt_space_toggle)
+--p----- -m------ group(sclk_toggle)
+-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------- et(basic)
+--p----- a------- et(olpc)
+-d------ -------- nec_vndr/jp(pc98)
+-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----- -------- ca(fr)
 -------- -------- ca(fr-dvorak)
 --p----- -------- ca(fr-legacy)
@@ -579,7 +685,45 @@ h------- -------- macintosh_vndr/us(oldmac)
 -------- -------- ca(olpc)
 --p----- a------- ca(kut)
 --p----- a------- ca(eng)
--d------ -------- nec_vndr/jp(pc98)
+--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------- ba(basic)
+--p----- a------- ba(us)
+--p----- a------- ba(alternatequotes)
+--p----- a------- ba(unicode)
+--p----- a------- ba(unicodeus)
+-dp----- a------- vn(basic)
+-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----- amk----- de(neo)
+--p----- a------- de(mac)
+--p----- a------- de(mac_nodeadkeys)
+--p----- a------- de(dsb)
+--p----- a------- de(dsb_qwertz)
+--p----- a------- de(qwerty)
+-dp----- a------- it(basic)
+--p----- a------- it(nodeadkeys)
+--p----- a------- it(mac)
+--p----- a------- it(geo)
+-------- -------- it(olpc)
+--p----- am------ it(us)
+-dp----- a------- bg(bds)
+--p----- a------- bg(phonetic)
+--p----- a------- bg(bas_phonetic)
+h-p----- a------- bg(latin)
 h-p----- a------- inet(media_common)
 h-p----- a------- inet(nav_common)
 h-p----- a------- inet(acpi_common)
@@ -691,155 +835,59 @@ h-p----- a------- inet(logitech_set3)
 --p----- a------- inet(creativedw7000)
 --p----- a------- inet(compalfl90)
 --p----- a------- inet(pc105)
--dp----- a------- ir(pes)
---p----- a------- ir(pes_keypad)
-h-p----- a------- ir(pes_part_basic)
-h-p----- a------- ir(pes_part_ext)
-h-p----- a------- ir(pes_part_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(bre)
---p----- a------- fr(oci)
---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(win_menu_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)
---p----- -m------ group(alt_space_toggle)
---p----- -m------ group(sclk_toggle)
--dp----- am------ za(basic)
--dp----- a------- vn(basic)
--dp----- -------- tm(basic)
---p----- -------- tm(alt)
--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)
---p----- a------- es(deadtilde)
--dp----- a------- it(basic)
---p----- a------- it(nodeadkeys)
---p----- a------- it(mac)
---p----- a------- it(geo)
--------- -------- it(olpc)
---p----- am------ it(us)
--dp----- a------- th(basic)
---p----- a------- th(pat)
---p----- a------- th(tis)
---p----- a------- th(olpc)
--dp----- a------- pk(urd-phonetic)
---p----- a------- pk(urd-crulp)
---p----- a------- pk(urd-nla)
---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)
---p----- a------- kg(phonetic)
--dp----- a------- ad(basic)
--dp----- a------- mt(basic)
---p----- a------- mt(us)
+-dp----- a------- latam(basic)
+--p----- a------- latam(Sundeadkeys)
+--p----- a------- latam(sundeadkeys)
+--p----- a------- latam(nodeadkeys)
+--p----- a------- latam(deadtilde)
+-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------- lk(sin_phonetic)
+--p----- a------- lk(tam_unicode)
+--p----- a------- lk(tam_TAB)
+-------- -------- digital_vndr/pc(pc)
+-------- -------- digital_vndr/pc(pc104)
+-------- -------- digital_vndr/us(us)
+-------- -------- digital_vndr/us(vt105-tw)
+-------- -------- digital_vndr/us(vt105-dp)
+-------- -------- digital_vndr/us(vt105)
+-------- -------- digital_vndr/us(vt108-tw)
+-------- -------- digital_vndr/us(vt108-dp)
+-------- -------- digital_vndr/us(vt108)
+-------- -------- digital_vndr/us(unix)
+-------- -------- digital_vndr/us(pcxalga)
+-------- -------- digital_vndr/us(pcxal)
+-------- -------- digital_vndr/us(pcxalaa)
+-------- -------- digital_vndr/us(pcxalfa)
+-------- -------- digital_vndr/us(pcxalka)
+-------- -------- digital_vndr/us(lk44x)
+-------- -------- digital_vndr/us(pc104)
+-d------ -------- digital_vndr/lk(common)
+-------- -------- digital_vndr/lk(lk401)
+-------- -------- digital_vndr/vt(vt105)
+-------- -------- digital_vndr/vt(vt108)
+-dp----- a------- be(basic)
+--p----- a------- be(oss)
+--p----- a------- be(oss_frbe)
+--p----- a------- be(oss_latin9)
+--p----- a------- be(oss_Sundeadkeys)
+--p----- a------- be(oss_sundeadkeys)
+--p----- a------- be(iso-alternate)
+--p----- a------- be(sundeadkeys)
+--p----- a------- be(Sundeadkeys)
+--p----- a------- be(nodeadkeys)
+--p----- a------- be(wang)
+-dp----- a------- mv(basic)
 -dp----- a------- ru(winkeys)
 h-p----- a------- ru(common)
 --p----- a------- ru(legacy)
 --p----- a------- ru(olpc)
 --p----- a------- ru(typewriter)
+--p----- a------- ru(typewriter-legacy)
 --p----- a------- ru(phonetic)
 --p----- a------- ru(phonetic_winkeys)
 --p----- a------- ru(tt)
@@ -853,53 +901,47 @@ h-p----- a------- ru(common)
 --p----- a------- ru(xal)
 --p----- a------- ru(dos)
 --p----- a------- ru(bak)
--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)
---p----- -------- epo(qwerty)
---p----- -------- epo(dvorak)
-hdp----- -m------ capslock(capslock)
-h-p----- -m------ capslock(shiftlock)
-h-p----- -m------ capslock(grouplock)
-h-p----- -m------ capslock(swapescape)
-h-p----- -m------ capslock(groupshift)
-h-p----- -m------ capslock(escape)
-h-p----- -m------ capslock(backspace)
-h-p----- -m------ capslock(super)
-h-p----- -m------ capslock(hyper)
-h-p----- -m------ capslock(none)
-h-p----- -m------ capslock(numlock)
--dp----- a------- mk(basic)
---p----- a------- mk(nodeadkeys)
--dp----- a------- uz(cyrillic)
---p----- a------- uz(latin)
---p----- -------- uz(crh)
---p----- -------- uz(crh_f)
---p----- -------- uz(crh_alt)
--dp----- a------- ee(basic)
---p----- a------- ee(nodeadkeys)
---p----- a------- ee(dvorak)
---p----- a------- ee(us)
+-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)
+-dp----- a------- bt(basic)
+--p----- -m------ compose(ralt)
+--p----- -m------ compose(lwin)
+--p----- -m------ compose(rwin)
+--p----- -m------ compose(menu)
+--p----- -m------ compose(rctrl)
+--p----- -m------ compose(lctrl)
+--p----- -m------ compose(caps)
+--p----- -m------ compose(102)
+-dp----- a------- az(latin)
+--p----- a------- az(cyrillic)
+--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------- brai(home_row)
+--p----- a------- brai(left_hand)
+--p----- a------- brai(right_hand)
+h-p----- --k----- brai(keypad)
+-dp----- -------- tm(basic)
+--p----- -------- tm(alt)
+-dp----- a------- kz(basic)
+--p----- a------- kz(ruskaz)
+--p----- a------- kz(kazrus)
+--p----- a------- kz(olpc)
+-dp----- a------- la(basic)
+-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------- al(basic)
 -dp----- a------- gh(basic)
 --p----- a------- gh(akan)
 --p----- a------- gh(ga)
@@ -907,3 +949,8 @@ h-p----- -m------ capslock(numlock)
 --p----- a------- gh(fula)
 --p----- a------- gh(hausa)
 --p----- a------- gh(generic)
+-------- -------- fujitsu_vndr/jp
+-------- -------- fujitsu_vndr/us
+-dp----- a------- kg(basic)
+--p----- a------- kg(phonetic)
+--p----- -m------ shift(breaks_caps)
diff --git a/xorg-server/xkbdata.src/symbols/tm b/xorg-server/xkbdata.src/symbols/tm
index d66e277f0..aed4c902d 100644
--- a/xorg-server/xkbdata.src/symbols/tm
+++ b/xorg-server/xkbdata.src/symbols/tm
@@ -9,7 +9,7 @@ xkb_symbols "basic" {
     name[Group1]="Turkmenistan";
     
     include "us"
-    
+	key.type[group1]="ALPHABETIC";
     key <TLDE> {	[    zcaron, 	Zcaron,		grave,	asciitilde	]	};
 
     key <AD01> {	[ adiaeresis, 	Adiaeresis,	q,	Q 	]	};
diff --git a/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in
index a12008f3e..cedb17159 100644
--- a/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  symbols/xfree68_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  symbols/xfree68_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  symbols/xfree68_vndr/Makefile
+	  $(AUTOMAKE) --foreign  symbols/xfree68_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/types/Makefile.am b/xorg-server/xkbdata.src/types/Makefile.am
index 43bd2c6b6..6da3ccb78 100644
--- a/xorg-server/xkbdata.src/types/Makefile.am
+++ b/xorg-server/xkbdata.src/types/Makefile.am
@@ -3,7 +3,7 @@ typesdir = $(xkb_base)/types
 dist_types_DATA = \
 basic cancel caps \
 complete default extra \
-iso9995 level5 mousekeys numpad \
+iso9995 level5 mousekeys nokia numpad \
 pc README
 
 dir_data = $(dist_types_DATA)
diff --git a/xorg-server/xkbdata.src/types/Makefile.in b/xorg-server/xkbdata.src/types/Makefile.in
index d1ba36e04..78bcfee37 100644
--- a/xorg-server/xkbdata.src/types/Makefile.in
+++ b/xorg-server/xkbdata.src/types/Makefile.in
@@ -112,6 +112,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -173,7 +174,7 @@ typesdir = $(xkb_base)/types
 dist_types_DATA = \
 basic cancel caps \
 complete default extra \
-iso9995 level5 mousekeys numpad \
+iso9995 level5 mousekeys nokia numpad \
 pc README
 
 dir_data = $(dist_types_DATA)
@@ -192,9 +193,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  types/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  types/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  types/Makefile
+	  $(AUTOMAKE) --foreign  types/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/types/nokia b/xorg-server/xkbdata.src/types/nokia
new file mode 100644
index 000000000..f77d8868a
--- /dev/null
+++ b/xorg-server/xkbdata.src/types/nokia
@@ -0,0 +1,14 @@
+partial default xkb_types "default" {
+
+    // Some types that are used by Nokia devices and keyboard.
+    virtual_modifiers LevelThree;
+
+    type "PC_FN_LEVEL2" {
+	modifiers = LevelThree;
+	map[None] = Level1;
+	map[LevelThree] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Fn";
+    };
+
+};
diff --git a/xorg-server/xkbdata.src/types/types.dir b/xorg-server/xkbdata.src/types/types.dir
index 746d2f4d2..7f218d6f5 100644
--- a/xorg-server/xkbdata.src/types/types.dir
+++ b/xorg-server/xkbdata.src/types/types.dir
@@ -1,18 +1,19 @@
+-dp----- -------- pc(default)
 -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)
+-d------ -------- default(default)
+-dp----- -------- iso9995(default)
+-d------ -------- complete(complete)
+-dp----- -------- level5(default)
 -dp----- -------- cancel(Shift_Cancels_Caps)
+-dp----- -------- nokia(default)
+-d------ -------- basic(basic)
 -dp----- -------- numpad(pc)
 --p----- -------- numpad(mac)
 --p----- -------- numpad(microsoft)
diff --git a/xorg-server/xkbdata.src/xkeyboard-config.spec b/xorg-server/xkbdata.src/xkeyboard-config.spec
index 3f6f7694d..256f74b9c 100644
--- a/xorg-server/xkbdata.src/xkeyboard-config.spec
+++ b/xorg-server/xkbdata.src/xkeyboard-config.spec
@@ -1,6 +1,6 @@
 Name:		xkeyboard-config
 Summary:	XML-based XKB configuration registry
-Version:	1.7
+Version:	1.8
 Release:	1
 License:	X11/MIT
 Group:		User Interface/X